Skip to content

Commit 15eeb98

Browse files
Revert "Add [xunit*]* to default excluded modules filter if not specified" (#519)
1 parent 70b3ef3 commit 15eeb98

File tree

4 files changed

+0
-47
lines changed

4 files changed

+0
-47
lines changed

src/coverlet.collector/DataCollection/CoverletSettingsParser.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,6 @@ private string[] ParseExcludeFilters(XmlElement configurationElement)
131131
}
132132
}
133133

134-
// if we've only one element mean that we only added CoverletConstants.DefaultExcludeFilter
135-
// so add default exclusions
136-
if (excludeFilters.Count == 1)
137-
{
138-
excludeFilters.Add("[xunit*]*");
139-
}
140-
141134
return excludeFilters.ToArray();
142135
}
143136

src/coverlet.console/Program.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@ static int Main(string[] args)
5959
logger.Level = verbosity.ParsedValue;
6060
}
6161

62-
// We add default exclusion filter if no specified
63-
if (excludeFilters.Values.Count == 0)
64-
{
65-
excludeFilters.Values.Add("[xunit*]*");
66-
}
67-
6862
Coverage coverage = new Coverage(module.Value,
6963
includeFilters.Values.ToArray(),
7064
includeDirectories.Values.ToArray(),

src/coverlet.msbuild.tasks/InstrumentationTask.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,6 @@ public override bool Execute()
104104
var excludedSourceFiles = _excludeByFile?.Split(',');
105105
var excludeAttributes = _excludeByAttribute?.Split(',');
106106

107-
// We add default exclusion filter if no specified
108-
if (excludeFilters is null || excludeFilters.Length == 0)
109-
{
110-
excludeFilters = new string[] { "[xunit*]*" };
111-
}
112-
113107
Coverage coverage = new Coverage(_path, includeFilters, includeDirectories, excludeFilters, excludedSourceFiles, excludeAttributes, _includeTestAssembly, _singleHit, _mergeWith, _useSourceLink, _logger);
114108
CoveragePrepareResult prepareResult = coverage.PrepareModules();
115109
InstrumenterState = new TaskItem(System.IO.Path.GetTempFileName());

test/coverlet.collector.tests/CoverletSettingsParserTests.cs

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -78,33 +78,5 @@ private void CreateCoverletNodes(XmlDocument doc, XmlElement configElement, stri
7878
node.InnerText = nodeValue;
7979
configElement.AppendChild(node);
8080
}
81-
82-
[Fact]
83-
public void ParseShouldSkipXunitModulesIfEmptyExclude()
84-
{
85-
var testModules = new List<string> { "abc.dll" };
86-
87-
CoverletSettings coverletSettings = _coverletSettingsParser.Parse(null, testModules);
88-
89-
Assert.Equal("[coverlet.*]*", coverletSettings.ExcludeFilters[0]);
90-
Assert.Equal("[xunit*]*", coverletSettings.ExcludeFilters[1]);
91-
Assert.Equal(2, coverletSettings.ExcludeFilters.Length);
92-
}
93-
94-
[Fact]
95-
public void ParseShouldNotSkipXunitModulesIfNotEmptyExclude()
96-
{
97-
var testModules = new List<string> { "abc.dll" };
98-
var doc = new XmlDocument();
99-
var configElement = doc.CreateElement("Configuration");
100-
this.CreateCoverletNodes(doc, configElement, CoverletConstants.ExcludeFiltersElementName, "[coverlet.*.tests?]*");
101-
102-
CoverletSettings coverletSettings = _coverletSettingsParser.Parse(configElement, testModules);
103-
104-
Assert.Equal("[coverlet.*]*", coverletSettings.ExcludeFilters[0]);
105-
Assert.Equal("[coverlet.*.tests?]*", coverletSettings.ExcludeFilters[1]);
106-
Assert.Equal(2, coverletSettings.ExcludeFilters.Length);
107-
Assert.DoesNotContain("[xunit*]*", coverletSettings.ExcludeFilters);
108-
}
10981
}
11082
}

0 commit comments

Comments
 (0)