simplify OpenCover

Author: tonyhallett

FineCodeCoverageTests/OpenCoverExeArgumentsProvider_Tests.cs

@@ -97,7 +97,7 @@ public void Should_Safely_Include_The_TestDLLFile_In_The_TargetArgs()
         }
 
         [Test]
-        public void Should_Include_The_Test_Assembly_In_The_Filter_When_AppOptions_IncludeTestAssembly_And_Required()
+        public void Should_Include_The_Test_Assembly_In_The_Filter_When_AppOptions_IncludeTestAssembly_And_Other_Includes()
         {
             var openCoverExeArgumentsProvider = new OpenCoverExeArgumentsProvider();
             var mockCoverageProject = SafeMockCoverageProject();
@@ -125,21 +125,6 @@ public void Should_Not_Include_The_Test_Assembly_In_The_Filter_When_AppOptions_I
             Assert.IsEmpty(GetFilters(arguments));
         }
 
-        [Test]
-        public void Should_Not_Include_The_Test_Assembly_In_The_Filter_When_AppOptions_IncludeTestAssembly_And_Explicitly_Excluded()
-        {
-            var openCoverExeArgumentsProvider = new OpenCoverExeArgumentsProvider();
-            var mockCoverageProject = SafeMockCoverageProject();
-            mockCoverageProject.SetupGet(coverageProject => coverageProject.Settings.IncludeTestAssembly).Returns(true);
-            mockCoverageProject.SetupGet(coverageProject => coverageProject.Settings.Include).Returns(new string[] { "[anassembly]*" });
-            mockCoverageProject.SetupGet(coverageProject => coverageProject.Settings.Exclude).Returns(new string[] { "[TheTestName]*" });
-            mockCoverageProject.SetupGet(coverageProject => coverageProject.ProjectName).Returns("TheTestName");
-
-            var arguments = openCoverExeArgumentsProvider.Provide(mockCoverageProject.Object, "");
-            var filters = GetFilters(arguments);
-            Assert.That(filters, Is.EquivalentTo(new string[] { "+[anassembly]*", "-[TheTestName]*" }));
-        }
-
         private IEnumerable<string> GetFilters(IEnumerable<string> arguments)
         {
             var filterMatch = "-filter:";

SharedProject/Core/OpenCover/OpenCoverExeArgumentsProvider.cs

@@ -23,53 +23,16 @@ public static string AddEscapeQuotes(string arg)
     [Export(typeof(IOpenCoverExeArgumentsProvider))]
     internal class OpenCoverExeArgumentsProvider : IOpenCoverExeArgumentsProvider
     {
-        private static readonly Regex AssemblyRegex = new Regex(@"^\[(.*?)\]", RegexOptions.Compiled);
         private enum Delimiter { Semicolon, Space}
 
-        private static bool IncludeTestAssemblyOnlyWhenNecessary(
-            List<IReferencedProject> includedReferencedProjects,
-            IEnumerable<string> inclusions, 
-            List<string> exclusions,
-            string testAssemblyName)
-        {
-            return HasInclusions(inclusions, includedReferencedProjects) && !IsTestAssemblySpecificallyExcluded(exclusions, testAssemblyName);
-        }
-
-        private static string GetAssemblyFromFilter(string input)
-        {
-            Match match = AssemblyRegex.Match(input);
-            return match.Success ? match.Groups[1].Value : null;
-        }
-
-        private static bool IsTestAssemblySpecificallyExcluded(List<string> exclusions, string testAssemblyName)
-        {
-            // not interested in an exclude all
-
-            // note that it could also have been excluded with a wild card - for now for simplicity we are not checking that
-            foreach (var exclusion in exclusions)
-            {
-                var assembly = GetAssemblyFromFilter(exclusion);
-                if(assembly == testAssemblyName)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private static bool HasInclusions(IEnumerable<string> includes, List<IReferencedProject> includedReferencedProjects)
-        {
-            return includes.Any() || includedReferencedProjects.Any();
-        }
-
         private void AddFilter(ICoverageProject project, List<string> opencoverSettings)
         {
             var includes = SanitizeExcludesOrIncludes(project.Settings.Include);
             var excludes = SanitizeExcludesOrIncludes(project.Settings.Exclude).ToList();
 
             var includedModules = project.IncludedReferencedProjects.Select(rp => rp.AssemblyName).ToList();
-            if (project.Settings.IncludeTestAssembly && 
-                IncludeTestAssemblyOnlyWhenNecessary(project.IncludedReferencedProjects, includes, excludes, project.ProjectName))
+            if (project.Settings.IncludeTestAssembly &&
+                (includes.Any() || project.IncludedReferencedProjects.Any()))
             {
                 includedModules.Add(project.ProjectName);
             }