make :enigma-cli:test depend on test input obf tasks

supersaiyansubtlety · supersaiyansubtlety · commit 01ac31bffebb · 2025-11-17T16:31:04.000-08:00
make SearchMappingsTest use its own, islolated jar
diff --git a/enigma-cli/build.gradle b/enigma-cli/build.gradle
@@ -15,6 +15,8 @@ application {
 	jar.manifest.attributes 'Main-Class': mainClass
 }
 
+test.dependsOn(project(':enigma').tasks.named('obfuscateAllTestInput'))
+
 publishing {
 	publications {
 		"$project.name"(MavenPublication) {
diff --git a/enigma-cli/src/test/java/org/quiltmc/enigma/command/SearchMappingsTest.java b/enigma-cli/src/test/java/org/quiltmc/enigma/command/SearchMappingsTest.java
@@ -22,7 +22,8 @@
 import static org.quiltmc.enigma.TestUtil.getResource;
 
 public class SearchMappingsTest {
-	private static final Path JAR = TestUtil.obfJar("complete");
+	// private static final Path JAR = TestUtil.obfJar("complete");
+	private static final Path JAR = TestUtil.obfJar("search_mappings");
 	private static final Path MAPPINGS = getResource("/search_mappings");
 
 	// classes
diff --git a/enigma-cli/src/test/resources/search_mappings/OtherReturnInterface.mapping b/enigma-cli/src/test/resources/search_mappings/OtherReturnInterface.mapping
@@ -1,3 +1,3 @@
-CLASS Z OtherReturnInterface
+CLASS f OtherReturnInterface
 	METHOD a abstractMethod (I)C
 		ARG 1 intParam
diff --git a/enigma-cli/src/test/resources/search_mappings/OuterClass.mapping b/enigma-cli/src/test/resources/search_mappings/OuterClass.mapping
@@ -1,3 +1,3 @@
-CLASS aa OuterClass
+CLASS g OuterClass
 	CLASS a InnerClass
-		METHOD a getOther ()LZ;
+		METHOD a getOther ()Lf;
diff --git a/enigma-cli/src/test/resources/search_mappings/ParamType.mapping b/enigma-cli/src/test/resources/search_mappings/ParamType.mapping
@@ -1 +1 @@
-CLASS t ParamType
+CLASS h ParamType
diff --git a/enigma-cli/src/test/resources/search_mappings/SelfReturnEnum.mapping b/enigma-cli/src/test/resources/search_mappings/SelfReturnEnum.mapping
@@ -1,4 +1,4 @@
-CLASS l SelfReturnEnum
-	METHOD a staticGetArray ()[Ll;
-	METHOD a staticGet (Ljava/lang/String;)Ll;
+CLASS i SelfReturnEnum
+	METHOD a staticGetArray ()[Li;
+	METHOD a staticGet (Ljava/lang/String;)Li;
 		ARG 0 staticStringParam
diff --git a/enigma-cli/src/test/resources/search_mappings/a.mapping b/enigma-cli/src/test/resources/search_mappings/a.mapping
@@ -1,2 +1,2 @@
-CLASS I
+CLASS a
 	FIELD a privateStringField Ljava/lang/String;
diff --git a/enigma-cli/src/test/resources/search_mappings/b.mapping b/enigma-cli/src/test/resources/search_mappings/b.mapping
@@ -1,4 +1,4 @@
-CLASS ac
+CLASS b
 	FIELD a floatField F
 	FIELD a intField I
 	FIELD a stringField Ljava/lang/String;
diff --git a/enigma-cli/src/test/resources/search_mappings/c.mapping b/enigma-cli/src/test/resources/search_mappings/c.mapping
@@ -0,0 +1,3 @@
+CLASS c
+	METHOD a staticVoidMethod (Lh;)V
+		ARG 0 staticTypedParam
diff --git a/enigma-cli/src/test/resources/search_mappings/d.mapping b/enigma-cli/src/test/resources/search_mappings/d.mapping
@@ -1,4 +1,4 @@
-CLASS V
+CLASS d
 	FIELD a recordInt I
 	FIELD a recordString Ljava/lang/String;
 	FIELD b PRIVATE_STATIC_FINAL_INT_FIELD I
diff --git a/enigma-cli/src/test/resources/search_mappings/e.mapping b/enigma-cli/src/test/resources/search_mappings/e.mapping
@@ -1,2 +1,2 @@
-CLASS ak
+CLASS e
 	CLASS b InnerFieldType
diff --git a/enigma-cli/src/test/resources/search_mappings/r.mapping b/enigma-cli/src/test/resources/search_mappings/r.mapping
diff --git a/enigma-cli/src/test/resources/search_mappings/some/packaged/PackagedClass.mapping b/enigma-cli/src/test/resources/search_mappings/some/packaged/PackagedClass.mapping
@@ -1 +1 @@
-CLASS Q some/packaged/PackagedClass
+CLASS j some/packaged/PackagedClass
diff --git a/enigma/build.gradle b/enigma/build.gradle
@@ -108,12 +108,17 @@ static String taskNameFrom(String name) {
 	return builder.toString()
 }
 
+
+tasks.register('obfuscateAllTestInput') {
+	group = 'test-setup'
+}
+
 // Generate obfuscated JARs for tests
 // If your test fails for class file version problem with proguard, run gradle with -Dorg.gradle.java.home="<older jdk>" flag
 def registerTestJarTasks(String name, String... input) {
 	String taskName = taskNameFrom(name)
 	final testJar = tasks.register("${taskName}TestJar", Jar.class) {
-		group = "test-setup"
+		group = 'test-setup'
 		from(sourceSets.test.output) {
 			include input
 		}
@@ -127,7 +132,7 @@ def registerTestJarTasks(String name, String... input) {
 		: file('src/test/resources/proguard-test.conf')
 
 	final testObf = tasks.register("${taskName}TestObf", ProGuardTask) {
-		group = "test-setup"
+		group = 'test-setup'
 
 		configuration confFileArg
 
@@ -145,7 +150,9 @@ def registerTestJarTasks(String name, String... input) {
 		outjars outDir.map { it.dir("${name}.jar") }
 	}
 
-	test.dependsOn(testObf)
+	tasks.named('obfuscateAllTestInput') {
+		dependsOn(testObf)
+	}
 }
 
 registerTestJarTasks("complete", "org/quiltmc/enigma/input/**/*.class")
diff --git a/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/Obf_a.java b/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/Obf_a.java
@@ -0,0 +1,13 @@
+package org.quiltmc.enigma.input.search_mappings;
+
+public class Obf_a {
+	private final String name;
+
+	public Obf_a(String name) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+}
diff --git a/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/Obf_b.java b/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/Obf_b.java
@@ -0,0 +1,21 @@
+package org.quiltmc.enigma.input.search_mappings;
+
+public class Obf_b {
+	public int one;
+	public float two;
+	public String three;
+
+	public void m1() {
+	}
+
+	public int m2() {
+		return 42;
+	}
+
+	public void m3(int a1) {
+	}
+
+	public int m4(int a1) {
+		return 5; // chosen by fair die roll, guaranteed to be random
+	}
+}
diff --git a/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/Obf_c.java b/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/Obf_c.java
@@ -0,0 +1,12 @@
+package org.quiltmc.enigma.input.search_mappings;
+
+public class Obf_c {
+	public static void foo(final ParamType arg) {
+		System.out.println(new Object() {
+			@Override
+			public String toString() {
+				return arg.toString();
+			}
+		});
+	}
+}
diff --git a/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/Obf_d.java b/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/Obf_d.java
@@ -0,0 +1,13 @@
+package org.quiltmc.enigma.input.search_mappings;
+
+public record Obf_d(String a, String b, int c, double d) {
+	private static final int gaming = 234;
+
+	public Obf_d(String a, String b, double d, int c) {
+		this(a, b, c, d);
+	}
+
+	public Obf_d(String b) {
+		this("gaming", b, 1, 2.0);
+	}
+}
diff --git a/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/Obf_e.java b/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/Obf_e.java
@@ -0,0 +1,23 @@
+package org.quiltmc.enigma.input.search_mappings;
+
+import java.util.List;
+import java.util.Map;
+
+public class Obf_e {
+	public List<Integer> f1;
+	public List<A_Type> f2;
+	public Map<A_Type, A_Type> f3;
+	public B_Generic<Integer> f5;
+	public B_Generic<A_Type> f6;
+
+	public class A_Type {
+	}
+
+	public class B_Generic<T> {
+		public T f4;
+
+		public T m1() {
+			return null;
+		}
+	}
+}
diff --git a/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/OtherReturnInterface.java b/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/OtherReturnInterface.java
@@ -0,0 +1,5 @@
+package org.quiltmc.enigma.input.search_mappings;
+
+public interface OtherReturnInterface {
+	char get(int n);
+}
diff --git a/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/OuterClass.java b/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/OuterClass.java
@@ -0,0 +1,14 @@
+package org.quiltmc.enigma.input.search_mappings;
+
+public class OuterClass {
+	public static class Inner {
+		public OtherReturnInterface get() {
+			return new OtherReturnInterface() {
+				@Override
+				public char get(int n) {
+					return 0;
+				}
+			};
+		}
+	}
+}
diff --git a/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/ParamType.java b/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/ParamType.java
@@ -0,0 +1,7 @@
+package org.quiltmc.enigma.input.search_mappings;
+
+public class ParamType {
+	class Inner {
+		// nothing to do
+	}
+}
diff --git a/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/SelfReturnEnum.java b/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/SelfReturnEnum.java
@@ -0,0 +1,14 @@
+package org.quiltmc.enigma.input.search_mappings;
+
+public enum SelfReturnEnum {
+	One,
+	Two,
+	Three,
+	Four,
+	Five,
+	Six,
+	Seven,
+	Eight,
+	Nine,
+	Ten
+}
diff --git a/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/packages/a/b/c/PackagedClass.java b/enigma/src/test/java/org/quiltmc/enigma/input/search_mappings/packages/a/b/c/PackagedClass.java
@@ -0,0 +1,4 @@
+package org.quiltmc.enigma.input.search_mappings.packages.a.b.c;
+
+public class PackagedClass {
+}

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ application {`
`15`	`15`	`jar.manifest.attributes 'Main-Class': mainClass`
`16`	`16`	`}`
`17`	`17`
	`18`	`+test.dependsOn(project(':enigma').tasks.named('obfuscateAllTestInput'))`
	`19`	`+`
`18`	`20`	`publishing {`
`19`	`21`	`publications {`
`20`	`22`	`"$project.name"(MavenPublication) {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-CLASS I`
	`1`	`+CLASS a`
`2`	`2`	`FIELD a privateStringField Ljava/lang/String;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CLASS ac`
	`1`	`+CLASS b`
`2`	`2`	`FIELD a floatField F`
`3`	`3`	`FIELD a intField I`
`4`	`4`	`FIELD a stringField Ljava/lang/String;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+CLASS c`
	`2`	`+ METHOD a staticVoidMethod (Lh;)V`
	`3`	`+ ARG 0 staticTypedParam`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CLASS V`
	`1`	`+CLASS d`
`2`	`2`	`FIELD a recordInt I`
`3`	`3`	`FIELD a recordString Ljava/lang/String;`
`4`	`4`	`FIELD b PRIVATE_STATIC_FINAL_INT_FIELD I`