chore: fix CommandLineParser specific workaround code

Author: filzrev

src/BenchmarkDotNet/ConsoleArguments/ConfigParser.cs

@@ -467,12 +467,6 @@ private static IEnumerable<string> ConsumeTokens(string line)
             string GetToken()
             {
                 var result = token.ToString();
-                if (result.Contains(' '))
-                {
-                    // Workaround for CommandLine library issue with parsing these kind of args.
-                    return " " + result;
-                }
-
                 return result;
             }
         }

tests/BenchmarkDotNet.IntegrationTests/BenchmarkSwitcherTest.cs

@@ -20,9 +20,7 @@ public class BenchmarkSwitcherTest
 
         public BenchmarkSwitcherTest(ITestOutputHelper output) => Output = output;
 
-        [FactEnvSpecific(
-            "When CommandLineParser wants to display help, it tries to get the Title of the Entry Assembly which is an xunit runner, which has no Title and fails..",
-            EnvRequirement.DotNetCoreOnly)]
+        [Fact]
         public void WhenInvalidCommandLineArgumentIsPassedAnErrorMessageIsDisplayedAndNoBenchmarksAreExecuted()
         {
             var logger = new OutputLogger(Output);

tests/BenchmarkDotNet.Tests/ConfigParserTests.cs

@@ -160,12 +160,15 @@ public void UserCanChooseInProcessAndStrategyMonitoring()
             job.Run.RunStrategy.Should().Be(RunStrategy.Monitoring);
         }
 
-        [FactEnvSpecific(
-            "When CommandLineParser wants to display help, it tries to get the Title of the Entry Assembly which is an xunit runner, which has no Title and fails..",
-            EnvRequirement.DotNetCoreOnly)]
+        [Fact]
         public void UnknownConfigMeansFailure()
         {
-            Assert.False(ConfigParser.Parse(["--unknown"], new OutputLogger(Output)).isSuccess);
+            var logger = new AccumulationLogger();
+            var results = ConfigParser.Parse(["--unknown"], logger);
+
+            // Assert
+            results.isSuccess.Should().BeTrue();
+            logger.GetLog().Should().Contain("Option 'unknown' is unknown.");
         }
 
         [Fact]
@@ -766,31 +769,37 @@ public void UsersCanSpecifyEvaluateOverhead()
             }
         }
 
-        [Fact(Skip = "This should be handled somehow at CommandLineParser level. See https://github.com/commandlineparser/commandline/pull/892")]
+        [Fact]
         public void UserCanSpecifyWasmArgs()
         {
             var parsedConfiguration = ConfigParser.Parse(["--runtimes", "wasmnet80", "--wasmArgs", "--expose_wasm --module", GetDummyWasmEngine()], new OutputLogger(Output));
-            Assert.True(parsedConfiguration.isSuccess);
-            Assert.NotNull(parsedConfiguration.config);
+
+            // Assert
+            parsedConfiguration.isSuccess.Should().BeTrue();
+            parsedConfiguration.config.Should().NotBeNull();
+
             var jobs = parsedConfiguration.config.GetJobs();
             foreach (var job in parsedConfiguration.config.GetJobs())
             {
                 var wasmRuntime = Assert.IsType<WasmRuntime>(job.Environment.Runtime);
-                Assert.Equal(" --expose_wasm --module", wasmRuntime.JavaScriptEngineArguments);
+                wasmRuntime.JavaScriptEngineArguments.Should().Be("--expose_wasm --module");
             }
         }
 
         [Fact]
         public void UserCanSpecifyWasmArgsUsingEquals()
         {
             var parsedConfiguration = ConfigParser.Parse(["--runtimes", "wasmnet80", "--wasmArgs=--expose_wasm --module", GetDummyWasmEngine()], new OutputLogger(Output));
-            Assert.True(parsedConfiguration.isSuccess);
-            Assert.NotNull(parsedConfiguration.config);
+
+            // Assert
+            parsedConfiguration.isSuccess.Should().BeTrue();
+            parsedConfiguration.config.Should().NotBeNull();
+
             var jobs = parsedConfiguration.config.GetJobs();
             foreach (var job in parsedConfiguration.config.GetJobs())
             {
-                var wasmRuntime = Assert.IsType<WasmRuntime>(job.Environment.Runtime);
-                Assert.Equal("--expose_wasm --module", wasmRuntime.JavaScriptEngineArguments);
+                var wasmRuntime = job.Environment.Runtime.Should().BeOfType<WasmRuntime>().Subject;
+                wasmRuntime.JavaScriptEngineArguments.Should().Be("--expose_wasm --module");
             }
         }
 
@@ -805,15 +814,16 @@ public void UserCanSpecifyWasmArgsViaResponseFile()
                 GetDummyWasmEngine()
             ]);
             var parsedConfiguration = ConfigParser.Parse([$"@{tempResponseFile}"], new OutputLogger(Output));
-            Assert.True(parsedConfiguration.isSuccess);
-            Assert.NotNull(parsedConfiguration.config);
+
+            // Assert
+            parsedConfiguration.isSuccess.Should().BeTrue();
+            parsedConfiguration.config.Should().NotBeNull();
+
             var jobs = parsedConfiguration.config.GetJobs();
             foreach (var job in parsedConfiguration.config.GetJobs())
             {
-                var wasmRuntime = Assert.IsType<WasmRuntime>(job.Environment.Runtime);
-                // We may need change assertion to just "--expose_wasm --module"
-                // if https://github.com/commandlineparser/commandline/pull/892 lands
-                Assert.Equal(" --expose_wasm --module", wasmRuntime.JavaScriptEngineArguments);
+                var wasmRuntime = job.Environment.Runtime.Should().BeOfType<WasmRuntime>().Subject;
+                wasmRuntime.JavaScriptEngineArguments.Should().Be("--expose_wasm --module");
             }
         }