Copy all jars resolved by Gradle for ModularUserGuideTests

Author: marcphilipp

platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts

@@ -58,7 +58,9 @@ dependencies {
 		because("it uses the OS enum to support Windows")
 	}
 
-	thirdPartyJars(libs.junit4)
+	thirdPartyJars(libs.junit4) {
+		exclude(group = "org.hamcrest")
+	}
 	thirdPartyJars(libs.assertj)
 	thirdPartyJars(libs.apiguardian)
 	thirdPartyJars(libs.hamcrest)

platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java

@@ -13,6 +13,8 @@
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.stream.Stream;
@@ -22,16 +24,34 @@ public class ThirdPartyJars {
 	private ThirdPartyJars() {
 	}
 
-	public static void copy(Path targetDir, String group, String artifact) throws Exception {
+	public static void copy(Path targetDir, String group, String artifact) {
 		Path source = find(group, artifact);
-		Files.copy(source, targetDir.resolve(source.getFileName()), REPLACE_EXISTING);
+		copy(source, targetDir);
+	}
+
+	public static void copyAll(Path targetDir) {
+		thirdPartyJars().forEach(path -> copy(path, targetDir));
+	}
+
+	private static void copy(Path source, Path targetDir) {
+		try {
+			Files.copy(source, targetDir.resolve(source.getFileName()), REPLACE_EXISTING);
+		}
+		catch (IOException e) {
+			throw new UncheckedIOException("Failed to copy %s to %s".formatted(source, targetDir), e);
+		}
 	}
 
 	public static Path find(String group, String artifact) {
-		return Stream.of(System.getProperty("thirdPartyJars").split(File.pathSeparator)) //
-				.filter(it -> it.replace(File.separator, "/").contains("/" + group + "/" + artifact + "/")) //
-				.map(Path::of) //
+		return thirdPartyJars() //
+				.filter(it -> it.toAbsolutePath().toString().replace(File.separator, "/").contains(
+					"/" + group + "/" + artifact + "/")) //
 				.findFirst() //
 				.orElseThrow(() -> new AssertionError("Failed to find JAR file for " + group + ":" + artifact));
 	}
+
+	private static Stream<Path> thirdPartyJars() {
+		return Stream.of(System.getProperty("thirdPartyJars").split(File.pathSeparator)) //
+				.map(Path::of);
+	}
 }

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

@@ -83,18 +83,7 @@ private static List<String> compile(Path temp, Writer out, Writer err) throws Ex
 		args.add(temp.resolve("destination").toString());
 
 		var lib = Files.createDirectories(temp.resolve("lib"));
-		ThirdPartyJars.copy(lib, "junit", "junit");
-		ThirdPartyJars.copy(lib, "org.assertj", "assertj-core");
-		// Byte Buddy is used by AssertJ's soft assertions which are used by the Engine Test Kit
-		ThirdPartyJars.copy(lib, "net.bytebuddy", "byte-buddy");
-		ThirdPartyJars.copy(lib, "org.apiguardian", "apiguardian-api");
-		ThirdPartyJars.copy(lib, "org.hamcrest", "hamcrest");
-		ThirdPartyJars.copy(lib, "org.jspecify", "jspecify");
-		ThirdPartyJars.copy(lib, "org.opentest4j", "opentest4j");
-		ThirdPartyJars.copy(lib, "org.opentest4j.reporting", "open-test-reporting-tooling-spi");
-		ThirdPartyJars.copy(lib, "com.google.jimfs", "jimfs");
-		ThirdPartyJars.copy(lib, "com.google.guava", "guava");
-		ThirdPartyJars.copy(lib, "com.google.guava", "failureaccess");
+		ThirdPartyJars.copyAll(lib);
 		loadAllJUnitModules(lib);
 		args.add("--module-path");
 		args.add(lib.toString());
@@ -161,31 +150,17 @@ void runTestsFromUserGuideWithinModularBoundaries(@TempDir Path temp,
 		var err = new StringWriter();
 
 		var args = compile(temp, out, err);
-		// args.forEach(System.out::println);
 
 		assertTrue(err.toString().isBlank(), () -> err + "\n\n" + String.join("\n", args));
 		var listing = treeWalk(temp);
 		assertLinesMatch(List.of( //
 			"destination", //
-			">> CLASSES >>", //
-			"lib", //
-			"lib/apiguardian-api-.+\\.jar", //
-			"lib/assertj-core-.+\\.jar", //
-			"lib/byte-buddy-.+", //
-			"lib/failureaccess-.+\\.jar", //
-			"lib/guava-.+\\.jar", //
-			"lib/hamcrest-.+\\.jar", //
-			"lib/jimfs-.+\\.jar", //
-			"lib/jspecify-.+\\.jar", //
-			"lib/junit-.+\\.jar", //
-			">> ALL JUNIT 5 JARS >>", //
+			">> CLASSES AND JARS >>", //
 			"lib/opentest4j-.+\\.jar", //
 			"src", //
 			"src/documentation", //
 			"src/documentation/module-info.java" //
 		), listing);
-		// System.out.println("______________");
-		// listing.forEach(System.out::println);
 
 		junit(temp, outputFiles);
 	}