include argument and param names in --filter (#2132)

Author: blouflashdb

src/BenchmarkDotNet/ConsoleArguments/CorrectionsSuggester.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Extensions;
 using BenchmarkDotNet.Running;
 using JetBrains.Annotations;
@@ -21,7 +22,7 @@ public CorrectionsSuggester(IReadOnlyList<Type> types)
             {
                 foreach (var benchmarkCase in benchmarkRunInfo.BenchmarksCases)
                 {
-                    string fullBenchmarkName = benchmarkCase.Descriptor.GetFilterName();
+                    string fullBenchmarkName = FullNameProvider.GetBenchmarkName(benchmarkCase);
 
                     actualFullBenchmarkNames.Add(fullBenchmarkName);
 

src/BenchmarkDotNet/Filters/GlobFilter.cs

@@ -1,5 +1,7 @@
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
+using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Running;
 
 namespace BenchmarkDotNet.Filters
@@ -16,9 +18,10 @@ public class GlobFilter : IFilter
         public bool Predicate(BenchmarkCase benchmarkCase)
         {
             var benchmark = benchmarkCase.Descriptor.WorkloadMethod;
-            string fullBenchmarkName = benchmarkCase.Descriptor.GetFilterName();
+            string nameWithoutArgs = benchmarkCase.Descriptor.GetFilterName();
+            string fullBenchmarkName = FullNameProvider.GetBenchmarkName(benchmarkCase);
 
-            return patterns.Any(pattern => pattern.IsMatch(fullBenchmarkName));
+            return patterns.Any(pattern => pattern.IsMatch(fullBenchmarkName) || pattern.IsMatch(nameWithoutArgs));
         }
 
         internal static Regex[] ToRegex(string[] patterns)

tests/BenchmarkDotNet.Tests/GlobFilterTests.cs

@@ -1,4 +1,6 @@
 using System.Linq;
+using System.Threading;
+using ApprovalUtilities.Utilities;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Filters;
 using BenchmarkDotNet.Running;
@@ -27,9 +29,38 @@ public void TheFilterIsCaseInsensitive(string pattern, bool expected)
             Assert.Equal(expected, filter.Predicate(benchmarkCase));
         }
 
-        public class TypeWithBenchmarks
+        [Theory]
+        [InlineData(nameof(TypeWithBenchmarksAndParams), 0)] // type name
+        [InlineData("typewithbenchmarksandparams", 0)] // type name lowercase
+        [InlineData("TYPEWITHBENCHMARKSANDPARAMS", 0)] // type name uppercase
+        [InlineData("*TypeWithBenchmarksAndParams*", 2)] // regular expression
+        [InlineData("*typewithbenchmarksandparams*", 2)] // regular expression lowercase
+        [InlineData("*TYPEWITHBENCHMARKSANDPARAMS*", 2)] // regular expression uppercase
+        [InlineData("*", 2)]
+        [InlineData("WRONG", 0)]
+        [InlineData("*stillWRONG*", 0)]
+        [InlineData("BenchmarkDotNet.Tests.TypeWithBenchmarksAndParams.TheBenchmark", 2)]
+        [InlineData("BenchmarkDotNet.Tests.TypeWithBenchmarksAndParams.TheBenchmark(A: 100)", 1)]
+        public void TheFilterWorksWithParams(string pattern, int expectedBenchmarks)
         {
-            [Benchmark] public void TheBenchmark() { }
+            var benchmarkCases = BenchmarkConverter.TypeToBenchmarks(typeof(TypeWithBenchmarksAndParams)).BenchmarksCases;
+
+            var filter = new GlobFilter(new[] { pattern });
+
+            Assert.Equal(expectedBenchmarks, benchmarkCases.Where(benchmarkCase => filter.Predicate(benchmarkCase)).Count());
         }
     }
+
+    public class TypeWithBenchmarks
+    {
+        [Benchmark] public void TheBenchmark() { }
+    }
+
+    public class TypeWithBenchmarksAndParams
+    {
+        [Params(100, 200)]
+        public int A { get; set; }
+
+        [Benchmark] public void TheBenchmark() { }
+    }
 }