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

test/bytecode/FunOLTest.java

@@ -0,0 +1,52 @@
+package bytecode;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.junit.Test;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+
+public class FunOLTest {
+	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 {
+		path = System.getProperty("user.dir")+"/test/bytecode/javFiles/FunOL.jav";
+		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("FunOL");
+		/*
+		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
+
+		Method m = classToTest.getDeclaredMethod("m");
+		Class<?> lambda = m.invoke(instanceOfClass).getClass();
+		Method apply = lambda.getMethod("apply", Object.class);
+
+		// Damit man auf die Methode zugreifen kann
+		apply.setAccessible(true);
+
+		Integer i = 77;
+		
+		Integer result = (Integer) apply.invoke(m.invoke(instanceOfClass), i); 
+
+		assertEquals(77, result);
+		*/
+	}
+
+
+}

test/bytecode/javFiles/FunOL.jav

@@ -0,0 +1,12 @@
+import java.util.Vector;
+import java.lang.Integer;
+import java.lang.String;
+//import java.lang.Byte;
+//import java.lang.Boolean;
+
+public class FunOL   {
+
+	add(f, y) {
+        return f.apply() + y;
+    }
+}

test/bytecode/javFiles/Sorting.jav

@@ -8,6 +8,11 @@ class Sorting{
         return a;
     }
 
+sort(in){
+	var firstHalf = in;
+	var secondHalf = in; 
+	return merge(sort(firstHalf), sort(secondHalf));
+}
 /*
 	
 	void sort(ArrayList<String> a){

test/bytecode/javFiles/VectorAdd.jav

@@ -16,4 +16,4 @@ public class VectorAdd {
        }
        return ret;
    }
-}
+}

test/bytecode/vectorAddTest.java

@@ -0,0 +1,34 @@
+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.Test;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+
+public class VectorAddTest {
+	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 {
+		path = System.getProperty("user.dir")+"/test/bytecode/javFiles/VectorAdd.jav";
+		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("VectorAdd");
+		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
+	}
+}

test/javFiles/ListenerOverload.jav

@@ -0,0 +1,20 @@
+import java.lang.Integer;
+import java.lang.String;
+
+class ListenerOverload{
+
+call(p){
+    call(p.left);
+    call(p.right);
+}
+
+call(Integer i){}
+
+call(String s){}
+
+}
+
+class Pair<A,B>{
+    A left;
+    B right;
+}

test/typeinference/JavaTXCompilerTest.java

@@ -104,6 +104,10 @@ public class JavaTXCompilerTest {
     public void multipleSolutions() throws IOException, ClassNotFoundException {
         execute(new File(rootDirectory+"Sorting.jav"));
     }
+    @Test
+    public void listenerTest() throws IOException, ClassNotFoundException {
+        execute(new File(rootDirectory+"ListenerOverload.jav"));
+    }
 
     private static class TestResultSet{