Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2

test/bytecode/LambdaTest.java

@@ -41,7 +41,7 @@ public class LambdaTest {
 
 		Integer i = 77;
 		// result = 77*77 = 5929
-		Integer result = (Integer) apply.invoke(m.invoke(instanceOfClass), i); //laeuft nicht, vermutlich weil Lambda-Ausdrucks Methode "apply" private ist.
+		Integer result = (Integer) apply.invoke(m.invoke(instanceOfClass), i); 
 		assertEquals(5929, result);
 	}
 

test/bytecode/Tph2Test.java

@@ -3,6 +3,7 @@ package bytecode;
 import static org.junit.Assert.*;
 
 import java.io.File;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
 
@@ -34,8 +35,35 @@ public class Tph2Test {
 	}
 
 	@Test
-	public void test() {
-		fail("Not yet implemented");
+	public void test1() throws Exception {
+		Method m = classToTest.getDeclaredMethod("m", Object.class, Object.class);
+		Object result = m.invoke(instanceOfClass, 1,2);
+		
+		assertEquals(1,result);
+	}
+	
+	@Test
+	public void test2() throws Exception {
+		Method m = classToTest.getDeclaredMethod("m", Object.class, Object.class);
+		Object result = m.invoke(instanceOfClass, "sss",2);
+		
+		assertEquals("sss",result);
+	}
+	
+	@Test
+	public void test3() throws Exception {
+		Method m = classToTest.getDeclaredMethod("m2", Object.class, Object.class);
+		Object result = m.invoke(instanceOfClass, 1,2);
+		
+		assertEquals(2,result);
+	}
+	
+	@Test
+	public void test4() throws Exception {
+		Method m = classToTest.getDeclaredMethod("m2", Object.class, Object.class);
+		Object result = m.invoke(instanceOfClass, 1,"xxx");
+		
+		assertEquals("xxx",result);
 	}
 
 }

test/bytecode/Tph3Test.java

@@ -0,0 +1,69 @@
+package bytecode;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+
+public class Tph3Test {
+	
+	private static String path;
+	private static File fileToTest;
+	private static JavaTXCompiler compiler;
+	private static ClassLoader loader;
+	private static Class<?> classToTest;
+	private static String pathToClassFile;
+	private static Object instanceOfClass;
+	
+	@BeforeClass
+	public static void setUpBeforeClass() throws Exception {
+		path = System.getProperty("user.dir")+"/test/bytecode/javFiles/Tph3.jav";
+		fileToTest = new File(path);
+		compiler = new JavaTXCompiler(fileToTest);
+		pathToClassFile = System.getProperty("user.dir")+"/testBytecode/generatedBC/";
+		compiler.generateBytecode(pathToClassFile);
+		loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
+		classToTest = loader.loadClass("Tph2");
+		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
+	}
+
+	@Test
+	public void test1() throws Exception {
+		Method m = classToTest.getDeclaredMethod("m", Object.class, Object.class);
+		Object result = m.invoke(instanceOfClass, 1,2);
+		
+		assertEquals(1,result);
+	}
+	
+	@Test
+	public void test2() throws Exception {
+		Method m = classToTest.getDeclaredMethod("m", Object.class, Object.class);
+		Object result = m.invoke(instanceOfClass, "sss",2);
+		
+		assertEquals("sss",result);
+	}
+	
+	@Test
+	public void test3() throws Exception {
+		Method m = classToTest.getDeclaredMethod("m2", Object.class, Object.class);
+		Object result = m.invoke(instanceOfClass, 1,2);
+		
+		assertEquals(2,result);
+	}
+	
+	@Test
+	public void test4() throws Exception {
+		Method m = classToTest.getDeclaredMethod("m2", Object.class, Object.class);
+		Object result = m.invoke(instanceOfClass, 1,"xxx");
+		
+		assertEquals("xxx",result);
+	}
+
+}

test/bytecode/TphTest.java

@@ -3,6 +3,7 @@ package bytecode;
 import static org.junit.Assert.*;
 
 import java.io.File;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
 
@@ -12,6 +13,7 @@ import org.junit.Test;
 import de.dhbwstuttgart.core.JavaTXCompiler;
 
 public class TphTest {
+	
 	private static String path;
 	private static File fileToTest;
 	private static JavaTXCompiler compiler;
@@ -33,8 +35,35 @@ public class TphTest {
 	}
 
 	@Test
-	public void test() {
-		fail("Not yet implemented");
+	public void test1() throws Exception {
+		Method m = classToTest.getDeclaredMethod("m", Object.class, Object.class);
+		Object result = m.invoke(instanceOfClass, 1,2);
+		
+		assertEquals(2,result);
+	}
+	
+	@Test
+	public void test2() throws Exception {
+		Method m = classToTest.getDeclaredMethod("m", Object.class, Object.class);
+		Object result = m.invoke(instanceOfClass, 1, "sss");
+		
+		assertEquals("sss",result);
+	}
+	
+	@Test
+	public void test3() throws Exception {
+		Method m = classToTest.getDeclaredMethod("m2", Object.class);
+		Object result = m.invoke(instanceOfClass, 2);
+		
+		assertEquals(2,result);
+	}
+	
+	@Test
+	public void test4() throws Exception {
+		Method m = classToTest.getDeclaredMethod("m2", Object.class);
+		Object result = m.invoke(instanceOfClass,"xxx");
+		
+		assertEquals("xxx",result);
 	}
 
 }

test/bytecode/applyLambdaTest.java

@@ -1,6 +1,11 @@
 package bytecode;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
 
 import org.junit.Test;
 
@@ -10,6 +15,10 @@ public class applyLambdaTest {
 	private static String path;
 	private static File fileToTest;
 	private static JavaTXCompiler compiler;
+	private static ClassLoader loader;
+	private static Class<?> classToTest;
+	private static String pathToClassFile;
+	private static Object instanceOfClass;
 	
 	@Test
 	public void generateBC() throws Exception {
@@ -17,7 +26,14 @@ public class applyLambdaTest {
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/testBytecode/generatedBC/");
+		pathToClassFile = System.getProperty("user.dir")+"/testBytecode/generatedBC/";
+		loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
+		classToTest = loader.loadClass("applyLambda");
+		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
+
+		Method m = classToTest.getDeclaredMethod("m");
+		Object result = m.invoke(instanceOfClass);
+		
+		assertEquals(result.getClass(), loader.loadClass("Apply"));
 	}
-
-
 }

test/bytecode/javFiles/Tph.jav

@@ -2,7 +2,7 @@ public class Tph {
 	
 	m(a,b){
 		var c = m2(b);
-		return a;
+		return c;
 	}
 	
 	m2(b){

test/bytecode/javFiles/Tph3.jav

@@ -0,0 +1,10 @@
+public class Tph3 {
+	m(a,b){
+		var c = m2(a,b);
+		return c;
+	}
+	
+	m2(a,b){
+		return m(a,b);
+	}
+}