Move resource lookup to test-base, remove test-utils

Author: Col-E

translator-core/src/test/java/software/coley/dextransformer/ConversionTests.java

@@ -2,7 +2,6 @@
 
 import com.android.tools.r8.utils.AndroidApiLevel;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
@@ -13,12 +12,8 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Map;
-import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -139,31 +134,6 @@ private static FailureType getKnownFailureType(@Nonnull Path path, boolean isDex
 		return null;
 	}
 
-	/**
-	 * @return DEX test resources.
-	 */
-	@Nonnull
-	public static Stream<Arguments> findDexResources() throws IOException {
-		return findResources(".dex");
-	}
-
-	/**
-	 * @return JAR test resources.
-	 */
-	@Nonnull
-	public static Stream<Arguments> findJarResources() throws IOException {
-		return findResources(".jar");
-	}
-
-	@Nonnull
-	@SuppressWarnings("all")
-	private static Stream<Arguments> findResources(@Nonnull String filter) throws IOException {
-		return Files.find(Paths.get("src/test/resources/"), 10,
-						(p, attributes) -> attributes.isRegularFile() &&
-								p.getFileName().toString().endsWith(filter))
-				.map(Arguments::of);
-	}
-
 	private enum FailureType {
 		/**
 		 * Not sure if bug in D8 handling, or the input is crafted specifically to fail.

translator-core/src/test/java/software/coley/dextransformer/TestBase.java

@@ -1,6 +1,13 @@
 package software.coley.dextransformer;
 
 import com.android.tools.r8.D8;
+import org.junit.jupiter.params.provider.Arguments;
+
+import javax.annotation.Nonnull;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.stream.Stream;
 
 public class TestBase {
 	static {
@@ -13,4 +20,35 @@ public class TestBase {
 		// Any dex --> jar processing fails because it asserts the direction can only be jar --> dex.
 		D8.class.getClassLoader().setDefaultAssertionStatus(false);
 	}
+
+	/**
+	 * @return DEX test resources.
+	 */
+	@Nonnull
+	public static Stream<Arguments> findDexResources() throws IOException {
+		return findResources(".dex");
+	}
+
+	/**
+	 * @return JAR test resources.
+	 */
+	@Nonnull
+	public static Stream<Arguments> findJarResources() throws IOException {
+		return findResources(".jar");
+	}
+
+	/**
+	 * @param filter
+	 * 		File name filter.
+	 *
+	 * @return Resources matching the filter.
+	 */
+	@Nonnull
+	@SuppressWarnings("all")
+	public static Stream<Arguments> findResources(@Nonnull String filter) throws IOException {
+		return Files.find(Paths.get("src/test/resources/"), 10,
+						(p, attributes) -> attributes.isRegularFile() &&
+								p.getFileName().toString().endsWith(filter))
+				.map(Arguments::of);
+	}
 }