[SUREFIRE-2057] jpms requires static must be included (#508)

* [SUREFIRE-2057] jpms requires static must be included Signed-off-by: Olivier Lamy <olamy@apache.org> * fix mocking Signed-off-by: Olivier Lamy <olamy@apache.org>
apache · Apr 15, 2022 · 541a65d · 541a65d
1 parent ac85f4e
commit 541a65d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/...-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/...-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -2049,6 +2049,7 @@ private StartupConfiguration newStartupConfigWithModularPath(
             ResolvePathsRequest<String> req = ResolvePathsRequest.ofStrings( testClasspath.getClassPath() )
                     .setIncludeAllProviders( true )
                     .setJdkHome( javaHome )
+                    .setIncludeStatic( true )
                     .setModuleDescriptor( javaModuleDescriptor );
 
             ResolvePathsResult<String> result = getLocationManager().resolvePaths( req );

diff --git a/...mon/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java b/...mon/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
@@ -152,6 +152,7 @@ public void shouldHaveStartupConfigForModularClasspath()
         mockStatic( ResolvePathsRequest.class );
         when( ResolvePathsRequest.ofStrings( eq( testClasspath.toClasspath().getClassPath() ) ) ).thenReturn( req );
         when( req.setJdkHome( anyString() ) ).thenReturn( req );
+        when( req.setIncludeStatic( true ) ).thenReturn( req );
         when( req.setIncludeAllProviders( anyBoolean() ) ).thenReturn( req );
         when( req.setModuleDescriptor( eq( descriptor ) ) ).thenReturn( req );