Skip to content

Revert "Add [xunit*]* to default excluded modules filter if not specified" #519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 28, 2019
Merged

Revert "Add [xunit*]* to default excluded modules filter if not specified" #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/coverlet.collector/DataCollection/CoverletSettingsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,6 @@ private string[] ParseExcludeFilters(XmlElement configurationElement)
}
}

// if we've only one element mean that we only added CoverletConstants.DefaultExcludeFilter
// so add default exclusions
if (excludeFilters.Count == 1)
{
excludeFilters.Add("[xunit*]*");
}

return excludeFilters.ToArray();
}

Expand Down
6 changes: 0 additions & 6 deletions src/coverlet.console/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,6 @@ static int Main(string[] args)
logger.Level = verbosity.ParsedValue;
}

// We add default exclusion filter if no specified
if (excludeFilters.Values.Count == 0)
{
excludeFilters.Values.Add("[xunit*]*");
}

Coverage coverage = new Coverage(module.Value,
includeFilters.Values.ToArray(),
includeDirectories.Values.ToArray(),
Expand Down
6 changes: 0 additions & 6 deletions src/coverlet.msbuild.tasks/InstrumentationTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,6 @@ public override bool Execute()
var excludedSourceFiles = _excludeByFile?.Split(',');
var excludeAttributes = _excludeByAttribute?.Split(',');

// We add default exclusion filter if no specified
if (excludeFilters is null || excludeFilters.Length == 0)
{
excludeFilters = new string[] { "[xunit*]*" };
}

Coverage coverage = new Coverage(_path, includeFilters, includeDirectories, excludeFilters, excludedSourceFiles, excludeAttributes, _includeTestAssembly, _singleHit, _mergeWith, _useSourceLink, _logger);
CoveragePrepareResult prepareResult = coverage.PrepareModules();
InstrumenterState = new TaskItem(System.IO.Path.GetTempFileName());
Expand Down
28 changes: 0 additions & 28 deletions test/coverlet.collector.tests/CoverletSettingsParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,33 +78,5 @@ private void CreateCoverletNodes(XmlDocument doc, XmlElement configElement, stri
node.InnerText = nodeValue;
configElement.AppendChild(node);
}

[Fact]
public void ParseShouldSkipXunitModulesIfEmptyExclude()
{
var testModules = new List<string> { "abc.dll" };

CoverletSettings coverletSettings = _coverletSettingsParser.Parse(null, testModules);

Assert.Equal("[coverlet.*]*", coverletSettings.ExcludeFilters[0]);
Assert.Equal("[xunit*]*", coverletSettings.ExcludeFilters[1]);
Assert.Equal(2, coverletSettings.ExcludeFilters.Length);
}

[Fact]
public void ParseShouldNotSkipXunitModulesIfNotEmptyExclude()
{
var testModules = new List<string> { "abc.dll" };
var doc = new XmlDocument();
var configElement = doc.CreateElement("Configuration");
this.CreateCoverletNodes(doc, configElement, CoverletConstants.ExcludeFiltersElementName, "[coverlet.*.tests?]*");

CoverletSettings coverletSettings = _coverletSettingsParser.Parse(configElement, testModules);

Assert.Equal("[coverlet.*]*", coverletSettings.ExcludeFilters[0]);
Assert.Equal("[coverlet.*.tests?]*", coverletSettings.ExcludeFilters[1]);
Assert.Equal(2, coverletSettings.ExcludeFilters.Length);
Assert.DoesNotContain("[xunit*]*", coverletSettings.ExcludeFilters);
}
}
}