From f3d6fcb417aed7f55d045164cc0af6a5e49b3728 Mon Sep 17 00:00:00 2001
From: JanUlrich <andi@michlaustderaffe.de>
Date: Sat, 11 Jan 2020 20:19:23 +0100
Subject: [PATCH] add -classpath to ConsoleInterface. Fix bug

---
 .../dhbwstuttgart/bytecode/BytecodeGenMethod.java |  2 +-
 .../de/dhbwstuttgart/core/ConsoleInterface.java   |  2 +-
 .../de/dhbwstuttgart/core/JavaTXCompiler.java     | 15 ++++++++-------
 .../packages/LoadDefaultPackageClassesTest.java   | 15 ++++++++++++++-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java b/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
index 5f1e6132..a7664c6a 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
@@ -814,7 +814,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 //						mDesc = helper.generateBCForFunN(methCallType,typesOfParams);
 					}else {
 						try {
-							cLoader2 = new URLClassLoader(new URL[] {new URL("file://"+path)}, classLoader);
+							cLoader2 = new URLClassLoader(new URL[] {new URL("file://" + path + "/")}, classLoader);
 							java.lang.reflect.Method[] methods = cLoader2.loadClass(clazz).getMethods();
 							System.out.println("Methods of " + receiverName + " ");
 							for(int i = 0; i<methods.length; i++) {
diff --git a/src/main/java/de/dhbwstuttgart/core/ConsoleInterface.java b/src/main/java/de/dhbwstuttgart/core/ConsoleInterface.java
index 2742bbbf..5acde8cd 100644
--- a/src/main/java/de/dhbwstuttgart/core/ConsoleInterface.java
+++ b/src/main/java/de/dhbwstuttgart/core/ConsoleInterface.java
@@ -20,7 +20,7 @@ public class ConsoleInterface {
                 outputPath = it.next();
             }else if(arg.startsWith("-d")) {
                 outputPath = arg.substring(2);
-            }else if(arg.equals("-cp")){
+            }else if(arg.equals("-cp") || arg.equals("-classpath")){
                 String[] cps = it.next().split(":");
                 for(String cp : cps){
                     classpath.add(new URL("file://"+cp));
diff --git a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
index 658f0c65..04f7aa27 100644
--- a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
+++ b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
@@ -791,24 +791,25 @@ public class JavaTXCompiler {
 	}
 
 	/**
-	 * @param path - can be null, then class file output is in the same directory as the parsed source files
+	 * @param outputPath - can be null, then class file output is in the same directory as the parsed source files
 	 * @param typeinferenceResult
 	 * @param simplifyResultsForAllSourceFiles
 	 * @throws IOException
 	 */
-	public void generateBytecode(String path, List<ResultSet> typeinferenceResult,
+	public void generateBytecode(String outputPath, List<ResultSet> typeinferenceResult,
 			List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles) throws IOException {
 		for (File f : sourceFiles.keySet()) {
 			HashMap<JavaClassName, byte[]> classFiles = new HashMap<>();
 			SourceFile sf = sourceFiles.get(f);
+			String path;
+			if(outputPath == null){
+				path = f.getParent(); //Set path to path of the parsed .jav file
+			}else{
+				path = outputPath + sf.getPkgName().replace(".","/"); //add package path to root path
+			}
 			BytecodeGen bytecodeGen = new BytecodeGen(classFiles, typeinferenceResult, simplifyResultsForAllSourceFiles,
 					sf, path, classLoader);
 			bytecodeGen.visit(sf);
-			if(path == null){
-				path = f.getParent(); //Set path to path of the parsed .jav file
-			}else{
-				path += sf.getPkgName().replace(".","/"); //add package path to root path
-			}
 			writeClassFile(bytecodeGen.getClassFiles(), path);
 		}
 	}
diff --git a/src/test/java/packages/LoadDefaultPackageClassesTest.java b/src/test/java/packages/LoadDefaultPackageClassesTest.java
index 25af87ef..47fcc4d7 100644
--- a/src/test/java/packages/LoadDefaultPackageClassesTest.java
+++ b/src/test/java/packages/LoadDefaultPackageClassesTest.java
@@ -29,11 +29,24 @@ public class LoadDefaultPackageClassesTest extends TestCase {
 
     public void testLoadGenClass() throws IOException, ClassNotFoundException {
         CompilationEnvironment.loadDefaultPackageClasses(new File( rootDirectory + "Test.jav"), ClassLoader.getSystemClassLoader());
-
     }
+
     public void testURLClassLoader() throws IOException, ClassNotFoundException {
         URLClassLoader cl = new URLClassLoader(new URL[]{new URL("file://"+rootDirectory)}, ClassLoader.getSystemClassLoader());
         cl.loadClass("Gen");
     }
 
+    public void testE2E() throws IOException, ClassNotFoundException {
+        JavaTXCompiler compiler = new JavaTXCompiler(new File(rootDirectory+"OL.jav"));
+        compiler.typeInference();
+        compiler.generateBytecode();
+        File f = new File(rootDirectory + "OL.class");
+        assertTrue(f.exists());
+
+        compiler = new JavaTXCompiler(new File(rootDirectory+"OLMain.jav"));
+        compiler.typeInference();
+        compiler.generateBytecode();
+        f = new File(rootDirectory + "OLMain.class");
+        assertTrue(f.exists());
+    }
 }