Fix test

Fix #371
sort resultsets before printing them to the console to enhance comparability between results
2025-07-23 11:56:34 +02:00 · 2025-07-23 11:44:10 +02:00 · 2025-07-16 11:17:53 +02:00 · 2025-07-15 15:02:15 +02:00 · 2025-07-15 14:06:51 +02:00 · 2025-07-08 17:44:55 +02:00
48 changed files with 1336 additions and 1091 deletions
--- a/.gitea/workflows/build_and_test.yml
+++ b/.gitea/workflows/build_and_test.yml
@@ -15,7 +15,7 @@ jobs:
        uses: actions/setup-java@v4
        with:
          distribution: 'temurin'
-          java-version: '23'
+          java-version: '24'
          cache: 'maven'
      - name: Compile project
        run: |
--- a/pom.xml
+++ b/pom.xml
@@ -12,37 +12,37 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.2</version>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>5.13.2</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.antlr/antlr4 -->
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>antlr4</artifactId>
-			<version>4.11.1</version>
+			<version>4.13.2</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.16.1</version>
+			<version>2.19.0</version>
 		</dependency>
 		<dependency>
 			<groupId>io.github.classgraph</groupId>
 			<artifactId>classgraph</artifactId>
-			<version>4.8.172</version>
+			<version>4.8.180</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>33.2.0-jre</version>
+			<version>33.4.8-jre</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.ow2.asm/asm -->
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm</artifactId>
-			<version>9.5</version>
+			<version>9.8</version>
 		</dependency>
 	</dependencies>

@@ -51,17 +51,17 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.11.0</version>
+				<version>3.14.0</version>
 				<configuration>
 					<compilerArgs>--enable-preview</compilerArgs>
-                    <source>23</source>
-                    <target>23</target>
+                    <source>24</source>
+                    <target>24</target>
                </configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.5.3</version>
 				<configuration>
 					<redirectTestOutputToFile>true</redirectTestOutputToFile>
 					<reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
@@ -77,7 +77,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<plugin>
 				<groupId>org.antlr</groupId>
 				<artifactId>antlr4-maven-plugin</artifactId>
-				<version>4.11.1</version>
+				<version>4.13.2</version>
 				<executions>
 					<execution>
 						<id>antlr</id>
@@ -90,7 +90,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.4.2</version>
 				<configuration>
 					<archive>
 						<manifest>
--- a/resources/bytecode/javFiles/Bug363.jav
+++ b/resources/bytecode/javFiles/Bug363.jav
@@ -0,0 +1,22 @@
+import java.lang.String;
+
+
+public class Bug363 {
+  uncurry (f){
+    return x -> f.apply(x);
+  }
+
+  uncurry (f){
+    return (x, y) -> f.apply(x).apply(y);
+  }
+
+  uncurry (f){
+    return (x, y, z) -> f.apply(x).apply(y).apply(z);
+  }
+
+  public test(){
+    var f = x -> y -> z -> x + y + z;
+    var g = uncurry(f);
+    return g.apply("A", "B", "C"); // Outputs: 6
+  }
+}
--- a/resources/bytecode/javFiles/Bug364.jav
+++ b/resources/bytecode/javFiles/Bug364.jav
@@ -0,0 +1,8 @@
+import java.lang.String;
+
+public class Bug364{
+  public main(){
+    var f = x -> y -> z -> x + y + z;
+    return f.apply("A").apply("B").apply("C");
+  }
+}
--- a/resources/bytecode/javFiles/Bug365.jav
+++ b/resources/bytecode/javFiles/Bug365.jav
@@ -0,0 +1,21 @@
+import java.lang.String;
+import java.lang.Object;
+
+public class Bug365{
+  swap(f){
+    return x -> y -> f.apply(y).apply(x);
+  }
+
+  swap(Fun1$$<String, Fun1$$<String, Fun1$$<String, Object>>> f){
+    return x -> y -> z -> f.apply(z).apply(y).apply(x);
+  }
+
+  public ex1() {
+    var func = x -> y -> z -> x + y + z;
+    return func.apply("A").apply("B").apply("C");
+  }
+  public ex2() {
+    var func = x -> y -> z -> x + y + z;
+    return swap(func).apply("A").apply("B").apply("C");
+  }
+}
--- a/resources/bytecode/javFiles/Bug366.jav
+++ b/resources/bytecode/javFiles/Bug366.jav
@@ -0,0 +1,12 @@
+import java.lang.Integer;
+
+public class Bug366 {
+    public static lambda() {
+        return (a, b) -> a + b;
+    }
+
+    public static test() {
+        var l = lambda();
+        return l.apply(10, 20);
+    }
+}
--- a/resources/bytecode/javFiles/Bug371.jav
+++ b/resources/bytecode/javFiles/Bug371.jav
@@ -0,0 +1,10 @@
+import java.lang.Boolean;
+
+public class Bug371 {
+    static m1(x, y) { return x || y; }
+    static m2(x, y) { return x && y; }
+
+    public static test() {
+        return m2(m1(true, false), true);
+    }
+}
--- a/resources/bytecode/javFiles/BugXXX.jav
+++ b/resources/bytecode/javFiles/BugXXX.jav
@@ -1,16 +0,0 @@
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.lang.String;
-import java.util.stream.Stream;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.lang.Integer;
-
-class BugXXX {
-    public main() {
-        List<Integer> i = new ArrayList<>(List.of(1,2,3,4,5,6,7,8,9,10));
-        Optional<Integer> tmp = i.stream().filter(x -> x == 5).map(x -> x*2).findFirst();
-        return tmp;
-    }
-}
--- a/src/main/java/de/dhbwstuttgart/bytecode/Codegen.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/Codegen.java
@@ -13,6 +13,7 @@ import org.objectweb.asm.*;
 import java.lang.invoke.*;
 import java.lang.reflect.Modifier;
 import java.util.*;
+import java.util.stream.Collectors;

 import static org.objectweb.asm.Opcodes.*;
 import static de.dhbwstuttgart.target.tree.expression.TargetBinaryOp.*;
