You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/01/21 01:33:59 UTC
[maven-surefire] branch SUREFIRE-1534 updated: fixed
AbstractSurefireMojoJava7PlusTest
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch SUREFIRE-1534
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/SUREFIRE-1534 by this push:
new e85a02f fixed AbstractSurefireMojoJava7PlusTest
e85a02f is described below
commit e85a02f56e5ae8769b211fe02b149c5c600cf6cc
Author: tibordigana <ti...@apache.org>
AuthorDate: Mon Jan 21 02:33:48 2019 +0100
fixed AbstractSurefireMojoJava7PlusTest
---
.../AbstractSurefireMojoJava7PlusTest.java | 29 +++++++++++++++++-----
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
index 17cd930..0f9ee80 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
@@ -43,10 +43,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import java.io.File;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import static java.util.Arrays.asList;
import static java.util.Collections.singleton;
@@ -154,6 +151,24 @@ public class AbstractSurefireMojoJava7PlusTest
doNothing().when( logger ).debug( anyString() );
when( mojo.getConsoleLogger() ).thenReturn( new PluginConsoleLogger( logger ) );
+ Artifact common = new DefaultArtifact( "org.apache.maven.surefire", "maven-surefire-common", v5, "runtime",
+ "jar", "", handler );
+ common.setFile( mockFile( "maven-surefire-common.jar" ) );
+
+ Artifact api = new DefaultArtifact( "org.apache.maven.surefire", "surefire-api", v5, "runtime",
+ "jar", "", handler );
+ api.setFile( mockFile( "surefire-api.jar" ) );
+
+ Artifact loggerApi = new DefaultArtifact( "org.apache.maven.surefire", "surefire-logger-api", v5, "runtime",
+ "jar", "", handler );
+ loggerApi.setFile( mockFile( "surefire-logger-api.jar" ) );
+
+ Map<String, Artifact> artifacts = new HashMap<>();
+ artifacts.put( "org.apache.maven.surefire:maven-surefire-common", common );
+ artifacts.put( "org.apache.maven.surefire:surefire-api", api );
+ artifacts.put( "org.apache.maven.surefire:surefire-logger-api", loggerApi );
+ when( mojo.getPluginArtifactMap() ).thenReturn( artifacts );
+
StartupConfiguration conf = invokeMethod( mojo, "newStartupConfigWithModularPath",
classLoaderConfiguration, providerClasspath, "org.asf.Provider", moduleInfo, scanResult,
"" );
@@ -178,14 +193,16 @@ public class AbstractSurefireMojoJava7PlusTest
assertThat( argument2.getValue().getMessage() )
.isEqualTo( "low version" );
ArgumentCaptor<String> argument = ArgumentCaptor.forClass( String.class );
- verify( logger, times( 6 ) ).debug( argument.capture() );
+ verify( logger, times( 8 ) ).debug( argument.capture() );
assertThat( argument.getAllValues() )
.containsExactly( "test classpath: non-modular.jar junit.jar hamcrest.jar",
"test modulepath: modular.jar classes",
"provider classpath: surefire-provider.jar",
"test(compact) classpath: non-modular.jar junit.jar hamcrest.jar",
"test(compact) modulepath: modular.jar classes",
- "provider(compact) classpath: surefire-provider.jar"
+ "provider(compact) classpath: surefire-provider.jar",
+ "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-api.jar surefire-logger-api.jar",
+ "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-api.jar surefire-logger-api.jar"
);
assertThat( conf ).isNotNull();