From 29de69d8ffda9e70509bdcef20345df6b9c8c1f6 Mon Sep 17 00:00:00 2001
From: vweijsters <vweijsters@outlook.com>
Date: Thu, 13 Aug 2015 23:00:21 +0200
Subject: [PATCH] Fixed issue in CodeFixVerifier

---
 .../LayoutRules/SA1501UnitTests.cs            | 51 +++----------------
 .../Verifiers/CodeFixVerifier.cs              |  3 +-
 2 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1501UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1501UnitTests.cs
index 6b30b31f6..10dabde18 100644
--- a/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1501UnitTests.cs
+++ b/StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1501UnitTests.cs
@@ -642,37 +642,8 @@ public void Bar(int i)
             else Debug.Assert(false); else if (i == 13) Debug.Assert(true);//24
     }
 }";
-            var fixedCode = @"using System.Diagnostics;
-public class TypeName
-{
-    public void Bar(int i)
-    {
-        if (i == 0)
-            Debug.Assert(true);
-        else
-            Debug.Assert(false);//8
 
-
-        if (i == 1)
-            Debug.Assert(true);
-        else if (i == 2) Debug.Assert(false);//10
-
-        if (i == 3)
-            Debug.Assert(true);
-        else if (i == 4) Debug.Assert(false);//14
-
-        if (i == 5) Debug.Assert(true); else if (i == 6) Debug.Assert(false); else Debug.Assert(false);//16
-
-        if (i == 7) if (i == 8) Debug.Assert(false); else Debug.Assert(false); else Debug.Assert(true);//18
-
-        if (i == 9)
-            if (i == 10) Debug.Assert(false); else Debug.Assert(false); else Debug.Assert(true);//21
-
-        if (i == 11) if (i == 12) Debug.Assert(false);
-            else Debug.Assert(false); else if (i == 13) Debug.Assert(true);//24
-    }
-}";
-            var batchFixedCode = @"using System.Diagnostics;
+            var fixedCode = @"using System.Diagnostics;
 public class TypeName
 {
     public void Bar(int i)
@@ -746,7 +717,7 @@ public void Bar(int i)
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
             ////await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
-            await this.VerifyCSharpFixAsync(testCode, fixedCode, batchFixedCode, cancellationToken: CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedCode, fixedCode, cancellationToken: CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -833,7 +804,8 @@ public void Bar(int i)
     {
         if (i == 0)
             Debug.Assert(true);
-        else Debug.Assert(false);
+        else
+            Debug.Assert(false);
     }
 }";
 
@@ -930,21 +902,12 @@ public class TypeName
     public void Bar(int i)
     {
         if (i == 0)
-            if (i == 0) Debug.Assert(true);
-    }
-}";
-
-            var batchFixedTestCode = @"using System.Diagnostics;
-public class TypeName
-{
-    public void Bar(int i)
-    {
-        if (i == 0)
-            if (i == 0) Debug.Assert(true);
+            if (i == 0)
+                Debug.Assert(true);
     }
 }";
 
-            await this.VerifyCSharpFixAsync(testCode, fixedTestCode, batchFixedTestCode).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedTestCode, fixedTestCode).ConfigureAwait(false);
         }
 
         /// <summary>
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CodeFixVerifier.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CodeFixVerifier.cs
index 4d8ffe4d0..8c5d19695 100644
--- a/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CodeFixVerifier.cs
+++ b/StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CodeFixVerifier.cs
@@ -253,7 +253,8 @@ private static bool AreDiagnosticsDifferent(ImmutableArray<Diagnostic> analyzerD
 
             for (var i = 0; i < analyzerDiagnostics.Length; i++)
             {
-                if (analyzerDiagnostics[i].Id != previousDiagnostics[i].Id)
+                if ((analyzerDiagnostics[i].Id != previousDiagnostics[i].Id)
+                    || (analyzerDiagnostics[i].Location.SourceSpan != previousDiagnostics[i].Location.SourceSpan))
                 {
                     return true;
                 }