@@ -84,14 +85,16 @@ public class Codegen {
        int localCounter;
        MethodVisitor mv;
        TargetType returnType;
+        boolean isStatic = false;

        Stack<BreakEnv> breakStack = new Stack<>();
        Stack<Integer> switchResultValue = new Stack<>();

-        State(TargetType returnType, MethodVisitor mv, int localCounter) {
+        State(TargetType returnType, MethodVisitor mv, int localCounter, boolean isStatic) {
            this.returnType = returnType;
            this.mv = mv;
            this.localCounter = localCounter;
+            this.isStatic = isStatic;
        }

        void enterScope() {
@@ -757,6 +760,16 @@ public class Codegen {
        }
    }

+    private static TargetType removeGenerics(TargetType param) {
+        return switch (param) {
+            case null -> null;
+            case TargetFunNType funNType -> new TargetFunNType(funNType.name(), funNType.funNParams(), List.of(), funNType.returnArguments());
+            case TargetRefType refType -> new TargetRefType(refType.name());
+            case TargetGenericType targetGenericType -> TargetType.Object;
+            default -> param;
+        };
+    }
+
    private void generateLambdaExpression(State state, TargetLambdaExpression lambda) {
        var mv = state.mv;

@@ -768,7 +781,8 @@ public class Codegen {

        var parameters = new ArrayList<>(lambda.captures());
        parameters.addAll(signature.parameters());
-        var implSignature = new TargetMethod.Signature(Set.of(), parameters, lambda.signature().returnType());
+        parameters = parameters.stream().map(param -> param.withType(removeGenerics(param.pattern().type()))).collect(Collectors.toCollection(ArrayList::new));
+        var implSignature = new TargetMethod.Signature(Set.of(), parameters, removeGenerics(lambda.signature().returnType()));

        TargetMethod impl;
        if (lambdas.containsKey(lambda)) {
@@ -776,21 +790,22 @@ public class Codegen {
        } else {
            var name = "lambda$" + lambdaCounter++;

-            impl = new TargetMethod(0, name, lambda.block(), implSignature, null);
-            generateMethod(impl);
+            impl = new TargetMethod(state.isStatic ? ACC_STATIC : 0, name, lambda.block(), implSignature, null);
+            generateMethod(impl, state);
            lambdas.put(lambda, impl);
        }

        var mt = MethodType.methodType(CallSite.class, MethodHandles.Lookup.class, String.class, MethodType.class, MethodType.class, MethodHandle.class, MethodType.class);

        var bootstrap = new Handle(H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", "metafactory", mt.toMethodDescriptorString(), false);
-        var handle = new Handle(H_INVOKEVIRTUAL, clazz.getName(), impl.name(), implSignature.getDescriptor(), false);
+        var handle = new Handle(state.isStatic ? H_INVOKESTATIC : H_INVOKEVIRTUAL, clazz.getName(), impl.name(), implSignature.getDescriptor(), false);

        var params = new ArrayList<TargetType>();
-        params.add(new TargetRefType(clazz.qualifiedName().getClassName()));
+        if(!state.isStatic) params.add(new TargetRefType(clazz.qualifiedName().getClassName()));
        params.addAll(lambda.captures().stream().map(mp -> mp.pattern().type()).toList());

-        mv.visitVarInsn(ALOAD, 0);
+        if (!state.isStatic)
+            mv.visitVarInsn(ALOAD, 0);
        for (var index = 0; index < lambda.captures().size(); index++) {
            var capture = lambda.captures().get(index);
            var pattern = (TargetTypePattern) capture.pattern();
@@ -1518,7 +1533,7 @@ public class Codegen {
        MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "<clinit>", "()V", null, null);
        mv.visitCode();

-        var state = new State(null, mv, 0);
+        var state = new State(null, mv, 0, true);
        generate(state, constructor.block());

        mv.visitInsn(RETURN);
@@ -1532,7 +1547,7 @@ public class Codegen {
            mv.visitAttribute(new JavaTXSignatureAttribute(constructor.getTXSignature()));
        
        mv.visitCode();
-        var state = new State(null, mv, 1);
+        var state = new State(null, mv, 1, false);
        for (var param : constructor.parameters()) {
            var pattern = param.pattern();
            if (pattern instanceof TargetTypePattern tp)
@@ -1578,8 +1593,11 @@ public class Codegen {
            }
        }
    }
-
    private void generateMethod(TargetMethod method) {
+        generateMethod(method, null);
+    }
+
+    private void generateMethod(TargetMethod method, State parent) {
        var access = method.access();
        if (method.block() == null)
            access |= ACC_ABSTRACT;
@@ -1594,7 +1612,10 @@ public class Codegen {

        if (method.block() != null) {
            mv.visitCode();
-            var state = new State(method.signature().returnType(), mv, method.isStatic() ? 0 : 1);
+            var state = new State(method.signature().returnType(), mv, method.isStatic() ? 0 : 1, method.isStatic());
+            if (parent != null) {
+                state.scope.parent = parent.scope;
+            }
            var offset = 1;
            for (var param : method.signature().parameters()) {
                state.createVariable(param.pattern().name(), param.pattern().type());
@@ -1604,6 +1625,8 @@ public class Codegen {
                    bindLocalVariables(state, cp, offset);
                offset++;
            }
+            //if (parent != null) System.out.println("parent: " + parent.scope.locals.keySet());
+            //System.out.println(state.scope.locals.keySet());
            generate(state, method.block());
            if (method.signature().returnType() == null)
                mv.visitInsn(RETURN);
@@ -1710,7 +1733,7 @@ public class Codegen {

            // Generate wrapper method
            var mv = cw2.visitMethod(ACC_PUBLIC, toMethod.name, toDescriptor, null, null);
-            var state = new State(null, mv, 0);
+            var state = new State(null, mv, 0, false);

            mv.visitVarInsn(ALOAD, 0);
            mv.visitFieldInsn(GETFIELD, className, "wrapped", pair.from.toDescriptor());
@@ -1742,7 +1765,7 @@ public class Codegen {
                converter.classLoader.findClass(className);
            } catch (ClassNotFoundException e) {
                try {
-                    converter.classLoader.loadClass(bytes);
+                    converter.classLoader.loadClass(className, bytes);
                } catch (LinkageError ignored) {}
            }
        }
--- a/src/main/java/de/dhbwstuttgart/bytecode/FunNGenerator.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/FunNGenerator.java
@@ -39,6 +39,10 @@ public class FunNGenerator {
        public final List<TargetType> inParams;
        public final List<TargetType> realParams;

+        public GenericParameters(TargetFunNType funNType) {
+            this(funNType.funNParams(), funNType.returnArguments());
+        }
+
        public GenericParameters(List<TargetType> params, int numReturns) {
            this.realParams = params;
            this.inParams = flattenTypeParams(params);
--- a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
+++ b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
@@ -393,7 +393,12 @@ public class JavaTXCompiler {
 			logFile.write(ASTTypePrinter.print(sf));
 			System.out.println(ASTTypePrinter.print(sf));
 			logFile.flush();
-			System.out.println("Unify nach Oder-Constraints-Anpassung:" + unifyCons.toString());
+			List<UnifyPair> andConstraintsSorted = unifyCons.getUndConstraints().stream()
+					.sorted(Comparator.comparing(UnifyPair::getPairOp).thenComparing(UnifyPair::getLhsType, Comparator.comparing(UnifyType::getName)))
+					.collect(Collectors.toList());
+
+			System.out.println(andConstraintsSorted);
+
 			Set<PlaceholderType> varianceTPHold;
 			Set<PlaceholderType> varianceTPH = new HashSet<>();
 			varianceTPH = varianceInheritanceConstraintSet(unifyCons);
@@ -416,7 +421,14 @@ public class JavaTXCompiler {
 				UnifyResultListenerImpl li = new UnifyResultListenerImpl();
 				urm.addUnifyResultListener(li);
 				unify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm, usedTasks);
-				System.out.println("RESULT Final: " + li.getResults());
+				//System.out.println("RESULT Final: " + li.getResults());
+				var finalResults = li.getResults().stream().sorted().toList();
+				int i = 0;
+				System.out.println("RESULT Final: ");
+				for (var result : finalResults){
+					System.out.println("Result: " + i++);
+					System.out.println(result.getSortedResults());
+				}
 				System.out.println("Constraints for Generated Generics: " + " ???");
 				logFile.write("RES_FINAL: " + li.getResults().toString() + "\n");
 				logFile.flush();
@@ -631,12 +643,12 @@ public class JavaTXCompiler {
 			var codegen = new Codegen(converter.convert(clazz), this, converter);
 			var code = codegen.generate();
 			generatedClasses.put(clazz.getClassName(), code);
-			converter.auxiliaries.forEach((name, source) -> {
-				generatedClasses.put(new JavaClassName(name), source);
-			});
 		}
 		generatedGenerics.put(sf, converter.javaGenerics());
 		converter.generateFunNTypes();
+		converter.auxiliaries.forEach((name, source) -> {
+			generatedClasses.put(new JavaClassName(name), source);
+		});
 		return generatedClasses;
 	}

--- a/src/main/java/de/dhbwstuttgart/environment/ByteArrayClassLoader.java
+++ b/src/main/java/de/dhbwstuttgart/environment/ByteArrayClassLoader.java
@@ -1,13 +0,0 @@
-package de.dhbwstuttgart.environment;
-
-public class ByteArrayClassLoader extends ClassLoader implements IByteArrayClassLoader {
-    @Override
-    public Class _defineClass(String name, byte[] code, int i, int length) throws ClassFormatError {
-        return defineClass(name, code, i, length);
-    }
-
-    @Override
-    public Class<?> findClass(String name) throws ClassNotFoundException {
-        return super.findClass(name);
-    }
-}
--- a/src/main/java/de/dhbwstuttgart/environment/IByteArrayClassLoader.java
+++ b/src/main/java/de/dhbwstuttgart/environment/IByteArrayClassLoader.java
@@ -6,18 +6,22 @@ import java.nio.file.Path;

 public interface IByteArrayClassLoader {

-    Class loadClass(String path) throws ClassNotFoundException;
+    Class<?> loadClass(String path) throws ClassNotFoundException;

-    default Class loadClass(byte[] code) {
-        return this._defineClass(null, code, 0, code.length);
+    default Class<?> loadClass(byte[] code) {
+        return this.loadClass(null, code);
    }

-    default Class loadClass(Path path) throws IOException {
+    default Class<?> loadClass(String name, byte[] code) {
+        return this._defineClass(name, code, 0, code.length);
+    }
+
+    default Class<?> loadClass(Path path) throws IOException {
        var code = Files.readAllBytes(path);
        return this._defineClass(null, code, 0, code.length);
    }

    public Class<?> findClass(String name) throws ClassNotFoundException;

-    Class _defineClass(String name, byte[] code, int i, int length) throws ClassFormatError;
+    Class<?> _defineClass(String name, byte[] code, int i, int length) throws ClassFormatError;
 }
--- a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
+++ b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
@@ -1099,9 +1099,9 @@ public class StatementGenerator {
            block = lambdaGenerator.convert(expression.lambdaBody().block(), true);
        }
        List<RefTypeOrTPHOrWildcardOrGeneric> funNParams = new ArrayList<>();
-        funNParams.add(TypePlaceholder.fresh(expression.getStart()));// ret-Type
+        funNParams.add(TypePlaceholder.fresh(expression.getStart(), -1, false));// ret-Type
        params.getFormalparalist().forEach(formalParameter -> // Für jeden Parameter einen TPH anfügen:
-        funNParams.add(TypePlaceholder.fresh(expression.getStart())));
+        	funNParams.add(TypePlaceholder.fresh(expression.getStart(), 1, false)));
        RefTypeOrTPHOrWildcardOrGeneric lambdaType = TypePlaceholder.fresh(expression.getStart());
        // RefType lambdaType = new
        // RefType(reg.getName("Fun"+params.getFormalparalist().size()),
--- a/src/main/java/de/dhbwstuttgart/parser/scope/JavaClassRegistry.java
+++ b/src/main/java/de/dhbwstuttgart/parser/scope/JavaClassRegistry.java
@@ -7,7 +7,7 @@ import java.util.*;
 /**
 * Speichert die Klassen f<>r einen bestimmten Projektscope
 */
-public class JavaClassRegistry {
+public class JavaClassRegistry{
    final Map<JavaClassName, Integer> existingClasses = new HashMap<>();

    public JavaClassRegistry(Map<String, Integer> initialNames) {
@@ -22,6 +22,10 @@ public class JavaClassRegistry {
        }
    }

+    public Set<JavaClassName> getAllClassNames(){
+        return existingClasses.keySet();
+    }
+
    public void addName(String className, int numberOfGenerics) {
        existingClasses.put(new JavaClassName(className), numberOfGenerics);
    }
--- a/src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java
+++ b/src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java
@@ -2,7 +2,6 @@ package de.dhbwstuttgart.target.generate;

 import de.dhbwstuttgart.bytecode.FunNGenerator;
 import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
 import de.dhbwstuttgart.environment.IByteArrayClassLoader;
 import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.parser.NullToken;
@@ -12,6 +11,8 @@ import de.dhbwstuttgart.syntaxtree.Record;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.*;
+import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
+import de.dhbwstuttgart.syntaxtree.visual.OutputGenerator;
 import de.dhbwstuttgart.target.tree.*;
 import de.dhbwstuttgart.target.tree.expression.*;
 import de.dhbwstuttgart.target.tree.type.*;
@@ -66,11 +67,11 @@ public class ASTToTargetAST {
    public IByteArrayClassLoader classLoader;
    protected SourceFile sourceFile;

-    public ASTToTargetAST(List<ResultSet> resultSets) {
-        this(null, resultSets);
+    public ASTToTargetAST(List<ResultSet> resultSets, IByteArrayClassLoader classLoader) {
+        this(null, resultSets, classLoader);
    }
-    public ASTToTargetAST(JavaTXCompiler compiler, List<ResultSet> resultSets) {
-        this(compiler, resultSets, null, new ByteArrayClassLoader());
+    public ASTToTargetAST(JavaTXCompiler compiler, List<ResultSet> resultSets, IByteArrayClassLoader classLoader) {
+        this(compiler, resultSets, null, classLoader);
    }

    public ASTToTargetAST(JavaTXCompiler compiler, List<ResultSet> resultSets, SourceFile sourceFile, IByteArrayClassLoader classLoader) {
@@ -781,7 +782,15 @@ public class ASTToTargetAST {
        return TargetFunNType.fromParams(params, filteredParams, gep.getReturnType() != null ? 1 : 0);
    }

+    private FunNGenerator.GenericParameters convertToParameters(TargetFunNType input) {
+        return null;
+    }
+
    private boolean isSubtype(TargetType test, TargetType other) {
+        if (other.equals(TargetType.Object)) return true;
+        if (test instanceof TargetFunNType tfun && other instanceof TargetFunNType ofun)
+            return isSubtype(new FunNGenerator.GenericParameters(tfun), new FunNGenerator.GenericParameters(ofun));
+
        var testClass = compiler.getClass(new JavaClassName(test.name()));
        var otherClass = compiler.getClass(new JavaClassName(other.name()));
        if (testClass == null) return false;
@@ -818,14 +827,6 @@ public class ASTToTargetAST {
                .toList();

            var code = FunNGenerator.generateSpecializedBytecode(gep, superInterfaces);
-
-            try {
-                classLoader.findClass(entry.getKey());
-            } catch (ClassNotFoundException e) {
-                try {
-                    classLoader.loadClass(code);
-                } catch (LinkageError ignored) {}
-            }
            auxiliaries.put(entry.getKey(), code);
        }
    }
@@ -856,7 +857,7 @@ public class ASTToTargetAST {
                            classLoader.findClass(superClassName);
                        } catch (ClassNotFoundException e) {
                            try {
-                                classLoader.loadClass(code);
+                                classLoader.loadClass(superClassName, code);
                            } catch (LinkageError ignored) {}
                        }
                        auxiliaries.put(superClassName, code);
--- a/src/main/java/de/dhbwstuttgart/target/generate/StatementToTargetExpression.java
+++ b/src/main/java/de/dhbwstuttgart/target/generate/StatementToTargetExpression.java
@@ -14,6 +14,7 @@ import de.dhbwstuttgart.target.tree.expression.*;
 import de.dhbwstuttgart.target.tree.type.*;

 import java.lang.reflect.Modifier;
+import java.sql.Array;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
@@ -32,54 +33,71 @@ public class StatementToTargetExpression implements ASTVisitor {
        throw new NotImplementedException();
    }

+    private class LambdaCaptureFinder extends TracingStatementVisitor {
+
+        // TODO The same mechanism is implemented in Codegen, maybe use it from there?
+        final Stack<Set<String>> localVariables = new Stack<>();
+        private final List<MethodParameter> parameters;
+        private final List<MethodParameter> captures;
+
+        LambdaCaptureFinder(List<MethodParameter> parameters, List<MethodParameter> captures) {
+            localVariables.push(new HashSet<>());
+            this.parameters = parameters;
+            this.captures = captures;
+        }
+
+        boolean hasLocalVar(String name) {
+            for (var localVariables : this.localVariables) {
+                if (localVariables.contains(name))
+                    return true;
+            }
+            return false;
+        }
+
+        @Override
+        public void visit(Block block) {
+            localVariables.push(new HashSet<>());
+            super.visit(block);
+            localVariables.pop();
+        }
+
+        @Override
+        public void visit(LocalVar localVar) {
+            super.visit(localVar);
+            var capture = new MethodParameter(new TargetTypePattern(converter.convert(localVar.getType()), localVar.name));
+            if (!hasLocalVar(localVar.name) && !parameters.contains(capture) && !captures.contains(capture))
+                captures.add(capture);
+        }
+
+        @Override
+        public void visit(LocalVarDecl varDecl) {
+            var localVariables = this.localVariables.peek();
+            localVariables.add(varDecl.getName());
+        }
+
+        @Override
+        public void visit(LambdaExpression lambda) {
+            var newCaptures = new ArrayList<MethodParameter>();
+            var captureFinder = new LambdaCaptureFinder(createParameters(lambda), newCaptures);
+            lambda.methodBody.accept(captureFinder);
+            newCaptures.removeAll(parameters);
+            captures.addAll(newCaptures);
+        }
+    }
+
+    private List<MethodParameter> createParameters(LambdaExpression lambda) {
+        return StreamSupport.stream(lambda.params.spliterator(), false)
+            .map(p -> (FormalParameter) p)
+            .map(p -> new MethodParameter(new TargetTypePattern(converter.convert(p.getType()), p.getName())))
+            .toList();
+    }
+
    @Override
    public void visit(LambdaExpression lambdaExpression) {
-        var parameters = StreamSupport.stream(lambdaExpression.params.spliterator(), false)
-                .map(p -> (FormalParameter) p)
-                .map(p -> new MethodParameter(new TargetTypePattern(converter.convert(p.getType()), p.getName())))
-                .toList();
-
+        var parameters = createParameters(lambdaExpression);
        List<MethodParameter> captures = new ArrayList<>();
-        lambdaExpression.methodBody.accept(new TracingStatementVisitor() {
-            // TODO The same mechanism is implemented in Codegen, maybe use it from there?
-            final Stack<Set<String>> localVariables = new Stack<>();
-            {
-                localVariables.push(new HashSet<>());
-            }
-
-            boolean hasLocalVar(String name) {
-                for (var localVariables : this.localVariables) {
-                    if (localVariables.contains(name))
-                        return true;
-                }
-                return false;
-            }
-
-            @Override
-            public void visit(Block block) {
-                localVariables.push(new HashSet<>());
-                super.visit(block);
-                localVariables.pop();
-            }
-
-            @Override
-            public void visit(LocalVar localVar) {
-                super.visit(localVar);
-                var capture = new MethodParameter(new TargetTypePattern(converter.convert(localVar.getType()), localVar.name));
-                if (!hasLocalVar(localVar.name) && !parameters.contains(capture) && !captures.contains(capture))
-                    captures.add(capture);
-            }
-
-            @Override
-            public void visit(LocalVarDecl varDecl) {
-                var localVariables = this.localVariables.peek();
-                localVariables.add(varDecl.getName());
-            }
-
-            @Override
-            public void visit(LambdaExpression lambda) {
-            } // Don't look at lambda expressions
-        });
+        var visitor = new LambdaCaptureFinder(parameters, captures);
+        lambdaExpression.methodBody.accept(visitor);

        TargetMethod.Signature signature = new TargetMethod.Signature(Set.of(), parameters, converter.convert(lambdaExpression.getReturnType()));;
        var tpe = converter.convert(lambdaExpression.getType());
@@ -120,7 +138,10 @@ public class StatementToTargetExpression implements ASTVisitor {

    @Override
    public void visit(BoolExpression bool) {
-        System.out.println("BoolExpression");
+        result = switch(bool.operation) {
+        case OR -> new TargetBinaryOp.Or(converter.convert(bool.getType()), converter.convert(bool.lexpr), converter.convert(bool.rexpr));
+        case AND -> new TargetBinaryOp.And(converter.convert(bool.getType()), converter.convert(bool.lexpr), converter.convert(bool.rexpr));
+        };
    }

    @Override
--- a/src/main/java/de/dhbwstuttgart/typeinference/constraints/Constraint.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/constraints/Constraint.java
@@ -6,7 +6,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;

-public class Constraint<A> extends HashSet<A> {
+public class Constraint<A> extends HashSet<A> implements Comparable<Constraint<A>> {
 	private static final long serialVersionUID = 1L;
 	private Boolean isInherited = false;//wird beides nur für die Method-Constraints benoetigt
 	private Boolean isImplemented = false;
@@ -73,5 +73,9 @@ public class Constraint<A> extends HashSet<A> {
 	public String toStringBase() {
 		return super.toString();
 	}
-	
+
+	@Override
+	public int compareTo(Constraint<A> o) {
+		return this.toString().compareTo(o.toString());
+	}
 }
--- a/src/main/java/de/dhbwstuttgart/typeinference/result/ResultPair.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/result/ResultPair.java
@@ -5,7 +5,7 @@ import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 /**
 * Paare, welche das Unifikationsergebnis darstellen
 */
-public abstract class ResultPair<A extends RefTypeOrTPHOrWildcardOrGeneric,B extends RefTypeOrTPHOrWildcardOrGeneric> {
+public abstract class ResultPair<A extends RefTypeOrTPHOrWildcardOrGeneric, B extends RefTypeOrTPHOrWildcardOrGeneric> implements Comparable<ResultPair<A,B>> {
    private final A left;
    private final B right;

@@ -58,5 +58,14 @@ public abstract class ResultPair<A extends RefTypeOrTPHOrWildcardOrGeneric,B ext
 			return false;
 		return true;
 	}
+
+	@Override
+	public int compareTo(ResultPair<A, B> o) {
+		if (o == null) {
+			return 1; // this is greater than null
+		}
+
+		return o.left.toString().compareTo(this.left.toString());
+	}
   
 }
--- a/src/main/java/de/dhbwstuttgart/typeinference/result/ResultSet.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/result/ResultSet.java
@@ -1,6 +1,8 @@
 package de.dhbwstuttgart.typeinference.result;

+import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;

 import de.dhbwstuttgart.exceptions.NotImplementedException;
@@ -12,7 +14,7 @@ import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;

@SuppressWarnings("rawtypes")
-public class ResultSet {
+public class ResultSet implements Comparable<ResultSet>{

    public final Set<ResultPair> results;
    public Set<ResultPair<TypePlaceholder, TypePlaceholder>> genIns;
@@ -22,6 +24,10 @@ public class ResultSet {
        this.genIns = new HashSet<>();
        results.forEach(x -> { if (x instanceof PairTPHsmallerTPH) { this.genIns.add(x);}} );
    }
+
+    public List<ResultPair> getSortedResults() {
+    	return results.stream().sorted().toList();
+    }
    
    public boolean contains(ResultPair toCheck) {
    	return this.results.contains(toCheck);
@@ -63,6 +69,21 @@ public class ResultSet {
 	public int hashCode() {
 		return results.hashCode();
 	}
+
+    @Override
+    public int compareTo(ResultSet o) {
+        List<ResultPair> thisSorted = this.getSortedResults();
+        List<ResultPair> otherSorted = o.getSortedResults();
+        int sizeCompare = Integer.compare(thisSorted.size(), otherSorted.size());
+        if (sizeCompare != 0) return sizeCompare;
+
+        for (int i = 0; i < thisSorted.size(); i++) {
+            int cmp = thisSorted.get(i).compareTo(otherSorted.get(i));
+            if (cmp != 0) return cmp;
+        }
+
+        return 0;
+    }
 }

 class Resolver implements ResultSetVisitor {
--- a/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
@@ -73,7 +73,7 @@ public class TYPEStmt implements StatementVisitor {

    @Override
    public void visit(LambdaExpression lambdaExpression) {
-        TypePlaceholder tphRetType = TypePlaceholder.fresh(new NullToken());
+        TypePlaceholder tphRetType = TypePlaceholder.fresh(new NullToken(), -1, false);
        List<RefTypeOrTPHOrWildcardOrGeneric> lambdaParams = lambdaExpression.params.getFormalparalist().stream().map((formalParameter -> formalParameter.getType())).collect(Collectors.toList());
        lambdaParams.add(tphRetType);
        // lambdaParams.add(0,tphRetType);
@@ -635,6 +635,7 @@ public class TYPEStmt implements StatementVisitor {
            params.add(resolver.resolve(new GenericRefType(gtv.getName(), new NullToken())));
        }
        RefTypeOrTPHOrWildcardOrGeneric receiverType;
+        
        if (receiver instanceof FunNClass) {
            receiverType = new RefType(new JavaClassName(receiver.getClassName().toString() + "$$"), params, new NullToken()); // new FunN(params);
        } else {
--- a/src/main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
--- a/src/main/java/de/dhbwstuttgart/typeinference/unify/model/Node.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/unify/model/Node.java
@@ -53,7 +53,7 @@ class Node<T> {
 			addDescendant(descendant);
 		}
 	}
-	
+
 	/**
 	 * Adds a directed edge from the predecessor to this node (predecessor -> this)
 	 */
@@ -73,7 +73,7 @@ class Node<T> {
 			addPredecessor(predecessor);
 		}
 	}
-	
+
 	/**
 	 * The content of this node.
 	 */
--- a/src/test/java/AllgemeinTest.java
+++ b/src/test/java/AllgemeinTest.java
@@ -1,6 +1,6 @@


-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 import static targetast.TestCodegen.generateClassFiles;

 import java.io.File;
@@ -9,13 +9,12 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;

-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import com.google.common.collect.Lists;

 import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.environment.ByteArrayClassLoader;

 public class AllgemeinTest {

--- a/src/test/java/GenericsParserTest.java
+++ b/src/test/java/GenericsParserTest.java
@@ -6,12 +6,12 @@ import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.type.*;
 import de.dhbwstuttgart.target.generate.ASTToTargetAST;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.util.ArrayList;
 import java.util.List;

-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;

 public class GenericsParserTest {

--- a/src/test/java/TestComplete.java
+++ b/src/test/java/TestComplete.java
--- a/src/test/java/TestPackages.java
+++ b/src/test/java/TestPackages.java
@@ -1,6 +1,6 @@
 import de.dhbwstuttgart.core.JavaTXCompiler;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;

 import java.io.File;
 import java.util.List;
@@ -24,7 +24,7 @@ public class TestPackages {
    }

    @Test
-    @Ignore("This doesn't work")
+    @Disabled("This doesn't work")
    public void testPackagesCircular() throws Exception {
        var cmp = new JavaTXCompiler(
            List.of(
--- a/src/test/java/TestTypeDeployment.java
+++ b/src/test/java/TestTypeDeployment.java
@@ -4,7 +4,7 @@ import de.dhbwstuttgart.syntaxtree.SourceFile;
 import de.dhbwstuttgart.typedeployment.TypeInsert;
 import de.dhbwstuttgart.typedeployment.TypeInsertFactory;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.io.File;
 import java.nio.file.Path;
--- a/src/test/java/astfactory/ASTFactoryTest.java
+++ b/src/test/java/astfactory/ASTFactoryTest.java
@@ -4,7 +4,7 @@ package astfactory;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -12,7 +12,8 @@ import java.lang.reflect.TypeVariable;
 import java.util.Arrays;
 import java.util.HashMap;

-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+

 public class ASTFactoryTest<A> extends HashMap<String, A>{
    @Test
--- a/src/test/java/finiteClosure/SuperInterfacesTest.java
+++ b/src/test/java/finiteClosure/SuperInterfacesTest.java
@@ -3,7 +3,7 @@ package finiteClosure;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.FCGenerator;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.util.ArrayList;
 import java.util.Collection;
--- a/src/test/java/syntaxtreegenerator/TestComplete.java
+++ b/src/test/java/syntaxtreegenerator/TestComplete.java
@@ -1,9 +1,5 @@
 package syntaxtreegenerator;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
@@ -12,21 +8,23 @@ import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;

-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
 import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;

+import static org.junit.jupiter.api.Assertions.*;
+
 /**
 * Unit-Tests für den 'SyntaxTreeGenerator' aus dem Package 'parser' nach Vorbild der Klasse 'TestComplete' aus dem Test-Package 'targetast'
 */
 public class TestComplete {
    private static HashMap<String, File[]> javFiles = new HashMap<>();

-    @BeforeClass
+    @BeforeAll
    public static void setUp() {
        final String testFileDirectory = "resources/bytecode/javFiles/";
        final String expectedASTDirectory = "resources/syntaxtreegenerator/";
@@ -353,7 +351,7 @@ public class TestComplete {
            assertEquals("Comparing expected and resulting AST for mathStrucInteger.jav", expectedAST, resultingAST);
        } catch (Exception exc) {
            exc.printStackTrace();
-            assertTrue("An error occured while generating the AST for mathStrucInteger.jav", exc instanceof NotImplementedException);
+            assertInstanceOf(NotImplementedException.class, exc);
        }
    }

--- a/src/test/java/syntaxtreegenerator/TestNewFeatures.java
+++ b/src/test/java/syntaxtreegenerator/TestNewFeatures.java
@@ -1,15 +1,15 @@
 package syntaxtreegenerator;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;

 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.util.HashMap;

-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
@@ -17,7 +17,7 @@ import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
 public class TestNewFeatures {
    private static HashMap<String, File[]> javFiles = new HashMap<>();

-    @BeforeClass
+    @BeforeAll
    public static void setUp() {
        final String testFileDirectory = "resources/syntaxtreegenerator/javFiles/";
        final String expectedASTDirectory = "resources/syntaxtreegenerator/";
--- a/src/test/java/targetast/ASTToTypedTargetAST.java
+++ b/src/test/java/targetast/ASTToTypedTargetAST.java
@@ -2,7 +2,6 @@ package targetast;

 import com.google.common.reflect.TypeToken;
 import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.*;
@@ -10,13 +9,13 @@ import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.target.generate.ASTToTargetAST;
 import de.dhbwstuttgart.target.tree.TargetStructure;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;

 import java.nio.file.Path;
 import java.util.*;

-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;

 public class ASTToTypedTargetAST {

@@ -24,7 +23,7 @@ public class ASTToTypedTargetAST {
    public void emptyClass() {
        ClassOrInterface emptyClass = new ClassOrInterface(0, new JavaClassName("EmptyClass"), new ArrayList<>(), Optional.empty(), Optional.empty(), new ArrayList<>(), new ArrayList<>(), new GenericDeclarationList(new ArrayList<>(), new NullToken()), new RefType(new JavaClassName("Object"), new NullToken()), false, false, new ArrayList<>(), new ArrayList<>(), new NullToken(), null);
        ResultSet emptyResultSet = new ResultSet(new HashSet<>());
-        TargetStructure emptyTargetClass = new ASTToTargetAST(List.of(emptyResultSet)).convert(emptyClass);
+        TargetStructure emptyTargetClass = new ASTToTargetAST(List.of(emptyResultSet), TestCodegen.createClassLoader()).convert(emptyClass);
        assert emptyTargetClass.getName().equals("EmptyClass");
        assert emptyTargetClass.methods().size() == 0;
        assert emptyTargetClass.fields().size() == 0;
@@ -32,13 +31,14 @@ public class ASTToTypedTargetAST {

    @Test
    public void overloading() throws Exception {
+        var classLoader = TestCodegen.createClassLoader();
+
        var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Overloading.jav").toFile();
        var compiler = new JavaTXCompiler(file);
        var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(compiler, resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet, classLoader);
        var classes = compiler.sourceFiles.get(file).getClasses();

-        var classLoader = new ByteArrayClassLoader();
        var overloading = TestCodegen.generateClass(converter.convert(classes.get(0)), classLoader);
        var overloading2 = TestCodegen.generateClass(converter.convert(classes.get(1)), classLoader);

@@ -54,46 +54,54 @@ public class ASTToTypedTargetAST {

    @Test
    public void tphsAndGenerics() throws Exception {
+        var classLoader = TestCodegen.createClassLoader();
+
        var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Tph2.jav").toFile();
        var compiler = new JavaTXCompiler(file);
        var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(compiler, resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet, classLoader);
        var classes = compiler.sourceFiles.get(file).getClasses();

-        var tphAndGenerics = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
+        var tphAndGenerics = TestCodegen.generateClass(converter.convert(classes.get(0)), classLoader);
    }

    @Test
    public void cycles() throws Exception {
+        var classLoader = TestCodegen.createClassLoader();
+
        var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Cycle.jav").toFile();
        var compiler = new JavaTXCompiler(file);
        var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(compiler, resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet, classLoader);
        var classes = compiler.sourceFiles.get(file).getClasses();

-        var cycle = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
+        var cycle = TestCodegen.generateClass(converter.convert(classes.get(0)), classLoader);
    }

    @Test
    public void infimum() throws Exception {
+        var classLoader = TestCodegen.createClassLoader();
+
        var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Infimum.jav").toFile();
        var compiler = new JavaTXCompiler(file);
        var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(compiler, resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet, classLoader);
        var classes = compiler.sourceFiles.get(file).getClasses();

-        var infimum = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
+        var infimum = TestCodegen.generateClass(converter.convert(classes.get(0)), classLoader);
    }

    @Test
    public void gen() throws Exception {
+        var classLoader = TestCodegen.createClassLoader();
+
        var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Gen.jav").toFile();
        var compiler = new JavaTXCompiler(file);
        var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(compiler, resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet, classLoader);
        var classes = compiler.sourceFiles.get(file).getClasses();

-        var generics = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
+        var generics = TestCodegen.generateClass(converter.convert(classes.get(0)), TestCodegen.createClassLoader());
        var m = generics.getDeclaredMethod("m", Vector.class);
        var mReturnType = m.getGenericReturnType();
        assertEquals(mReturnType, m.getParameters()[0].getParameterizedType());
@@ -103,13 +111,15 @@ public class ASTToTypedTargetAST {

    @Test
    public void definedGenerics() throws Exception {
+        var classLoader = TestCodegen.createClassLoader();
+
        var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Generics.jav").toFile();
        var compiler = new JavaTXCompiler(file);
        var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(compiler, resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet, classLoader);
        var classes = compiler.sourceFiles.get(file).getClasses();

-        var generics = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
+        var generics = TestCodegen.generateClass(converter.convert(classes.get(0)), classLoader);
        var B = generics.getTypeParameters()[0];
        var mt1 = generics.getDeclaredMethod("mt1", Object.class);
        var constructor = generics.getDeclaredConstructor(Object.class);
@@ -121,13 +131,15 @@ public class ASTToTypedTargetAST {

    @Test
    public void definedGenerics2() throws Exception {
+        var classLoader = TestCodegen.createClassLoader();
+
        var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Generics2.jav").toFile();
        var compiler = new JavaTXCompiler(file);
        var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(compiler, resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet, classLoader);
        var classes = compiler.sourceFiles.get(file).getClasses();

-        var generics2 = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
+        var generics2 = TestCodegen.generateClass(converter.convert(classes.get(0)), classLoader);
        assertEquals(generics2.getTypeParameters()[0].getBounds()[0], String.class);
        var m = generics2.getDeclaredMethod("m1", Object.class);
        assertEquals(m.getTypeParameters()[0].getBounds()[0], Integer.class);
@@ -135,26 +147,30 @@ public class ASTToTypedTargetAST {
    }

    @Test
-    @Ignore("Not implemented")
+    @Disabled("Not implemented")
    public void definedGenerics3() throws Exception {
+        var classLoader = TestCodegen.createClassLoader();
+
        var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Generics3.jav").toFile();
        var compiler = new JavaTXCompiler(file);
        var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(compiler, resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet, classLoader);
        var classes = compiler.sourceFiles.get(file).getClasses();

-        var generics3 = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
+        var generics3 = TestCodegen.generateClass(converter.convert(classes.get(0)), classLoader);
    }

    @Test
    public void definedGenerics4() throws Exception {
+        var classLoader = TestCodegen.createClassLoader();
+
        var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Generics4.jav").toFile();
        var compiler = new JavaTXCompiler(file);
        var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(compiler, resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet, classLoader);
        var classes = compiler.sourceFiles.get(file).getClasses();

-        var generics4 = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
+        var generics4 = TestCodegen.generateClass(converter.convert(classes.get(0)), classLoader);

        // var instance = generics4.getDeclaredConstructor().newInstance();
        // var method = generics4.getDeclaredMethod("m2", Object.class);
--- a/src/test/java/targetast/GreaterEqualTest.java
+++ b/src/test/java/targetast/GreaterEqualTest.java
@@ -1,22 +1,21 @@
 package targetast;

-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;

 public class GreaterEqualTest {
    static Class<?> classToTest;
    static Object instance;

-    @BeforeClass
+    @BeforeAll
    public static void beforeClass() throws Exception {
-        var classFiles = TestCodegen.generateClassFiles(new ByteArrayClassLoader(), "GreaterEqual.jav");
+        var classFiles = TestCodegen.generateClassFiles(TestCodegen.createClassLoader(), "GreaterEqual.jav");
        classToTest = classFiles.get("GreaterEqual");
        instance = classToTest.getDeclaredConstructor().newInstance();
    }
--- a/src/test/java/targetast/GreaterThanTest.java
+++ b/src/test/java/targetast/GreaterThanTest.java
@@ -1,21 +1,20 @@
 package targetast;

-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.Method;

-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;

 public class GreaterThanTest {
    static Class<?> classToTest;
    static Object instance;

-    @BeforeClass
+    @BeforeAll
    public static void beforeClass() throws Exception {
-        var classFiles = TestCodegen.generateClassFiles(new ByteArrayClassLoader(), "GreaterThan.jav");
+        var classFiles = TestCodegen.generateClassFiles(TestCodegen.createClassLoader(), "GreaterThan.jav");
        classToTest = classFiles.get("GreaterThan");
        instance = classToTest.getDeclaredConstructor().newInstance();
    }
--- a/src/test/java/targetast/InheritTest.java
+++ b/src/test/java/targetast/InheritTest.java
@@ -1,22 +1,20 @@
 package targetast;

-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.Method;
-import java.nio.file.Path;
 import java.util.Vector;

-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;

 public class InheritTest {
    private static Class<?> classToTest, classToTestAA, classToTestBB, classToTestCC, classToTestDD;
    private static Object instanceOfClass, instanceOfClassAA, instanceOfClassBB, instanceOfClassCC, instanceOfClassDD;

-    @BeforeClass
+    @BeforeAll
    public static void setUpBeforeClass() throws Exception {
-        var classLoader = new ByteArrayClassLoader();
+        var classLoader = TestCodegen.createClassLoader();

        var classes = TestCodegen.generateClassFiles(classLoader, "Inherit.jav");
        classToTest = classes.get("Inherit");
@@ -35,72 +33,72 @@ public class InheritTest {
    @Test
    public void testmainAA() throws Exception {
        Method m = classToTestAA.getDeclaredMethod("m", Integer.class);
-        assertEquals(m.invoke(instanceOfClassAA, 5), "AA");
+        assertEquals("AA", m.invoke(instanceOfClassAA, 5));
        Method main = classToTest.getDeclaredMethod("main", classToTestAA, Integer.class);
-        assertEquals(main.invoke(instanceOfClass, instanceOfClassAA, 5), "AA");
+        assertEquals("AA", main.invoke(instanceOfClass, instanceOfClassAA, 5));
    }

    @Test
    public void testmainBB() throws Exception {
        Method m = classToTestAA.getDeclaredMethod("m", Integer.class);
-        assertEquals(m.invoke(instanceOfClassBB, 5), "AA");
+        assertEquals("AA", m.invoke(instanceOfClassBB, 5));
        Method main = classToTest.getDeclaredMethod("main", classToTestAA, Integer.class);
-        assertEquals(main.invoke(instanceOfClass, instanceOfClassBB, 5), "AA");
+        assertEquals("AA", main.invoke(instanceOfClass, instanceOfClassBB, 5));
    }

    @Test
    public void testmainCC() throws Exception {
        Method m = classToTestCC.getDeclaredMethod("m", Integer.class);
-        assertEquals(m.invoke(instanceOfClassCC, 5), "CC");
+        assertEquals("CC", m.invoke(instanceOfClassCC, 5));
        Method main = classToTest.getDeclaredMethod("main", classToTestCC, Integer.class);
-        assertEquals(main.invoke(instanceOfClass, instanceOfClassCC, 5), "CC");
+        assertEquals("CC", main.invoke(instanceOfClass, instanceOfClassCC, 5));
    }

    @Test
    public void testmainDD() throws Exception {
        Method m = classToTestCC.getDeclaredMethod("m", Integer.class);
-        assertEquals(m.invoke(instanceOfClassDD, 5), "CC");
+        assertEquals("CC", m.invoke(instanceOfClassDD, 5));
        Method main = classToTest.getDeclaredMethod("main", classToTestCC, Integer.class);
-        assertEquals(main.invoke(instanceOfClass, instanceOfClassDD, 5), "CC");
+        assertEquals("CC", main.invoke(instanceOfClass, instanceOfClassDD, 5));
    }

    @Test
    public void testmainVectorAA() throws Exception {
        Method m = classToTestAA.getDeclaredMethod("m", Integer.class);
-        assertEquals(m.invoke(instanceOfClassAA, 5), "AA");
+        assertEquals("AA", m.invoke(instanceOfClassAA, 5));
        Vector v = new Vector<>();
        v.add(instanceOfClassAA);
        Method main = classToTest.getDeclaredMethod("main", Vector.class, Integer.class);
-        assertEquals(main.invoke(instanceOfClass, v, 5), "AA");
+        assertEquals("AA", main.invoke(instanceOfClass, v, 5));
    }

    @Test
    public void testmainVectorBB() throws Exception {
        Method m = classToTestAA.getDeclaredMethod("m", Integer.class);
-        assertEquals(m.invoke(instanceOfClassBB, 5), "AA");
+        assertEquals("AA", m.invoke(instanceOfClassBB, 5));
        Vector v = new Vector<>();
        v.add(instanceOfClassBB);
        Method main = classToTest.getDeclaredMethod("main", Vector.class, Integer.class);
-        assertEquals(main.invoke(instanceOfClass, v, 5), "AA");
+        assertEquals("AA", main.invoke(instanceOfClass, v, 5));
    }

    @Test
    public void testmainVectorCC() throws Exception {
        Method m = classToTestCC.getDeclaredMethod("m", Integer.class);
-        assertEquals(m.invoke(instanceOfClassCC, 5), "CC");
+        assertEquals("CC", m.invoke(instanceOfClassCC, 5));
        Vector v = new Vector<>();
        v.add(instanceOfClassCC);
        Method main = classToTest.getDeclaredMethod("main", Vector.class, Integer.class);
-        assertEquals(main.invoke(instanceOfClass, v, 5), "CC");
+        assertEquals("CC", main.invoke(instanceOfClass, v, 5));
    }

    @Test
    public void testmainVectorDD() throws Exception {
        Method m = classToTestCC.getDeclaredMethod("m", Integer.class);
-        assertEquals(m.invoke(instanceOfClassDD, 5), "CC");
+        assertEquals("CC", m.invoke(instanceOfClassDD, 5));
        Vector v = new Vector<>();
        v.add(instanceOfClassDD);
        Method main = classToTest.getDeclaredMethod("main", Vector.class, Integer.class);
-        assertEquals(main.invoke(instanceOfClass, v, 5), "CC");
+        assertEquals("CC", main.invoke(instanceOfClass, v, 5));
    }
 }
--- a/src/test/java/targetast/InheritTest2.java
+++ b/src/test/java/targetast/InheritTest2.java
@@ -1,23 +1,22 @@
 package targetast;

-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.Method;
 import java.util.Vector;

-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;

-@Ignore("FIXME")
+@Disabled("FIXME")
 public class InheritTest2 {
    private static Class<?> classToTest, classToTestAA, classToTestBB, classToTestCC, classToTestDD;
    private static Object instanceOfClass, instanceOfClassAA, instanceOfClassBB, instanceOfClassCC, instanceOfClassDD;

-    @BeforeClass
+    @BeforeAll
    public static void setUpBeforeClass() throws Exception {
-        var classLoader = new ByteArrayClassLoader();
+        var classLoader = TestCodegen.createClassLoader();
        classToTest   = TestCodegen.generateClassFiles(classLoader, "Inherit2.jav").get("Inherit2");
        classToTestAA = TestCodegen.generateClassFiles(classLoader, "AA.jav").get("AA");
        classToTestBB = TestCodegen.generateClassFiles(classLoader, "BB.jav").get("BB");
--- a/src/test/java/targetast/LessEqualTest.java
+++ b/src/test/java/targetast/LessEqualTest.java
@@ -1,21 +1,20 @@
 package targetast;

-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.Method;

-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;

 public class LessEqualTest {
    static Class<?> classToTest;
    static Object instance;

-    @BeforeClass
+    @BeforeAll
    public static void beforeClass() throws Exception {
-        var classFiles = TestCodegen.generateClassFiles(new ByteArrayClassLoader(), "LessEqual.jav");
+        var classFiles = TestCodegen.generateClassFiles(TestCodegen.createClassLoader(), "LessEqual.jav");
        classToTest = classFiles.get("LessEqual");
        instance = classToTest.getDeclaredConstructor().newInstance();
    }
--- a/src/test/java/targetast/LessThanTest.java
+++ b/src/test/java/targetast/LessThanTest.java
@@ -1,21 +1,20 @@
 package targetast;

-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.Method;

-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;

 public class LessThanTest {
    static Class<?> classToTest;
    static Object instance;

-    @BeforeClass
+    @BeforeAll
    public static void beforeClass() throws Exception {
-        var classFiles = TestCodegen.generateClassFiles(new ByteArrayClassLoader(), "LessThan.jav");
+        var classFiles = TestCodegen.generateClassFiles(TestCodegen.createClassLoader(), "LessThan.jav");
        classToTest = classFiles.get("LessThan");
        instance = classToTest.getDeclaredConstructor().newInstance();
    }
--- a/src/test/java/targetast/OLTest.java
+++ b/src/test/java/targetast/OLTest.java
@@ -1,12 +1,12 @@
 package targetast;

-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.Method;

-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+

 public class OLTest {
 	private static Class<?> classToTest;
@@ -14,9 +14,9 @@ public class OLTest {
 	private static Object instanceOfClass;
 	private static Object instanceOfClass1;
 	
-	@BeforeClass
+	@BeforeAll
 	public static void setUpBeforeClass() throws Exception {
-		var classFiles = TestCodegen.generateClassFiles(new ByteArrayClassLoader(), "OL.jav");
+		var classFiles = TestCodegen.generateClassFiles(TestCodegen.createClassLoader(), "OL.jav");
 		classToTest = classFiles.get("OL");
 		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
 		classToTest1 = classFiles.get("OLMain");
--- a/src/test/java/targetast/PostIncTest.java
+++ b/src/test/java/targetast/PostIncTest.java
@@ -1,20 +1,19 @@
 package targetast;

-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.Method;

-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;

 public class PostIncTest {
 	private static Class<?> classToTest;
 	private static Object instanceOfClass;
 	
-	@BeforeClass
+	@BeforeAll
 	public static void setUpBeforeClass() throws Exception {
-		var classFiles = TestCodegen.generateClassFiles(new ByteArrayClassLoader(), "PostIncDec.jav");
+		var classFiles = TestCodegen.generateClassFiles(TestCodegen.createClassLoader(), "PostIncDec.jav");
 		classToTest = classFiles.get("PostIncDec");
 		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
 	}
--- a/src/test/java/targetast/PreIncTest.java
+++ b/src/test/java/targetast/PreIncTest.java
@@ -1,20 +1,19 @@
 package targetast;

-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.Method;

-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;

 public class PreIncTest {
 	private static Class<?> classToTest;
 	private static Object instanceOfClass;
 	
-	@BeforeClass
+	@BeforeAll
 	public static void setUpBeforeClass() throws Exception {
-		var classFiles = TestCodegen.generateClassFiles(new ByteArrayClassLoader(), "PreInc.jav");
+		var classFiles = TestCodegen.generateClassFiles(TestCodegen.createClassLoader(), "PreInc.jav");
 		classToTest = classFiles.get("PreInc");
 		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
 	}
--- a/src/test/java/targetast/PutTest.java
+++ b/src/test/java/targetast/PutTest.java
@@ -1,22 +1,21 @@
 package targetast;

-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.Method;
 import java.util.Stack;
 import java.util.Vector;

-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;

 public class PutTest {
 	private static Class<?> classToTest;
 	private static Object instanceOfClass;
 	
-	@BeforeClass
+	@BeforeAll
 	public static void setUpBeforeClass() throws Exception {
-		var classFiles = TestCodegen.generateClassFiles(new ByteArrayClassLoader(), "Put.jav");
+		var classFiles = TestCodegen.generateClassFiles(TestCodegen.createClassLoader(), "Put.jav");
 		classToTest = classFiles.get("Put");
 		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
 	}
--- a/src/test/java/targetast/TestCodegen.java
+++ b/src/test/java/targetast/TestCodegen.java
@@ -2,7 +2,7 @@ package targetast;

 import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.bytecode.Codegen;
-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
+import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.environment.IByteArrayClassLoader;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.target.generate.ASTToTargetAST;
@@ -14,10 +14,10 @@ import de.dhbwstuttgart.target.tree.expression.*;
 import de.dhbwstuttgart.target.tree.type.TargetFunNType;
 import de.dhbwstuttgart.target.tree.type.TargetRefType;
 import de.dhbwstuttgart.target.tree.type.TargetType;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;

-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;

 import org.objectweb.asm.Opcodes;

@@ -37,6 +37,10 @@ public class TestCodegen {
        Files.write(outputPath.resolve(name + ".class"), code);
    }

+    public static IByteArrayClassLoader createClassLoader() {
+        return new DirectoryClassLoader(List.of(outputPath.toFile()), ClassLoader.getSystemClassLoader());
+    }
+
    public static Path path = Path.of(System.getProperty("user.dir"), "resources/bytecode/javFiles/");

    public static Map<String, ? extends Class<?>> generateClassFiles(IByteArrayClassLoader classLoader, String... files) throws IOException, ClassNotFoundException {
@@ -119,7 +123,7 @@ public class TestCodegen {
    public void testEmptyClass() throws Exception {
        var clazz = new TargetClass(Opcodes.ACC_PUBLIC, new JavaClassName("Empty"));
        clazz.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "main", List.of(), null, new TargetBlock(List.of()));
-        generateClass(clazz, new ByteArrayClassLoader()).getDeclaredMethod("main").invoke(null);
+        generateClass(clazz, createClassLoader()).getDeclaredMethod("main").invoke(null);
    }

    @Test
@@ -132,7 +136,7 @@ public class TestCodegen {
        targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "mul", List.of(new MethodParameter(TargetType.Integer, "a"), new MethodParameter(TargetType.Integer, "b")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetBinaryOp.Mul(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"), new TargetLocalVar(TargetType.Integer, "b"))))));
        targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "rem", List.of(new MethodParameter(TargetType.Integer, "a"), new MethodParameter(TargetType.Integer, "b")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetBinaryOp.Rem(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"), new TargetLocalVar(TargetType.Integer, "b"))))));

-        var clazz = generateClass(targetClass, new ByteArrayClassLoader());
+        var clazz = generateClass(targetClass, createClassLoader());
        assertEquals(clazz.getDeclaredMethod("add", Integer.class, Integer.class).invoke(null, 10, 10), 20);
        assertEquals(clazz.getDeclaredMethod("sub", Integer.class, Integer.class).invoke(null, 20, 10), 10);
        assertEquals(clazz.getDeclaredMethod("div", Integer.class, Integer.class).invoke(null, 20, 10), 2);
@@ -148,7 +152,7 @@ public class TestCodegen {
        targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "neg", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.Negate(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"))))));
        targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "add", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.Add(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"))))));

-        var clazz = generateClass(targetClass, new ByteArrayClassLoader());
+        var clazz = generateClass(targetClass, createClassLoader());
        assertEquals(clazz.getDeclaredMethod("not", Integer.class).invoke(null, 10), -11);
        assertEquals(clazz.getDeclaredMethod("neg", Integer.class).invoke(null, 10), -10);
        assertEquals(clazz.getDeclaredMethod("add", Integer.class).invoke(null, 10), 10);
@@ -162,7 +166,7 @@ public class TestCodegen {
        targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "and", List.of(new MethodParameter(TargetType.Boolean, "a"), new MethodParameter(TargetType.Boolean, "b")), TargetType.Boolean, new TargetBlock(List.of(new TargetReturn(new TargetBinaryOp.And(TargetType.Boolean, new TargetLocalVar(TargetType.Boolean, "a"), new TargetLocalVar(TargetType.Boolean, "b"))))));
        targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "or", List.of(new MethodParameter(TargetType.Boolean, "a"), new MethodParameter(TargetType.Boolean, "b")), TargetType.Boolean, new TargetBlock(List.of(new TargetReturn(new TargetBinaryOp.Or(TargetType.Boolean, new TargetLocalVar(TargetType.Boolean, "a"), new TargetLocalVar(TargetType.Boolean, "b"))))));

-        var clazz = generateClass(targetClass, new ByteArrayClassLoader());
+        var clazz = generateClass(targetClass, createClassLoader());
        var and = clazz.getDeclaredMethod("and", Boolean.class, Boolean.class);
        var or = clazz.getDeclaredMethod("or", Boolean.class, Boolean.class);
        assertEquals(and.invoke(null, true, false), false);
@@ -176,7 +180,7 @@ public class TestCodegen {
    public void testArithmeticConvert() throws Exception {
        var targetClass = new TargetClass(Opcodes.ACC_PUBLIC, new JavaClassName("ArithmeticConvert"));
        targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "add", List.of(), TargetType.Long, new TargetBlock(List.of(new TargetReturn(new TargetBinaryOp.Add(TargetType.Long, new TargetLiteral.CharLiteral((char) 10), new TargetLiteral.LongLiteral((long) 20))))));
-        var clazz = generateClass(targetClass, new ByteArrayClassLoader());
+        var clazz = generateClass(targetClass, createClassLoader());
        assertEquals(clazz.getDeclaredMethod("add").invoke(null), (long) 30);
    }

@@ -185,7 +189,7 @@ public class TestCodegen {
        var targetClass = new TargetClass(Opcodes.ACC_PUBLIC, new JavaClassName("HelloWorld"));
        targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "helloWorld", List.of(), null, new TargetBlock(List.of(new TargetMethodCall(null, new TargetFieldVar(new TargetRefType("java.io.PrintStream"), new TargetRefType("java.lang.System"), true, new TargetClassName(new TargetRefType("java.lang.System")), "out"), List.of(new TargetLiteral.StringLiteral("Hello World!")), new TargetRefType("java.io.PrintStream"), "println", false, false, false))));

-        var clazz = generateClass(targetClass, new ByteArrayClassLoader());
+        var clazz = generateClass(targetClass, createClassLoader());
        clazz.getDeclaredMethod("helloWorld").invoke(null);
    }

@@ -193,7 +197,7 @@ public class TestCodegen {
    public void testIfStatement() throws Exception {
        var targetClass = new TargetClass(Opcodes.ACC_PUBLIC, new JavaClassName("IfStmt"));
        targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "ifStmt", List.of(new MethodParameter(TargetType.Integer, "val")), TargetType.Integer, new TargetBlock(List.of(new TargetIf(new TargetBinaryOp.Equal(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "val"), new TargetLiteral.IntLiteral(10)), new TargetReturn(new TargetLiteral.IntLiteral(1)), new TargetIf(new TargetBinaryOp.Less(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "val"), new TargetLiteral.IntLiteral(5)), new TargetReturn(new TargetLiteral.IntLiteral(2)), new TargetReturn(new TargetLiteral.IntLiteral(3)))))));
-        var clazz = generateClass(targetClass, new ByteArrayClassLoader());
+        var clazz = generateClass(targetClass, createClassLoader());
        var ifStmt = clazz.getDeclaredMethod("ifStmt", Integer.class);
        assertEquals(ifStmt.invoke(null, 10), 1);
        assertEquals(ifStmt.invoke(null, 3), 2);
@@ -204,7 +208,7 @@ public class TestCodegen {
    public void testFor() throws Exception {
        var targetClass = new TargetClass(Opcodes.ACC_PUBLIC, new JavaClassName("For"));
        targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "forLoop", List.of(), TargetType.Integer, new TargetBlock(List.of(new TargetVarDecl(TargetType.Integer, "sum", new TargetLiteral.IntLiteral(0)), new TargetFor(List.of(new TargetVarDecl(TargetType.Integer, "i", new TargetLiteral.IntLiteral(0))), new TargetBinaryOp.Less(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "i"), new TargetLiteral.IntLiteral(10)), List.of(new TargetAssign(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "i"), new TargetBinaryOp.Add(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "i"), new TargetLiteral.IntLiteral(1)))), new TargetBlock(List.of(new TargetAssign(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "sum"), new TargetBinaryOp.Add(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "sum"), new TargetLocalVar(TargetType.Integer, "i")))))), new TargetReturn(new TargetLocalVar(TargetType.Integer, "sum")))));
-        var clazz = generateClass(targetClass, new ByteArrayClassLoader());
+        var clazz = generateClass(targetClass, createClassLoader());
        assertEquals(clazz.getDeclaredMethod("forLoop").invoke(null), 45);
    }

@@ -212,7 +216,7 @@ public class TestCodegen {
    public void testWhile() throws Exception {
        var targetClass = new TargetClass(Opcodes.ACC_PUBLIC, new JavaClassName("While"));
        targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "whileLoop", List.of(), TargetType.Integer, new TargetBlock(List.of(new TargetVarDecl(TargetType.Integer, "i", new TargetLiteral.IntLiteral(0)), new TargetWhile(new TargetBinaryOp.Less(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "i"), new TargetLiteral.IntLiteral(10)), new TargetBlock(List.of(new TargetAssign(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "i"), new TargetBinaryOp.Add(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "i"), new TargetLiteral.IntLiteral(1)))))), new TargetReturn(new TargetLocalVar(TargetType.Integer, "i")))));
-        var clazz = generateClass(targetClass, new ByteArrayClassLoader());
+        var clazz = generateClass(targetClass, createClassLoader());
        assertEquals(clazz.getDeclaredMethod("whileLoop").invoke(null), 10);
    }

@@ -235,7 +239,7 @@ public class TestCodegen {
                new TargetReturn(new TargetLocalVar(TargetType.Integer, "res"))
        )));

-        var clazz = generateClass(targetClass, new ByteArrayClassLoader());
+        var clazz = generateClass(targetClass, createClassLoader());
        var m = clazz.getDeclaredMethod("switchClassic", Integer.class);
        assertEquals(m.invoke(null, 10), 0);
        assertEquals(m.invoke(null, 15), 1);
@@ -264,7 +268,7 @@ public class TestCodegen {
                        List.of(new TargetLiteral.IntLiteral(2))
                ), true), TargetType.Integer)
                ))));
-        var clazz = generateClass(targetClass, new ByteArrayClassLoader());
+        var clazz = generateClass(targetClass, createClassLoader());
        var m = clazz.getDeclaredMethod("switchType", Object.class);
        assertEquals(m.invoke(null, "String"), 0);
        assertEquals(m.invoke(null,  10), 1);
@@ -273,9 +277,9 @@ public class TestCodegen {
    }

    @Test
-    @Ignore("The lambda class is not generated because we don't call ASTToTargetAST")
+    @Disabled("The lambda class is not generated because we don't call ASTToTargetAST")
    public void testLambda() throws Exception {
-        var classLoader = new ByteArrayClassLoader();
+        var classLoader = createClassLoader();
        // var fun = classLoader.loadClass(Path.of(System.getProperty("user.dir"), "src/test/java/targetast/Fun1$$.class"));
        var interfaceType = TargetFunNType.fromParams(List.of(TargetType.Integer), 1);

--- a/src/test/java/targetast/TestGenerics.java
+++ b/src/test/java/targetast/TestGenerics.java
@@ -12,9 +12,9 @@ import de.dhbwstuttgart.target.generate.Bound;
 import static de.dhbwstuttgart.target.generate.Bound.*;
 import de.dhbwstuttgart.target.generate.BoundsList;
 import de.dhbwstuttgart.target.generate.GenericsResult;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;

 import java.io.File;
 import java.io.IOException;
@@ -22,7 +22,7 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;

-@Ignore("TODO: Rewrite with the new algorithm")
+@Disabled("TODO: Rewrite with the new algorithm")
 public class TestGenerics {
    private static final String rootDirectory = System.getProperty("user.dir") + "/resources/insertGenerics/javFiles/";
    private static final String bytecodeDirectory = System.getProperty("user.dir") + "targetTest";
--- a/src/test/java/targetast/TphTest.java
+++ b/src/test/java/targetast/TphTest.java
@@ -1,21 +1,21 @@
 package targetast;

-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.Method;

-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+

 public class TphTest {

 	private static Class<?> classToTest;
 	private static Object instanceOfClass;

-	@BeforeClass
+	@BeforeAll
 	public static void setUpBeforeClass() throws Exception {
-		var classFiles = TestCodegen.generateClassFiles(new ByteArrayClassLoader(), "Tph.jav");
+		var classFiles = TestCodegen.generateClassFiles(TestCodegen.createClassLoader(), "Tph.jav");
 		classToTest = classFiles.get("Tph");
 		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
 	}
--- a/src/test/java/targetast/WhileTest.java
+++ b/src/test/java/targetast/WhileTest.java
@@ -1,20 +1,19 @@
 package targetast;

-import de.dhbwstuttgart.environment.ByteArrayClassLoader;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;

 import java.lang.reflect.Method;

-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;

 public class WhileTest {
 	private static Class<?> classToTest;
 	private static Object instanceOfClass;
 	
-	@BeforeClass
+	@BeforeAll
 	public static void setUpBeforeClass() throws Exception {
-		var classFiles = TestCodegen.generateClassFiles(new ByteArrayClassLoader(), "While.jav");
+		var classFiles = TestCodegen.generateClassFiles(TestCodegen.createClassLoader(), "While.jav");
 		classToTest = classFiles.get("While");
 		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
 	}
--- a/src/test/java/typeinference/JavaTXCompilerTest.java
+++ b/src/test/java/typeinference/JavaTXCompilerTest.java
@@ -8,8 +8,8 @@ import de.dhbwstuttgart.typedeployment.TypeInsert;
 import de.dhbwstuttgart.typedeployment.TypeInsertFactory;
 import de.dhbwstuttgart.typeinference.result.ResultSet;

-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;

 import java.io.File;
 import java.io.IOException;
@@ -22,7 +22,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

-@Ignore("To be renewed")
+@Disabled("To be renewed")
 public class JavaTXCompilerTest {

    public static final String rootDirectory = System.getProperty("user.dir") + "/src/test/resources/javFiles/";
Author	SHA1	Message	Date
Daniel Holle	d6ed0689bc	Fix test All checks were successful Build and Test with Maven / Build-and-test-with-Maven (push) Successful in 1m33s Details	2025-07-23 11:56:34 +02:00
Daniel Holle	d7676f36e3	Fix #371 Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 1m55s Details	2025-07-23 11:44:10 +02:00
julian	9e323759d6	sort resultsets before printing them to the console to enhance comparability between results Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 1m28s Details	2025-07-16 11:17:53 +02:00
Daniel Holle	558083166d	Fix subtyping of function types All checks were successful Build and Test with Maven / Build-and-test-with-Maven (push) Successful in 1m45s Details	2025-07-15 15:02:15 +02:00
julian	aec2f9a399	adjust FiniteClosure to only use imported types + some necessary ones Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 1m37s Details	2025-07-15 14:06:51 +02:00
pl@gohorb.ba-horb.de	31df7a65f0	deleted: ../resources/bytecode/javFiles/Bug365a.jav Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 10m24s Details modified: ../src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java modified: ../src/test/java/TestComplete.java	2025-07-08 17:44:55 +02:00
pl@gohorb.ba-horb.de	185989ba62	--- a/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java +++ b/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java @@ -73,7 +73,7 @@ public class TYPEStmt implements StatementVisitor { @Override public void visit(LambdaExpression lambdaExpression) { - TypePlaceholder tphRetType = TypePlaceholder.fresh(new NullToken()); + TypePlaceholder tphRetType = TypePlaceholder.fresh(new NullToken(), -1, false); List<RefTypeOrTPHOrWildcardOrGeneric> lambdaParams = lambdaExpression.params.getFormalparalist().stream().map((formalParameter -> formalParameter.getType())).collect(Collectors.toList()); lambdaParams.add(tphRetType); // lambdaParams.add(0,tphRetType); @@ -635,6 +635,7 @@ public class TYPEStmt implements StatementVisitor { params.add(resolver.resolve(new GenericRefType(gtv.getName(), new NullToken()))); } RefTypeOrTPHOrWildcardOrGeneric receiverType; modified: ../src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java	2025-07-08 14:32:05 +02:00
pl@gohorb.ba-horb.de	0eb48ba425	new file: resources/bytecode/javFiles/Bug365a.jav Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 4m44s Details modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java modified: src/test/java/TestComplete.java	2025-07-07 13:11:27 +02:00
Daniel Holle	ceee9a49c4	Merge branch 'issue363' of ssh://gitea.hb.dhbw-stuttgart.de:2222/JavaTX/JavaCompilerCore into issue363 Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 34m14s Details	2025-07-02 11:09:44 +02:00
Daniel Holle	ee64218a5f	Fix class files not generating FunN types when using jar file	2025-07-02 11:09:38 +02:00
Daniel Holle	c50f14a4a3	.gitea/workflows/build_and_test.yml aktualisiert All checks were successful Build and Test with Maven / Build-and-test-with-Maven (push) Successful in 6m52s Details	2025-07-01 14:35:08 +00:00
Daniel Holle	1f4250ff84	Update project to java 24, update dependencies and change api to Junit 5 Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 45s Details	2025-07-01 15:55:58 +02:00
Daniel Holle	ae41c7f19d	Fix #366	2025-07-01 15:54:08 +02:00
Daniel Holle	2416c80c20	Merge branch 'issue363' of ssh://gitea.hb.dhbw-stuttgart.de:2222/JavaTX/JavaCompilerCore into issue363 Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Has been cancelled Details	2025-07-01 13:46:19 +02:00
Daniel Holle	4cc55c0059	Add test for #366	2025-07-01 13:45:56 +02:00
Daniel Holle	9434facfa0	Purge generics from lambdas Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 50m14s Details	2025-06-20 15:43:15 +02:00
Daniel Holle	09a6b9a788	Fix lambda expression captures All checks were successful Build and Test with Maven / Build-and-test-with-Maven (push) Successful in 13m35s Details	2025-06-18 18:31:22 +02:00
i21023	8b342c5604	the last commit message was a lie, nothing was fixed. The lambdas does not even respect the arguments it is given? Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Has been cancelled Details	2025-06-18 16:46:27 +02:00
Daniel Holle	cdb93b5155	Remove ByteArrayClassLoader and fix #363 All checks were successful Build and Test with Maven / Build-and-test-with-Maven (push) Successful in 4m35s Details	2025-06-18 15:26:14 +02:00
Daniel Holle	b07e848fa2	Remove print statement Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 5m56s Details	2025-06-18 13:24:59 +02:00
Daniel Holle	313cd20f36	Fix #364 Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Has been cancelled Details	2025-06-18 13:24:06 +02:00
i21023	567fcc3b9a	rename issues to bug Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 5m52s Details	2025-06-18 12:59:00 +02:00
i21023	d9936e7197	add issue 364 Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Has been cancelled Details	2025-06-18 12:55:50 +02:00
i21023	8f194b3102	add issue 363 Some checks failed Build and Test with Maven / Build-and-test-with-Maven (push) Has been cancelled Details	2025-06-18 12:48:55 +02:00
Daniel Holle	1391206dfe	Merge branch 'master' of ssh://gitea.hb.dhbw-stuttgart.de:2222/JavaTX/JavaCompilerCore All checks were successful Build and Test with Maven / Build-and-test-with-Maven (push) Successful in 6m10s Details	2025-05-15 15:31:17 +02:00
Daniel Holle	659bf6b500	Fix warnings in test by using correct order of arguments	2025-05-15 15:31:05 +02:00