Add JAR creation and archive repackaging tests

Author: Sipkab

saker.build

@@ -167,7 +167,7 @@ test(){
 	)
 
 	$resolveddependencies = nest.dependency.resolve(
-		Bundles: [saker.zip, saker.java.compiler],
+		Bundles: [saker.zip, saker.java.compiler, saker.jar],
 		DependencyFile: resources/META-INF/nest/dependencies,
 		Filters: nest.dependency.filter.kind(classpath)
 	)

src/sipka/jvm/tailrec/MainCommand.java

@@ -29,6 +29,8 @@
  * <pre>
  * Tail recursion optimizer for Java bytecode.
  * 
+ *     https://github.com/Sipkab/jvm-tail-recursion
+ * 
  * The program takes Java class files as its input and optimizes tail recursive calls 
  * in a way that it won't overflow the stack.
  * 

test/resources/testcontents/testing/saker/sipka/jvm/tailrec/RepackageArchiveOptimizeSakerTest/saker.build

@@ -0,0 +1,24 @@
+build(
+	out path,
+	out secondpath,
+) {
+	$javac = saker.java.compile(src)
+	
+	$jar = saker.jar.create(
+		Output: first.jar,
+		Resources: {
+			Directory: $javac[ClassDirectory],
+			Resources: **,
+		},
+		Transformers: sipka.jvm.tailrec.zip.transformer(),
+	)
+	
+	$secondjar = saker.jar.create(
+		Output: second.jar,
+		Include: $jar[Path],
+		Transformers: sipka.jvm.tailrec.zip.transformer(),
+	)
+	
+	$path = $jar[Path]
+	$secondpath = $secondjar[Path]
+} 

test/resources/testcontents/testing/saker/sipka/jvm/tailrec/RepackageArchiveOptimizeSakerTest/src/test/Main.java

@@ -0,0 +1,10 @@
+package test;
+
+public class Main {
+	public static void count(int n) {
+		if (n == 0) {
+			return;
+		}
+		count(n - 1);
+	}
+}

test/resources/testcontents/testing/saker/sipka/jvm/tailrec/SimpleJarOptimizeSakerTest/saker.build

@@ -0,0 +1,15 @@
+build(
+	out path
+) {
+	$javac = saker.java.compile(src)
+	
+	$jar = saker.jar.create(
+		Resources: {
+			Directory: $javac[ClassDirectory],
+			Resources: **,
+		},
+		Transformers: sipka.jvm.tailrec.zip.transformer(),
+	)
+	
+	$path = $jar[Path]
+} 

test/resources/testcontents/testing/saker/sipka/jvm/tailrec/SimpleJarOptimizeSakerTest/src/test/Main.java

@@ -0,0 +1,10 @@
+package test;
+
+public class Main {
+	public static void count(int n) {
+		if (n == 0) {
+			return;
+		}
+		count(n - 1);
+	}
+}

test/src/testing/saker/sipka/jvm/tailrec/RepackageArchiveOptimizeSakerTest.java

@@ -0,0 +1,47 @@
+package testing.saker.sipka.jvm.tailrec;
+
+import java.io.InputStream;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import saker.build.file.path.SakerPath;
+import saker.build.thirdparty.saker.util.classloader.ClassLoaderDataFinder;
+import saker.build.thirdparty.saker.util.classloader.MultiDataClassLoader;
+import saker.build.thirdparty.saker.util.io.ByteArrayRegion;
+import saker.build.thirdparty.saker.util.io.ByteSource;
+import saker.build.thirdparty.saker.util.io.StreamUtils;
+import testing.saker.SakerTest;
+import testing.saker.build.tests.TestUtils;
+import testing.saker.nest.util.NestRepositoryCachingEnvironmentTestCase;
+
+@SakerTest
+public class RepackageArchiveOptimizeSakerTest extends NestRepositoryCachingEnvironmentTestCase{
+
+	@Override
+	protected void runNestTaskTestImpl() throws Throwable {
+		// TODO Auto-generated method stub
+		CombinedTargetTaskResult res = runScriptTask("build");
+		SakerPath outpath = (SakerPath) res.getTargetTaskResult("secondpath");
+
+		Map<String, ByteArrayRegion> resourceBytes = new TreeMap<>();
+		try (InputStream is = ByteSource.toInputStream(files.openInput(outpath));
+				ZipInputStream zis = new ZipInputStream(is)) {
+			for (ZipEntry entry; (entry = zis.getNextEntry()) != null;) {
+				resourceBytes.put(entry.getName(), StreamUtils.readStreamFully(zis));
+			}
+		}
+
+		try (ClassLoaderDataFinder jarfinder = new TestUtils.MemoryClassLoaderDataFinder(resourceBytes)) {
+			MultiDataClassLoader cl = new MultiDataClassLoader(jarfinder);
+			Class<?> c = Class.forName("test.Main", false, cl);
+			//this should succeed, as it was optimized
+			c.getMethod("count", int.class).invoke(null, 10000000);
+		}
+
+		runScriptTask("build");
+		assertEmpty(getMetric().getRunTaskIdResults());
+	}
+
+}

test/src/testing/saker/sipka/jvm/tailrec/SimpleJarOptimizeSakerTest.java

@@ -0,0 +1,46 @@
+package testing.saker.sipka.jvm.tailrec;
+
+import java.io.InputStream;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import saker.build.file.path.SakerPath;
+import saker.build.thirdparty.saker.util.classloader.ClassLoaderDataFinder;
+import saker.build.thirdparty.saker.util.classloader.MultiDataClassLoader;
+import saker.build.thirdparty.saker.util.io.ByteArrayRegion;
+import saker.build.thirdparty.saker.util.io.ByteSource;
+import saker.build.thirdparty.saker.util.io.StreamUtils;
+import testing.saker.SakerTest;
+import testing.saker.build.tests.TestUtils;
+import testing.saker.nest.util.NestRepositoryCachingEnvironmentTestCase;
+
+@SakerTest
+public class SimpleJarOptimizeSakerTest extends NestRepositoryCachingEnvironmentTestCase {
+
+	@Override
+	protected void runNestTaskTestImpl() throws Throwable {
+		CombinedTargetTaskResult res = runScriptTask("build");
+		SakerPath outpath = (SakerPath) res.getTargetTaskResult("path");
+
+		Map<String, ByteArrayRegion> resourceBytes = new TreeMap<>();
+		try (InputStream is = ByteSource.toInputStream(files.openInput(outpath));
+				ZipInputStream zis = new ZipInputStream(is)) {
+			for (ZipEntry entry; (entry = zis.getNextEntry()) != null;) {
+				resourceBytes.put(entry.getName(), StreamUtils.readStreamFully(zis));
+			}
+		}
+
+		try (ClassLoaderDataFinder jarfinder = new TestUtils.MemoryClassLoaderDataFinder(resourceBytes)) {
+			MultiDataClassLoader cl = new MultiDataClassLoader(jarfinder);
+			Class<?> c = Class.forName("test.Main", false, cl);
+			//this should succeed, as it was optimized
+			c.getMethod("count", int.class).invoke(null, 10000000);
+		}
+
+		runScriptTask("build");
+		assertEmpty(getMetric().getRunTaskIdResults());
+	}
+
+}