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

Merge branch 'master' into bugfix/spaces-in-path

Browse Source
This commit is contained in:
Coen Munckhof
2018-05-15 21:17:32 +02:00
parent bdb1c5aec6 0b42b0350f
commit cab6e7047d
3 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/coverlet.core/Coverage.cs
+1
View File
@@ -30,6 +30,7 @@ namespace Coverlet.Core
{
string[] modules = InstrumentationHelper.GetCoverableModules(_module);
string[] excludedFiles = InstrumentationHelper.GetExcludedFiles(_rules);
_filters = _filters?.Where(f => InstrumentationHelper.IsValidFilterExpression(f)).ToArray();
foreach (var module in modules)
{
src/coverlet.core/Helpers/InstrumentationHelper.cs
+32 -35
View File
@@ -81,6 +81,38 @@ namespace Coverlet.Core.Helpers
RetryHelper.Retry(() => File.Delete(path), retryStrategy, 10);
}
public static bool IsValidFilterExpression(string filter)
{
if (filter == null)
return false;
if (!filter.StartsWith("["))
return false;
if (!filter.Contains("]"))
return false;
if (filter.Count(f => f == '[') > 1)
return false;
if (filter.Count(f => f == ']') > 1)
return false;
if (filter.IndexOf(']') < filter.IndexOf('['))
return false;
if (filter.IndexOf(']') - filter.IndexOf('[') == 1)
return false;
if (filter.EndsWith("]"))
return false;
if (new Regex(@"[^\w*]").IsMatch(filter.Replace(".", "").Replace("[", "").Replace("]", "")))
return false;
return true;
}
public static bool IsModuleExcluded(string module, string[] filters)
{
if (filters == null)
@@ -91,9 +123,6 @@ namespace Coverlet.Core.Helpers
foreach (var filter in filters)
{
if (!IsValidFilterExpression(filter))
continue;
string modulePattern = filter.Substring(1, filter.IndexOf(']') - 1);
string typePattern = filter.Substring(filter.IndexOf(']') + 1);
@@ -116,9 +145,6 @@ namespace Coverlet.Core.Helpers
foreach (var filter in filters)
{
if (!IsValidFilterExpression(filter))
continue;
string typePattern = filter.Substring(filter.IndexOf(']') + 1);
string modulePattern = filter.Substring(1, filter.IndexOf(']') - 1);
@@ -191,35 +217,6 @@ namespace Coverlet.Core.Helpers
return retryStrategy;
}
private static bool IsValidFilterExpression(string filter)
{
if (!filter.StartsWith("["))
return false;
if (!filter.Contains("]"))
return false;
if (filter.Count(f => f == '[') > 1)
return false;
if (filter.Count(f => f == ']') > 1)
return false;
if (filter.IndexOf(']') < filter.IndexOf('['))
return false;
if (filter.IndexOf(']') - filter.IndexOf('[') == 1)
return false;
if (filter.EndsWith("]"))
return false;
if (new Regex(@"[^\w*]").IsMatch(filter.Replace(".", "").Replace("[", "").Replace("]", "")))
return false;
return true;
}
private static string WildcardToRegex(string pattern)
{
return "^" + Regex.Escape(pattern).
test/coverlet.core.tests/Helpers/InstrumentationHelperTests.cs
+15
View File
@@ -50,6 +50,21 @@ namespace Coverlet.Core.Helpers.Tests
Directory.Delete(directory.FullName, true);
}
[Fact]
public void TestIsValidFilterExpression()
{
Assert.True(InstrumentationHelper.IsValidFilterExpression("[*]*"));
Assert.True(InstrumentationHelper.IsValidFilterExpression("[*]*core"));
Assert.True(InstrumentationHelper.IsValidFilterExpression("[assembly]*"));
Assert.True(InstrumentationHelper.IsValidFilterExpression("[*]type"));
Assert.True(InstrumentationHelper.IsValidFilterExpression("[assembly]type"));
Assert.False(InstrumentationHelper.IsValidFilterExpression("[*]"));
Assert.False(InstrumentationHelper.IsValidFilterExpression("[-]*"));
Assert.False(InstrumentationHelper.IsValidFilterExpression("*"));
Assert.False(InstrumentationHelper.IsValidFilterExpression("]["));
Assert.False(InstrumentationHelper.IsValidFilterExpression(null));
}
[Fact]
public void TestDontCopyCoverletDependency()
{