From ce3d3ffbf09b9a19b6fbd4ffc37dd3452cc048e3 Mon Sep 17 00:00:00 2001 From: Maarten Mulders Date: Sun, 24 Apr 2022 16:05:14 +0200 Subject: [PATCH 1/2] [SUREFIRE-2063] Allow consecutive spaces in argLine --- .../surefire/booterclient/DefaultForkConfiguration.java | 4 ++-- .../surefire/booterclient/DefaultForkConfigurationTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java index 8ffb868a01..995a67a3f4 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java @@ -251,9 +251,9 @@ private String interpolateArgLineWithPropertyExpressions() } @Nonnull - private static String stripWhitespace( @Nonnull String argLine ) + static String stripWhitespace( @Nonnull String argLine ) { - return argLine.replaceAll( "\\s+", " " ); + return argLine.replaceAll( "\\s", " " ); } /** diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfigurationTest.java index 90c258d1b2..ad668856e9 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfigurationTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfigurationTest.java @@ -248,8 +248,8 @@ protected void resolveClasspath( @Nonnull Commandline cli, DefaultForkConfiguration mockedConfig = spy( config ); String newArgLine = invokeMethod( mockedConfig, "newJvmArgLine", new Class[] { int.class }, 2 ); verifyPrivate( mockedConfig, times( 1 ) ).invoke( "interpolateArgLineWithPropertyExpressions" ); - verifyPrivate( mockedConfig, times( 1 ) ).invoke( "extendJvmArgLine", eq( "a b" ) ); - assertThat( newArgLine ).isEqualTo( "a b" ); + verifyPrivate( mockedConfig, times( 1 ) ).invoke( "extendJvmArgLine", eq( "a b" ) ); + assertThat( newArgLine ).isEqualTo( "a b" ); } @Test From a8a020cf85e1c4eaca71aa88d8c056d5b416ecef Mon Sep 17 00:00:00 2001 From: Maarten Mulders Date: Sun, 24 Apr 2022 22:05:06 +0200 Subject: [PATCH 2/2] [SUREFIRE-2063] Revert visibility change --- .../plugin/surefire/booterclient/DefaultForkConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java index 995a67a3f4..b70abd75f1 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java @@ -251,7 +251,7 @@ private String interpolateArgLineWithPropertyExpressions() } @Nonnull - static String stripWhitespace( @Nonnull String argLine ) + private static String stripWhitespace( @Nonnull String argLine ) { return argLine.replaceAll( "\\s", " " ); }