Unit tested file exclusions with in-proc and out-of-proc analyzers.

realvizu · Feb 2, 2019 · 1a6b693 · 1a6b693
1 parent 3fd86a8
commit 1a6b693
Show file tree

Hide file tree

Showing 14 changed files with 153 additions and 2 deletions.
diff --git a/source/NsDepCop.MsBuildTask.Test/ExcludedFiles/ExcludedByExtensions1.g.cs b/source/NsDepCop.MsBuildTask.Test/ExcludedFiles/ExcludedByExtensions1.g.cs
@@ -0,0 +1,9 @@
+namespace A
+{
+    using B;
+
+    class MyClass3
+    {
+        private MyEnum e;
+    }
+}
diff --git a/source/NsDepCop.MsBuildTask.Test/ExcludedFiles/ExcludedByName.cs b/source/NsDepCop.MsBuildTask.Test/ExcludedFiles/ExcludedByName.cs
@@ -0,0 +1,16 @@
+namespace A
+{
+    using B;
+
+    class MyClass1
+    {
+        private MyEnum e;
+    }
+}
+
+namespace B
+{
+    enum MyEnum
+    {
+    }
+}
diff --git a/source/NsDepCop.MsBuildTask.Test/ExcludedFiles/IncludedFile.cs b/source/NsDepCop.MsBuildTask.Test/ExcludedFiles/IncludedFile.cs
@@ -0,0 +1,9 @@
+namespace A
+{
+    using B;
+
+    class MyClass2
+    {
+        private MyEnum e;
+    }
+}
diff --git a/source/NsDepCop.MsBuildTask.Test/ExcludedFiles/Subfolder1/ExcludedByExtensions2.g.cs b/source/NsDepCop.MsBuildTask.Test/ExcludedFiles/Subfolder1/ExcludedByExtensions2.g.cs
@@ -0,0 +1,9 @@
+namespace A
+{
+    using B;
+
+    class MyClass4
+    {
+        private MyEnum e;
+    }
+}
diff --git a/...sDepCop.MsBuildTask.Test/ExcludedFiles/Subfolder1/Sub folder 2/ExcludedByExtensions3.g.cs b/...sDepCop.MsBuildTask.Test/ExcludedFiles/Subfolder1/Sub folder 2/ExcludedByExtensions3.g.cs
@@ -0,0 +1,9 @@
+namespace A
+{
+    using B;
+
+    class MyClass5
+    {
+        private MyEnum e;
+    }
+}
diff --git a/source/NsDepCop.MsBuildTask.Test/ExcludedFiles/config.nsdepcop b/source/NsDepCop.MsBuildTask.Test/ExcludedFiles/config.nsdepcop
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<NsDepCopConfig ExcludedFiles="ExcludedByName.cs, **\*.g.cs"/>
diff --git a/source/NsDepCop.MsBuildTask.Test/NsDepCop.MsBuildTask.Test.csproj b/source/NsDepCop.MsBuildTask.Test/NsDepCop.MsBuildTask.Test.csproj
@@ -184,7 +184,22 @@
     <Content Include="Serialization\Serialization.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="ExcludedFiles\Subfolder1\ExcludedByExtensions2.g.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="ExcludedFiles\Subfolder1\Sub folder 2\ExcludedByExtensions3.g.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="ExcludedFiles\ExcludedByExtensions1.g.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Compile Include="MsBuildLoggerGatewayTests.cs" />
+    <Content Include="ExcludedFiles\ExcludedByName.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="ExcludedFiles\IncludedFile.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Compile Include="NsDepCopTaskTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Content Include="DependencyViolation_ReportWarning\DependencyViolation_ReportWarning.cs">
@@ -293,6 +308,9 @@
     <Content Include="TaskInfoImportanceIsLow\config.nsdepcop">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="ExcludedFiles\config.nsdepcop">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>

diff --git a/source/NsDepCop.MsBuildTask.Test/NsDepCopTaskTests.cs b/source/NsDepCop.MsBuildTask.Test/NsDepCopTaskTests.cs
@@ -139,15 +139,33 @@ public void MultipleSourceFiles()
             var nsDepCopTask = CreateNsDepCopTask();
             nsDepCopTask.Compile = new ITaskItem[]
             {
-                new TestTaskItem(Path.Combine(nsDepCopTask.BaseDirectory.ItemSpec, "SourceFile1.cs")),
-                new TestTaskItem(Path.Combine(nsDepCopTask.BaseDirectory.ItemSpec, "SourceFile2.cs"))
+                CreateCompiledTaskItem(nsDepCopTask, "SourceFile1.cs"),
+                CreateCompiledTaskItem(nsDepCopTask, "SourceFile2.cs")
             };
             nsDepCopTask.Execute().Should().BeTrue();
 
             VerifyTaskExceptionLogged(Times.Never());
             VerifyDependencyIssueLogged(Times.Exactly(2));
         }
 
