fix tests

unimined · Jul 20, 2024 · ea642d9 · ea642d9
1 parent a5e0c00
commit ea642d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/JVMDowngraderExtension.kt b/gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/JVMDowngraderExtension.kt
@@ -45,6 +45,7 @@ abstract class JVMDowngraderExtension @Inject constructor(@get:Internal val proj
     /**
      * the main api jar to use for downgrading
      */
+    @get:Internal
     var apiJarDefault by LazyMutable {
         val apiJar = project.file(".gradle").resolve("jvmdg/java-api-${version}.jar")
         if (!apiJar.exists() || project.gradle.startParameter.isRefreshDependencies) {

diff --git a/src/test/java/xyz/wagyourtail/jvmdg/test/integration/ClassRunner.java b/src/test/java/xyz/wagyourtail/jvmdg/test/integration/ClassRunner.java
@@ -69,7 +69,7 @@ private static <T, U> Stream<Map.Entry<T, U>> zip(Stream<T> a, Stream<U> b) {
     private static Stream<FlagsAndRunner> flags() {
         Flags flags = ClassRunner.flags.copy();
         flags.quiet = true;
-        flags.api = javaApi.toFile();
+        flags.api = Set.of(javaApi.toFile());
 
         return Stream.of(
             new FlagsAndRunner(flags.copy(e -> e.classVersion = JavaRunner.JavaVersion.V1_8.toOpcode()), JavaRunner.JavaVersion.V1_8)
@@ -176,7 +176,7 @@ private static synchronized Path getShadedJar(FlagsAndRunner flags) {
                     "downgradetest",
                     getDowngradedJar(flags).toFile(),
                     target.toFile(),
-                    getApiJar(flags).toFile()
+                    Set.of(getApiJar(flags).toFile())
                 );
                 return target;
             } catch (IOException ex) {
@@ -198,7 +198,7 @@ private static synchronized Path getApiJar(FlagsAndRunner flags) {
                 Path target = getApiPath(flags);
                 ZipDowngrader.downgradeZip(
                     ClassDowngrader.downgradeTo(flags.flags),
-                    flags.flags.api.toPath(),
+                    javaApi,
                     Set.of(),
                     target
                 );
@@ -390,6 +390,7 @@ public void testRuntime(String mainClass, FlagsAndRunner javaVersion) throws IOE
     }
 
     public static void compareResults(String mainClass, FlagsAndRunner javaVersion, Map.Entry<Integer, String> originalResult, Map.Entry<Integer, String> downgradedResult) {
+        assertEquals(0, originalResult.getKey());
         assertEquals(originalResult.getValue(), downgradedResult.getValue(), "Output mismatch for " + mainClass + " on " + javaVersion.readableSlug());
         assertEquals(originalResult.getKey(), downgradedResult.getKey(), "Exit code mismatch for " + mainClass + " on " + javaVersion.readableSlug());
     }