152 nested namespaces support fix (#157)

* add test case for scenario * support for full namespace using statement inside a namespace
fluentassertions · Apr 1, 2022 · 0e0fa4b · 0e0fa4b
1 parent 956de8d
commit 0e0fa4b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/FluentAssertions.Analyzers.Tests/Tips/MsTestTests.cs b/src/FluentAssertions.Analyzers.Tests/Tips/MsTestTests.cs
@@ -185,6 +185,30 @@ public void AssertIsTrue_NestedUsingInNamespace7_TestAnalyzer(string assertion)
             .AppendLine("}")
             .ToString());
 
+        [AssertionDataTestMethod]
+        [AssertionDiagnostic("Assert.IsTrue(actual{0});")]
+        [AssertionDiagnostic("Assert.IsTrue(bool.Parse(\"true\"){0});")]
+        [Implemented]
+        public void AssertIsTrue_NestedUsingInNamespace8_TestAnalyzer(string assertion)
+            => VerifyCSharpDiagnostic<AssertIsTrueAnalyzer>("bool actual", assertion, new StringBuilder()
+            .AppendLine("using System;")
+            .AppendLine("using FluentAssertions;")
+            .AppendLine("using FluentAssertions.Extensions;")
+            .AppendLine("using System.Threading.Tasks;")
+            .AppendLine("namespace Testing")
+            .AppendLine("{")
+            .AppendLine("    using Microsoft.VisualStudio.TestTools.UnitTesting;")
+            .AppendLine("    class TestClass")
+            .AppendLine("    {")
+            .AppendLine($"        void TestMethod(bool actual)")
+            .AppendLine("        {")
+            .AppendLine($"            {assertion}")
+            .AppendLine("        }")
+            .AppendLine("    }")
+            .AppendMainMethod()
+            .AppendLine("}")
+            .ToString());
+
         [AssertionDataTestMethod]
         [AssertionCodeFix(
             oldAssertion: "Assert.IsTrue(actual{0});",

diff --git a/src/FluentAssertions.Analyzers/Utilities/FluentAssertionsAnalyzer.cs b/src/FluentAssertions.Analyzers/Utilities/FluentAssertionsAnalyzer.cs
@@ -143,6 +143,8 @@ protected override bool ShouldAnalyzeMethod(MethodDeclarationSyntax method)
                     var baseNamespace = string.Join(".", namespaces.Take(i+1).Select(ns => ns.Name));
                     foreach (var @using in namespaces[i].Usings)
                     {
+                        if (@using.Name.NormalizeWhitespace().ToString().Equals(TestingLibraryNamespace)) return true;
+
                         var fullUsing = SF.ParseName($"{baseNamespace}.{@using.Name}").NormalizeWhitespace().ToString();
                         if (fullUsing.Equals(TestingLibraryNamespace)) return true;
                     }