huanld/coverlet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marco Rossignoli
2019-08-28 22:05:20 +03:00
committed by GitHub
parent 70b3ef31da
commit 15eeb98f5d
4 changed files with 0 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/coverlet.collector/DataCollection/CoverletSettingsParser.cs
-7
View File
@@ -131,13 +131,6 @@ namespace Coverlet.Collector.DataCollection
}
}
// 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();
}
src/coverlet.console/Program.cs
-6
View File
@@ -59,12 +59,6 @@ namespace Coverlet.Console
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(),
src/coverlet.msbuild.tasks/InstrumentationTask.cs
-6
View File
@@ -104,12 +104,6 @@ namespace Coverlet.MSbuild.Tasks
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());
test/coverlet.collector.tests/CoverletSettingsParserTests.cs
-28
View File
@@ -78,33 +78,5 @@ namespace Coverlet.Collector.Tests
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);
}
}
}