review

meziantou · Dec 30, 2023 · 4f1d822 · 4f1d822
1 parent 2353664
commit 4f1d822
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/Meziantou.FluentAssertionsAnalyzers.Tests/Helpers/ProjectBuilder.cs b/Meziantou.FluentAssertionsAnalyzers.Tests/Helpers/ProjectBuilder.cs
@@ -283,7 +283,12 @@ public ProjectBuilder ShouldReportDiagnosticWithMessage(string message)
 
     public ProjectBuilder ShouldFixCodeWith(string codeFix)
     {
-        return ShouldFixCodeWith(index: null, codeFix ?? SourceCode);
+        return ShouldFixCodeWith(index: null, codeFix);
+    }
+
+    public ProjectBuilder ShouldFixCodeWithOriginalCode()
+    {
+        return ShouldFixCodeWith(index: null, SourceCode);
     }
 
     public ProjectBuilder ShouldFixCodeWith(int? index, string codeFix)

diff --git a/Meziantou.FluentAssertionsAnalyzers.Tests/NUnit3ToFluentAssertionsAnalyzerUnitTests.cs b/Meziantou.FluentAssertionsAnalyzers.Tests/NUnit3ToFluentAssertionsAnalyzerUnitTests.cs
@@ -18,10 +18,19 @@ private static ProjectBuilder CreateProjectBuilder()
 
     private static Task Assert(string sourceCode, string fix = null)
     {
-        return CreateProjectBuilder()
-                  .WithSourceCode(sourceCode)
-                  .ShouldFixCodeWith(fix)
-                  .ValidateAsync();
+        var projectBuilder = CreateProjectBuilder()
+            .WithSourceCode(sourceCode);
+
+        if (fix is null)
+        {
+            projectBuilder.ShouldFixCodeWithOriginalCode();
+        }
+        else
+        {
+            projectBuilder.ShouldFixCodeWith(fix);
+        }
+
+        return projectBuilder.ValidateAsync();
     }
 
     [Fact]
@@ -51,7 +60,7 @@ public void MyTest()
 }
 """);
     }
-    
+
     [Fact]
     public Task Assert_Inconclusive_NoReport()
     {
@@ -69,7 +78,7 @@ public void MyTest()
 }
 """);
     }
-    
+
     [Fact]
     public Task Assert_Ignore_NoReport()
     {
@@ -87,7 +96,7 @@ public void MyTest()
 }
 """);
     }
-    
+
     [Fact]
     public Task Assert_Fail_ExcludedFromOptions()
     {
@@ -107,7 +116,7 @@ public void MyTest()
                   .AddAnalyzerConfiguration("mfa_excluded_methods", "M:NUnit.Framework.Assert.Fail")
                   .ValidateAsync();
     }
-    
+
     [Fact]
     public Task Assert_Fail_String_ExcludedFromOptions()
     {
@@ -127,7 +136,7 @@ public void MyTest()
                   .AddAnalyzerConfiguration("mfa_excluded_methods", "M:NUnit.Framework.Assert.Fail(System.String)")
                   .ValidateAsync();
     }
-    
+
     [Fact]
     public Task Assert_MultiMethods_ExcludedFromOptions()
     {
@@ -317,7 +326,7 @@ public void MyTest()
     [InlineData(@"Assert.AreEqual(0d, (double?)null, delta: 2d)", @"((double?)null).Should().BeApproximately(0d, 2d)")]
     [InlineData(@"Assert.AreEqual(0d, (double?)null, delta: 2d, ""because"")", @"((double?)null).Should().BeApproximately(0d, 2d, ""because"")")]
     [InlineData(@"Assert.AreEqual(0d, (double?)null, delta: 2d, ""because"", 1, 2)", @"((double?)null).Should().BeApproximately(0d, 2d, ""because"", 1, 2)")]
-    
+
     [InlineData(@"Assert.AreEqual(0f, (float?)null, delta: 0.1f)", @"((float?)null).Should().BeApproximately(0f, 0.1f)")]
     [InlineData(@"Assert.AreEqual(0f, 1f, delta: 0.1f)", @"1f.Should().BeApproximately(0f, 0.1f)")]