Skip to content

Commit 8f2a49b

Browse files
committed
Add Guava to module graph
Guava now includes a module descriptor but Jimfs doesn't so we need to manually add it to the module graph as a root module.
1 parent 1d3a5ea commit 8f2a49b

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ private static List<String> compile(Path temp, Writer out, Writer err) throws Ex
9494
ThirdPartyJars.copy(lib, "org.opentest4j.reporting", "open-test-reporting-tooling-spi");
9595
ThirdPartyJars.copy(lib, "com.google.jimfs", "jimfs");
9696
ThirdPartyJars.copy(lib, "com.google.guava", "guava");
97+
ThirdPartyJars.copy(lib, "com.google.guava", "failureaccess");
9798
loadAllJUnitModules(lib);
9899
args.add("--module-path");
99100
args.add(lib.toString());
@@ -136,6 +137,7 @@ private static void junit(Path temp, OutputFiles outputFiles) throws Exception {
136137
)) //
137138
.addArguments("--add-modules", "documentation") //
138139
.addArguments("--patch-module", "documentation=" + projectDir.resolve("src/test/resources")) //
140+
.addArguments("--add-modules", "com.google.common") //
139141
.addArguments("--module", "org.junit.platform.console") //
140142
.addArguments("execute") //
141143
.addArguments("--scan-modules") //
@@ -170,6 +172,7 @@ void runTestsFromUserGuideWithinModularBoundaries(@TempDir Path temp,
170172
"lib/apiguardian-api-.+\\.jar", //
171173
"lib/assertj-core-.+\\.jar", //
172174
"lib/byte-buddy-.+", //
175+
"lib/failureaccess-.+\\.jar", //
173176
"lib/guava-.+\\.jar", //
174177
"lib/hamcrest-.+\\.jar", //
175178
"lib/jimfs-.+\\.jar", //

0 commit comments

Comments
 (0)