From 291fee12db5dc50dbdf353c0a0e776f102625303 Mon Sep 17 00:00:00 2001
From: "pl@gohorb.ba-horb.de" <pl@gohorb.ba-horb.de>
Date: Mon, 21 Nov 2022 23:51:06 +0100
Subject: [PATCH] 	new file:   ../../AllgemeinTest/VectorConstAdd.jav 
 modified:   ../../bytecode/javFiles/VectorAdd.jav 	new file:  
 ../../../src/test/java/AllgemeinTest.java wieder hergestellt.

---
 resources/AllgemeinTest/VectorConstAdd.jav | 15 +++++
 resources/bytecode/javFiles/VectorAdd.jav  | 27 --------
 src/test/java/AllgemeinTest.java           | 72 ++++++++++++++++++++++
 3 files changed, 87 insertions(+), 27 deletions(-)
 create mode 100644 resources/AllgemeinTest/VectorConstAdd.jav
 create mode 100644 src/test/java/AllgemeinTest.java

diff --git a/resources/AllgemeinTest/VectorConstAdd.jav b/resources/AllgemeinTest/VectorConstAdd.jav
new file mode 100644
index 000000000..b179bdccf
--- /dev/null
+++ b/resources/AllgemeinTest/VectorConstAdd.jav
@@ -0,0 +1,15 @@
+import java.util.Vector;
+import java.lang.Integer;
+
+
+public class VectorConstAdd {
+	vectorAdd(v1) {
+		var i = 0;
+		var erg = new Vector<>();
+		while (i < v1.size()) {
+			erg.addElement(v1.elementAt(i) + 1);
+			i++;
+		} 
+		return erg; 
+	}
+}
diff --git a/resources/bytecode/javFiles/VectorAdd.jav b/resources/bytecode/javFiles/VectorAdd.jav
index af44a8231..49193e9b2 100644
--- a/resources/bytecode/javFiles/VectorAdd.jav
+++ b/resources/bytecode/javFiles/VectorAdd.jav
@@ -1,26 +1,6 @@
 import java.util.Vector;
 import java.lang.Integer;
-import java.lang.String;
-import java.lang.Byte;
-import java.lang.Boolean;
-//import java.util.Vector;
-//import java.util.Collection;
-/*
-public class VectorAdd {
 
-	add(v1, v2) {
-       var ret = new Vector();
-       var i = 0;
-       var erg;
-       while(i < v1.size()) {
-           erg = v1.elementAt(i) + v2.elementAt(i);
-           ret.addElement(erg);
-       }
-       v1.addAll
-       return ret;
-   }
-}
-*/
 
 public class VectorAdd {
 	vectorAdd(v1, v2) {
@@ -32,11 +12,4 @@ public class VectorAdd {
 		} 
 		return erg; 
 	}
-
-//addEle(z) {
-//	var x;
-//	var y;
-//	x.add(y);
-//	z = x; 
-// }
 }
diff --git a/src/test/java/AllgemeinTest.java b/src/test/java/AllgemeinTest.java
new file mode 100644
index 000000000..462033619
--- /dev/null
+++ b/src/test/java/AllgemeinTest.java
@@ -0,0 +1,72 @@
+
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Arrays;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.google.common.collect.Lists;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+
+public class AllgemeinTest {
+
+	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 test() throws Exception {
+		//String className = "GenTest";
+		//String className = "Overloading_Generics";
+		//String className = "Generics";
+		//String className = "OverloadingMain";
+		//String className = "OverrideMain";
+		//String className = "OverrideMainRet";
+		//String className = "FCTest1";
+		//String className = "FCTest2";
+		//String className = "Pair";
+		//String className = "FCTest3";
+		//String className = "Var";
+		//String className = "Put";
+		//String className = "Twice";
+		//String className = "TestSubTypless";
+		//String className = "addList";
+		//String className = "M";
+		//String className = "Wildcard_Andi";
+		//String className = "Box";
+		//String className = "Box_Main";
+		//String className = "wildcardPair";
+		String className = "VectorConstAdd";
+		//PL 2019-10-24: genutzt fuer unterschiedliche Tests
+		path = System.getProperty("user.dir")+"/resources/AllgemeinTest/" + className + ".jav";
+		//path = System.getProperty("user.dir")+"/src/test/resources/AllgemeinTest/Overloading_Generics.jav";
+		//path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/mathStrucInteger.jav";
+		//compiler = new JavaTXCompiler(Lists.newArrayList(new File(System.getProperty("user.dir")+"/src/test/resources/AllgemeinTest/Overloading_Generics.jav")));
+		///*
+		   compiler = new JavaTXCompiler(
+                Lists.newArrayList(new File(path)),
+                Lists.newArrayList(new File(System.getProperty("user.dir")+"/resources/testBytecode/generatedBC/")));
+		//*/
+		compiler.generateBytecode(System.getProperty("user.dir")+"/resources/testBytecode/generatedBC/");
+		pathToClassFile = System.getProperty("user.dir")+"/resources/testBytecode/generatedBC/";
+		loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
+		classToTest = loader.loadClass(className);
+		//classToTest = loader.loadClass("Overloading_Generics");
+		//instanceOfClass = classToTest.getDeclaredConstructor().newInstance("A");
+		//classToTest = loader.loadClass("Overloading_Generics1");
+		//instanceOfClass = classToTest.getDeclaredConstructor(Object.class).newInstance("B");
+	}
+
+}