+        [Fact]
+        public void ExcludedFiles()
+        {
+            var nsDepCopTask = CreateNsDepCopTask();
+            nsDepCopTask.Compile = new ITaskItem[]
+            {
+                CreateCompiledTaskItem(nsDepCopTask, "IncludedFile.cs"),
+                CreateCompiledTaskItem(nsDepCopTask, "ExcludedByName.cs"),
+                CreateCompiledTaskItem(nsDepCopTask, "ExcludedByExtensions1.g.cs"),
+                CreateCompiledTaskItem(nsDepCopTask, @"Subfolder1\ExcludedByExtensions2.g.cs"),
+                CreateCompiledTaskItem(nsDepCopTask, @"Subfolder1\Sub folder 2\ExcludedByExtensions3.g.cs"),
+            };
+            nsDepCopTask.Execute().Should().BeTrue();
+
+            VerifyTaskExceptionLogged(Times.Never());
+            VerifyDependencyIssueLogged(Times.Exactly(1));
+        }
+
         [Fact]
         public void NoConfigFile()
         {
@@ -196,6 +214,11 @@ private NsDepCopTask CreateNsDepCopTask([CallerMemberName] string taskName = nul
             };
         }
 
+        private static TestTaskItem CreateCompiledTaskItem(NsDepCopTask nsDepCopTask, string filename)
+        {
+            return new TestTaskItem(Path.Combine(nsDepCopTask.BaseDirectory.ItemSpec, filename));
+        }
+
         private static string GetTestFileFullPath(string testName)
         {
             return Path.Combine(GetBinFilePath($@"{testName}\{testName}.cs"));

diff --git a/source/NsDepCop.SourceTest.Roslyn2x/AnalyzerFeatureTests.cs b/source/NsDepCop.SourceTest.Roslyn2x/AnalyzerFeatureTests.cs
@@ -26,6 +26,18 @@ public void AnalyzerFeature_DisallowedDependency()
                 .Execute();
         }
 
+        [Fact]
+        public void AnalyzerFeature_ExcludedFiles()
+        {
+            SourceTestSpecification.Create().Execute();
+        }
+
+        [Fact]
+        public void AnalyzerFeature_ExcludedFiles_WithWildcard()
+        {
+            SourceTestSpecification.Create().Execute();
+        }
+
         [Fact]
         public void AnalyzerFeature_SameNamespaceAlwaysAllowed()
         {

diff --git a/...DepCop.SourceTest.Roslyn2x/AnalyzerFeature_ExcludedFiles/AnalyzerFeature_ExcludedFiles.cs b/...DepCop.SourceTest.Roslyn2x/AnalyzerFeature_ExcludedFiles/AnalyzerFeature_ExcludedFiles.cs
@@ -0,0 +1,14 @@
+namespace A
+{
+    public class MyClass
+    {
+        private B.MyEnum field1;
+    }
+}
+
+namespace B
+{
+    public enum MyEnum
+    {
+    }
+}
diff --git a/source/NsDepCop.SourceTest.Roslyn2x/AnalyzerFeature_ExcludedFiles/config.nsdepcop b/source/NsDepCop.SourceTest.Roslyn2x/AnalyzerFeature_ExcludedFiles/config.nsdepcop
@@ -0,0 +1,2 @@
+<NsDepCopConfig ExcludedFiles="AnalyzerFeature_ExcludedFiles.cs">
+</NsDepCopConfig>
diff --git a/.../AnalyzerFeature_ExcludedFiles_WithWildcard/AnalyzerFeature_ExcludedFiles_WithWildcard.cs b/.../AnalyzerFeature_ExcludedFiles_WithWildcard/AnalyzerFeature_ExcludedFiles_WithWildcard.cs
@@ -0,0 +1,14 @@
+namespace A
+{
+    public class MyClass
+    {
+        private B.MyEnum field1;
+    }
+}
+
+namespace B
+{
+    public enum MyEnum
+    {
+    }
+}
diff --git a/...e/NsDepCop.SourceTest.Roslyn2x/AnalyzerFeature_ExcludedFiles_WithWildcard/config.nsdepcop b/...e/NsDepCop.SourceTest.Roslyn2x/AnalyzerFeature_ExcludedFiles_WithWildcard/config.nsdepcop
@@ -0,0 +1,2 @@
+<NsDepCopConfig ExcludedFiles="*.cs">
+</NsDepCopConfig>
diff --git a/source/NsDepCop.SourceTest.Roslyn2x/NsDepCop.SourceTest.Roslyn2x.csproj b/source/NsDepCop.SourceTest.Roslyn2x/NsDepCop.SourceTest.Roslyn2x.csproj
@@ -207,6 +207,12 @@
     <Content Include="Cs7_3_AttributeOnPropertyBackingField\Cs7_3_AttributeOnPropertyBackingField.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="AnalyzerFeature_ExcludedFiles\AnalyzerFeature_ExcludedFiles.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="AnalyzerFeature_ExcludedFiles_WithWildcard\AnalyzerFeature_ExcludedFiles_WithWildcard.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Compile Include="Cs7_3_Tests.cs" />
     <Compile Include="Cs7_2_Tests.cs" />
     <Compile Include="Cs7_1_Tests.cs" />
@@ -303,6 +309,12 @@
     <Content Include="AnalyzerFeature_DisallowedDependency\config.nsdepcop">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="AnalyzerFeature_ExcludedFiles\config.nsdepcop">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="AnalyzerFeature_ExcludedFiles_WithWildcard\config.nsdepcop">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>