Merge remote-tracking branch 'origin/Endabgabe' into Endabgabe

# Conflicts:
#	src/test/java/semantic/EndToTypedAstTest.java
#	src/test/resources/input/typedAstFeatureTests/CorrectTest.java

.lib/Kurzdokumentation.md

@@ -0,0 +1,58 @@
+# Kurzdokumentation
+
+## Aufgabenverteilung
+
+### Maximilian Stahl und Jannik Rombach:
+- **Scanner**
+- **Parser**
+- **AST**
+- **AstBuilder**
+    - **Modul: ast**
+        - Alle
+    - **Modul: parser**
+        - Alle
+    - **Modul: visitor**
+        - Alle
+    - **Testmodul: parser**
+        - AstBuildertest.java
+        - Helper.java
+    - **Testfiles: singleFeatureTests**
+        - Alle
+
+### Johannes Ehlert:
+- **Semantische Analyse**
+    - **Modul: semantic**
+    - **Modul: typecheck**
+    - **Testmodul: parser**
+        - AstBuildertest.java
+    - **Testfiles: typedAstFeatureTests**
+        - Großteil
+    - **Testfiles: typedAstExceptionsTests**
+        - Großteil
+
+### David Große:
+- **Bytecodegenerator**
+    - **Modul: bytecode**
+        - Alle
+
+### Lucas Janker:
+- **Tests**
+    - **Modul: main**
+        - Alle
+    - **Testmodul: main**
+        - Alle
+    - **Testmodul: parser**
+        - ScannerTest.java
+        - ParserTest.java
+    - **Testmodul: semantic**
+    - **Testfiles: combinedFeatureTests**
+        - Alle
+    - **Testfiles: failureTests**
+        - Alle
+    - **Testfiles: Alle**
+        - Refactoring
+    - **Ordnerstrukturen**
+        - Großteil
+    - **Build**
+    - **Makefile**
+    - **Dokumentation**

pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.3</version> <!-- Change the version as needed -->
+            <version>5.11.0-M2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -44,6 +44,12 @@
             <version>3.26.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.11.0-M2</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

src/main/java/ast/members/MainMethodNode.java

@@ -5,7 +5,6 @@ import bytecode.visitor.MethodVisitor;
 import visitor.Visitable;
 
 public class MainMethodNode extends MethodNode implements Visitable {
-    public BlockNode block;
 
     public MainMethodNode(BlockNode block) {
         this.block = block;

src/main/java/ast/statement/BlockStatementNode.java

@@ -1,11 +0,0 @@
-package ast.statement;
-
-import ast.statements.IStatementNode;
-
-import java.util.List;
-
-public class BlockStatementNode {
-    List<IStatementNode> statements;
-
-    public BlockStatementNode(List<IStatementNode> statements) {this.statements = statements;}
-}

src/main/java/ast/statementexpressions/methodcallstatementnexpressions/MethodCallNode.java

@@ -2,6 +2,7 @@ package ast.statementexpressions.methodcallstatementnexpressions;
 
 import ast.expressions.IExpressionNode;
 import ast.statements.IStatementNode;
+import ast.type.type.ITypeNode;
 import bytecode.visitor.MethodVisitor;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
@@ -11,6 +12,7 @@ import java.util.List;
 
 public class MethodCallNode implements IStatementNode {
     public TargetNode target;
+    public ITypeNode type;
     public List<ChainedMethodNode> chainedMethods = new ArrayList<>();
     public String identifier;
     public List<IExpressionNode> parameters = new ArrayList<>();

src/main/java/ast/statements/WhileNode.java

@@ -13,6 +13,11 @@ public class WhileNode implements IStatementNode {
         this.block = block;
     }
 
+    public void test() {
+        return;
+
+    }
+
     @Override
     public TypeCheckResult accept(SemanticVisitor visitor) {
         return visitor.analyze(this);

src/main/java/main/Main.java

@@ -13,6 +13,7 @@ import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.io.IOException;
 import java.nio.file.Paths;
+import java.util.Optional;
 
 
 /**
@@ -20,9 +21,9 @@ import java.nio.file.Paths;
  * <p> <code> cd .\src\test\ </code>
  * <p> <code> make clean compile-raupenpiler </code>
  * <p> Start Raupenpiler using jar:
- * <p> <code> java.exe -jar path_to_jar\JavaCompiler-1.0-jar-with-dependencies.jar 'path_to_input_file.java' 'path_to_output_directory' </code>
+ * <p> <code> java.exe -DgenJar=true_OR_false -DgenClass=true_OR_false -jar path_to_jar\JavaCompiler-1.0-jar-with-dependencies.jar 'path_to_input_file.java' 'path_to_output_directory' </code>
  * <p> Example (jar needs to be in the target directory, compile with make or mvn package first):
- * <code> java.exe -jar .\target\JavaCompiler-1.0-jar-with-dependencies.jar 'src/main/resources/input/CompilerInput.java' 'src/main/resources/output' </code>
+ * <code> java.exe -DgenJar=true -DgenClass=true -jar .\target\JavaCompiler-1.0-jar-with-dependencies.jar 'src/main/resources/input/CompilerInput.java' 'src/main/resources/output' </code>
  */
 public class Main {
     public static void main(String[] args) throws Exception {
@@ -91,16 +92,28 @@ public class Main {
 
         /*------------------------- Semantic Analyzer -> typed AST -------------------------*/
         // Use the SemanticAnalyzer to generate a typed AST
-        //ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree);
+        ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree);
         // Log the typed AST
-        RaupenLogger.logSemanticAnalyzer(abstractSyntaxTree);
+        RaupenLogger.logSemanticAnalyzer(typedAst);
+
+        if(SemanticAnalyzer.errors.isEmpty()){
+            /*------------------------- Bytecode Generator -> Bytecode -------------------------*/
+            // Use the ByteCodeGenerator to generate bytecode from the typed AST and output it to the specified directory
+
+            final boolean genJar = Optional.ofNullable(System.getProperty("genJar")).map(String::toLowerCase).map(Boolean::parseBoolean).orElse(true);
+            final boolean genClass = Optional.ofNullable(System.getProperty("genClass")).map(String::toLowerCase).map(Boolean::parseBoolean).orElse(true);
+
+            ByteCodeGenerator byteCodeGenerator = new ByteCodeGenerator(outputDirectoryPath, genJar, genClass);
+            assert typedAst != null;
+            byteCodeGenerator.visit((ProgramNode) typedAst);
+            // Log the bytecode generation
+            RaupenLogger.logBytecodeGenerator();
+        } else {
+            for(Exception exception : SemanticAnalyzer.errors){
+                exception.printStackTrace();
+            }
+        }
+
 
-        /*------------------------- Bytecode Generator -> Bytecode -------------------------*/
-        // Use the ByteCodeGenerator to generate bytecode from the typed AST and output it to the specified directory
-        ByteCodeGenerator byteCodeGenerator = new ByteCodeGenerator(outputDirectoryPath, true, true);
-        assert abstractSyntaxTree != null;
-        byteCodeGenerator.visit((ProgramNode) abstractSyntaxTree);
-        // Log the bytecode generation
-        RaupenLogger.logBytecodeGenerator();
     }
 }

src/main/java/parser/astBuilder/ASTBuilder.java

@@ -281,8 +281,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitIfElseStatement(SimpleJavaParser.IfElseStatementContext ctx) {
-        IfElseNode ifElseStatementNode =  new IfElseNode((IfNode) visit(ctx.ifStatement()),
+        IfElseNode ifElseStatementNode;
-                (ElseNode) visit(ctx.elseStatement()));
+        if(ctx.elseStatement() != null) {
+            ifElseStatementNode =  new IfElseNode((IfNode) visit(ctx.ifStatement()),
+                    (ElseNode) visit(ctx.elseStatement()));
+        } else {
+            ifElseStatementNode =  new IfElseNode((IfNode) visit(ctx.ifStatement()), null);
+        }
 
         for (SimpleJavaParser.ElseIfStatementContext elseIf : ctx.elseIfStatement()){
             ifElseStatementNode.addElseIfStatement(((IfNode) visit(elseIf)));
@@ -599,6 +604,4 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
             default -> new ReferenceType(identifier);
         };
     }
-
 }
-

src/main/java/parser/generated/SimpleJavaBaseListener.java

@@ -1,4 +1,4 @@
-// Generated from C:/Users/janni/Desktop/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
+// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
 package parser.generated;
 
 import org.antlr.v4.runtime.ParserRuleContext;

src/main/java/parser/generated/SimpleJavaBaseVisitor.java

@@ -1,4 +1,4 @@
-// Generated from C:/Users/janni/Desktop/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
+// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
 package parser.generated;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 

src/main/java/parser/generated/SimpleJavaLexer.java

@@ -1,4 +1,4 @@
-// Generated from C:/Users/janni/Desktop/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
+// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
 package parser.generated;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;

src/main/java/parser/generated/SimpleJavaListener.java

@@ -1,4 +1,4 @@
-// Generated from C:/Users/janni/Desktop/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
+// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
 package parser.generated;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 

src/main/java/parser/generated/SimpleJavaVisitor.java

@@ -1,4 +1,4 @@
-// Generated from C:/Users/janni/Desktop/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
+// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
 package parser.generated;
 import org.antlr.v4.runtime.tree.ParseTreeVisitor;
 

src/main/java/semantic/SemanticAnalyzer.java

@@ -21,6 +21,7 @@ import ast.statementexpressions.AssignableNode;
 import ast.statementexpressions.NewDeclarationNode;
 import ast.statementexpressions.crementexpressions.DecrementNode;
 import ast.statementexpressions.crementexpressions.IncrementNode;
+import ast.statementexpressions.methodcallstatementnexpressions.ChainedMethodNode;
 import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode;
 import ast.statementexpressions.methodcallstatementnexpressions.TargetNode;
 import ast.statements.*;
@@ -29,6 +30,7 @@ import ast.type.EnumAccessModifierNode;
 import ast.type.ValueNode;
 import ast.type.type.*;
 import com.sun.jdi.IntegerType;
+import semantic.context.ClassContext;
 import semantic.context.Context;
 import semantic.exceptions.*;
 import typechecker.TypeCheckResult;
@@ -163,6 +165,11 @@ public class SemanticAnalyzer implements SemanticVisitor {
 
     @Override
     public TypeCheckResult analyze(FieldNode toCheck) {
+        if (toCheck.type instanceof ReferenceType referenceType) {
+            if (!context.containsClass(referenceType.getIdentifier())) {
+                errors.add(new NotDeclaredException(referenceType.getIdentifier() + " not declared"));
+            }
+        }
         if (currentFields.get(toCheck.identifier) != null) {
             errors.add(new AlreadyDeclaredException("Already declared " + toCheck.identifier));
             return new TypeCheckResult(false, null);
@@ -170,6 +177,8 @@ public class SemanticAnalyzer implements SemanticVisitor {
             currentFields.put(toCheck.identifier, toCheck.type);
         }
         return new TypeCheckResult(true, null);
+
+
     }
 
     @Override
@@ -224,7 +233,7 @@ public class SemanticAnalyzer implements SemanticVisitor {
         }
         for (IStatementNode statementNode : blockNode.statements) {
             var result = statementNode.accept(this);
-            if(!(statementNode instanceof IncrementNode) && !(statementNode instanceof DecrementNode)){
+            if (!(statementNode instanceof IncrementNode) && !(statementNode instanceof DecrementNode)) {
                 if (result.getType() != null) {
                     if (blockReturnType == null) {
                         blockReturnType = result.getType();
@@ -249,6 +258,10 @@ public class SemanticAnalyzer implements SemanticVisitor {
         } else {
             if (currentFields.get(toCheck.identifier) != null) {
                 var type = currentFields.get(toCheck.identifier);
+                MemberAccessNode memberAccessNode = new MemberAccessNode(false);
+                memberAccessNode.identifiers.add(currentClass.identifier);
+                memberAccessNode.identifiers.add(toCheck.identifier);
+                toCheck.memberAccess = memberAccessNode;
                 toCheck.setTypeNode(type);
                 return new TypeCheckResult(true, type);
             } else if (currentScope.getLocalVar(toCheck.identifier) != null) {
@@ -275,13 +288,6 @@ public class SemanticAnalyzer implements SemanticVisitor {
         currentNullType = oldNullType;
         var valid = true;
 
-        // This check currently handles things like :
-        /**
-         * private int i;
-         * void foo(int i){
-         * i = i;
-         * }
-         */
         if (assignable.equals(rExpression)) {
             errors.add(new TypeMismatchException("Cannot assign to self"));
             valid = false;
@@ -318,33 +324,72 @@ public class SemanticAnalyzer implements SemanticVisitor {
     @Override
     public TypeCheckResult analyze(MethodCallNode toCheck) {
 
-        if (toCheck.target.identifier != null) {
+        if (toCheck.target != null) {
-            var targetType = currentScope.getLocalVar(toCheck.target.identifier);
+            if(toCheck.target.memberAccess == null){
-            if (targetType == null) {
+                MemberAccessNode memberAccessNode = new MemberAccessNode(false);
-                targetType = currentFields.get(toCheck.target.identifier);
+                memberAccessNode.identifiers.add(currentClass.identifier);
+                memberAccessNode.identifiers.add(toCheck.target.identifier);
+                toCheck.target.memberAccess = memberAccessNode;
             }
-            if (targetType instanceof ReferenceType reference) {
+            if (toCheck.target.identifier != null) {
-                var type = getTypeFromMethod(toCheck, reference);
+                var targetType = currentScope.getLocalVar(toCheck.target.identifier);
-                if (type != null) {
+                if (targetType == null) {
-                    return new TypeCheckResult(true, type);
+                    targetType = currentFields.get(toCheck.target.identifier);
-                } else {
-                    return new TypeCheckResult(false, null);
                 }
+                if (targetType instanceof ReferenceType reference) {
+                    if (!toCheck.chainedMethods.isEmpty()) {
+                        for (ChainedMethodNode chainedMethod : toCheck.chainedMethods) {
+                            var type = getTypeFromMethod(chainedMethod, reference);
+                            if (type instanceof ReferenceType referenceType)
+                                reference = referenceType;
+                            else
+                                errors.add(new TypeMismatchException("Ein Basetyp hat keine funktionen"));
+                        }
+                    }
+                    var type = getTypeFromMethod(toCheck, reference);
+                    if (type != null) {
+                        return new TypeCheckResult(true, type);
+                    } else {
+                        return new TypeCheckResult(false, null);
+                    }
 
-            }
-        } else {
-            if (toCheck.target.thisTar) {
-                var type = getTypeFromMethod(toCheck, new ReferenceType(currentClass.identifier));
-                if (type != null) {
-                    return new TypeCheckResult(true, type);
                 }
             } else {
-                var result = toCheck.target.accept(this);
+                if (toCheck.target.thisTar != null) {
-                if (result.getType() instanceof ReferenceType reference) {
+                    if (toCheck.target.thisTar) {
-                    return new TypeCheckResult(true, getTypeFromMethod(toCheck, reference));
+                        var type = getTypeFromMethod(toCheck, new ReferenceType(currentClass.identifier));
+                        if (type != null) {
+                            return new TypeCheckResult(true, type);
+                        }
+                    }
+                } else {
+                    var result = toCheck.target.accept(this);
+                    if (result.getType() instanceof ReferenceType reference) {
+                        return new TypeCheckResult(true, getTypeFromMethod(toCheck, reference));
+                    }
                 }
             }
+        } else {
+
+            ReferenceType reference = new ReferenceType(currentClass.identifier);
+            if (!toCheck.chainedMethods.isEmpty()) {
+                for (ChainedMethodNode chainedMethod : toCheck.chainedMethods) {
+                    var type = getTypeFromMethod(chainedMethod, reference);
+                    if (type instanceof ReferenceType referenceType)
+                        reference = referenceType;
+                    else
+                        errors.add(new TypeMismatchException("Ein Basetyp hat keine funktionen"));
+                }
+            }
+            var type = getTypeFromMethod(toCheck, reference);
+            if (type != null) {
+                return new TypeCheckResult(true, type);
+            } else {
+                return new TypeCheckResult(false, null);
+            }
+
         }
+
         return new TypeCheckResult(false, null);
     }
 
@@ -383,9 +428,9 @@ public class SemanticAnalyzer implements SemanticVisitor {
 
         if (context.containsClass(toCheck.identifier)) {
             return new TypeCheckResult(true, new ReferenceType(toCheck.identifier));
+        } else {
+            throw new RuntimeException("Cannot find class " + toCheck.identifier);
         }
-
-        return null;
     }
 
     @Override
@@ -495,6 +540,10 @@ public class SemanticAnalyzer implements SemanticVisitor {
             if (currentScope.contains(unary.identifier)) {
                 return new TypeCheckResult(valid, currentScope.getLocalVar(unary.identifier));
             } else if (currentFields.get(unary.identifier) != null) {
+                MemberAccessNode memberAccessNode = new MemberAccessNode(false);
+                memberAccessNode.identifiers.add(currentClass.identifier);
+                memberAccessNode.identifiers.add(unary.identifier);
+                unary.memberAccess = memberAccessNode;
                 return new TypeCheckResult(valid, currentFields.get(unary.identifier));
             } else if (unary.statement != null) {
                 var result = unary.statement.accept(this);
@@ -524,8 +573,16 @@ public class SemanticAnalyzer implements SemanticVisitor {
     public TypeCheckResult analyze(MemberAccessNode memberAccessNode) {
 
         ITypeNode currentType = null;
+        int start = 0;
+        if(!memberAccessNode.identifiers.isEmpty()){
+            if(currentFields.get(memberAccessNode.identifiers.get(0)) != null){
+                memberAccessNode.identifiers.add(0, currentClass.identifier);
+                start = 1;
+            }
+        }
+        for (int i = start; i < memberAccessNode.identifiers.size(); i++) {
 
-        for (String s : memberAccessNode.identifiers) {
+            String s = memberAccessNode.identifiers.get(i);
             if (currentType == null) {
                 if (currentScope.getLocalVar(s) != null) {
                     currentType = currentScope.getLocalVar(s);
@@ -561,6 +618,11 @@ public class SemanticAnalyzer implements SemanticVisitor {
 
         if (targetNode.memberAccess != null) {
             return targetNode.memberAccess.accept(this);
+        } else if(targetNode.identifier != null) {
+            MemberAccessNode memberAccessNode = new MemberAccessNode(false);
+            memberAccessNode.identifiers.add(currentClass.identifier);
+            memberAccessNode.identifiers.add(targetNode.identifier);
+            targetNode.memberAccess = memberAccessNode;
         }
         return null;
     }
@@ -620,4 +682,37 @@ public class SemanticAnalyzer implements SemanticVisitor {
         return null;
     }
 
+    private ITypeNode getTypeFromMethod(ChainedMethodNode toCheck, ReferenceType reference) {
+        var classContext = context.getClass(reference.getIdentifier());
+
+        var methods = classContext.getMethods();
+        for (var method : methods) {
+            if (toCheck.identifier.equals(method.getIdentifier())) {
+                if (method.getParameters().size() == toCheck.expressions.size() && !(method instanceof ConstructorNode)) {
+                    boolean same = true;
+                    for (int i = 0; i < method.getParameters().size(); i++) {
+                        var result1 = method.getParameters().get(i).accept(this);
+                        var result2 = toCheck.expressions.get(i).accept(this);
+                        if (!Objects.equals(result1.getType(), result2.getType())) {
+                            same = false;
+                        }
+                    }
+                    if (same) {
+                        if (method.accesModifier.accessType == EnumAccessModifierNode.PUBLIC) {
+                            if (method.getType() == null) {
+                                return new BaseType(TypeEnum.VOID);
+                            }
+                            return method.getType();
+                        } else {
+                            errors.add(new NotVisibleException("This Method is not Visible"));
+                        }
+
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
 }

src/main/java/semantic/context/Context.java

@@ -21,6 +21,10 @@ public class Context {
     return classes.get(identifier);
   }
 
+  public HashMap<String, ClassContext> getClasses() {
+    return classes;
+  }
+
   public boolean containsClass(String identifier) {
     return classes.containsKey(identifier);
   }

src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: main.Main
+

src/main/resources/input/CompilerInput.java

@@ -2,15 +2,13 @@ public class Compiler {
     public int add(int i, int j) {
         return i+j;
     }
-    public static void main(String[] args) {
-        int a = 1;
-    }
 }
 
 public class Node {
     public void main() {
         Compiler compiler = new Compiler();
         int i = compiler.add(5, 8);
+        return i;
     }
 }
 

src/test/Makefile

@@ -9,8 +9,8 @@ compile-javac:
 
 compile-raupenpiler:
 	cd ../.. ; mvn -DskipTests install
-	cd ../.. ; mvn exec:java -Dexec.mainClass="main.Main"  -Dexec.args="'src/main/resources/input/CompilerInput.java' 'src/main/resources/output' "
+	cd ../.. ; mvn exec:java -DgenJar=true -DgenClass=true -Dexec.mainClass="main.Main"  -Dexec.args="'src/main/resources/input/CompilerInput.java' 'src/main/resources/output'"
-	# cp ../main/resources/output/CompilerInput.class .java/resources/output/raupenpiler
+	cp ../main/resources/output/CompilerInput.class .java/resources/output/raupenpiler
 
 test: compile-javac compile-raupenpiler test-javac test-raupenpiler
 
@@ -36,8 +36,10 @@ clean:
 	rm -f ./resources/output/raupenpiler/*.class
 	# clean logs
 	rm -f ../main/resources/logs/*.log
-	# clean test/main folders from .class files for End-to-End tests
+	# clean test/java/main folders from .class files for End-to-End tests
 	rm -f ./java/main/*.class
-	# clean javac output from featureTests
+	# clean javac output from combinedFeatureTests
-	rm -f ./resources/input/featureTests/*.class
+	rm -f ./resources/input/combinedFeatureTests/*.class
+	rm -f ./resources/input/singleFeatureTests/*.class
+	rm -f ./resources/input/typedAstFeatureTests/*.class
 

src/test/java/main/E2EReflectionsTest.java

@@ -1,177 +1,95 @@
 package main;
 
-import ast.ASTNode;
+import java.lang.reflect.Constructor;
-import ast.ProgramNode;
+import java.lang.reflect.Field;
-import bytecode.ByteCodeGenerator;
+import java.lang.reflect.Method;
-import org.junit.jupiter.api.BeforeEach;
+import java.util.Arrays;
+
 import org.junit.jupiter.api.Test;
-import org.antlr.v4.runtime.CharStream;
+
-import org.antlr.v4.runtime.CommonTokenStream;
+import javax.tools.JavaCompiler;
-import org.antlr.v4.runtime.tree.ParseTree;
+import javax.tools.ToolProvider;
-import parser.astBuilder.ASTBuilder;
-import parser.generated.SimpleJavaLexer;
-import parser.generated.SimpleJavaParser;
-import semantic.SemanticAnalyzer;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
 
 public class E2EReflectionsTest {
-
-
-    private CharStream mockInputCharStream;
-    private String outputDirectoryPath;
-    private SimpleJavaLexer mockLexer;
-    private CommonTokenStream mockTokenStream;
-    private SimpleJavaParser mockParser;
-    private ParseTree mockParseTree;
-    private ASTBuilder mockASTBuilder;
-    private ASTNode mockASTNode;
-    private SemanticAnalyzer mockSemanticAnalyzer;
-    private ASTNode mockTypedAST;
-    private ByteCodeGenerator mockByteCodeGenerator;
-
-    @BeforeEach
-    public void setUp() {
-        mockInputCharStream = mock(CharStream.class);
-        outputDirectoryPath = "path/to/output";
-        mockLexer = mock(SimpleJavaLexer.class);
-        mockTokenStream = mock(CommonTokenStream.class);
-        mockParser = mock(SimpleJavaParser.class);
-        mockParseTree = mock(ParseTree.class);
-        mockASTBuilder = mock(ASTBuilder.class);
-        mockASTNode = mock(ASTNode.class);
-        mockSemanticAnalyzer = mock(SemanticAnalyzer.class);
-        mockTypedAST = mock(ASTNode.class);
-        mockByteCodeGenerator = mock(ByteCodeGenerator.class);
-    }
-
     @Test
-    public void testCompileFile() throws Exception {
+    public void AllFeaturesClassExampleTest(){
-        // Mock the dependencies
+        try {
-        SimpleJavaLexer mockLexer = mock(SimpleJavaLexer.class);
+            Main.main(new String[]{"src/test/resources/input/combinedFeatureTests/AllFeaturesClassExample.java", "src/test/resources/output/raupenpiler"});
-        CommonTokenStream mockTokenStream = mock(CommonTokenStream.class);
+            // Get the system Java compiler
-        SimpleJavaParser mockParser = mock(SimpleJavaParser.class);
+            JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
-        ParseTree mockParseTree = mock(ParseTree.class);
+            // Assert that the compiler is available
-        ASTBuilder mockASTBuilder = mock(ASTBuilder.class);
+            assertNotNull(javac, "Java Compiler is not available");
-        ASTNode mockASTNode = mock(ASTNode.class);
+            javac.run(null, null, null, "src/test/resources/input/combinedFeatureTests/AllFeaturesClassExample.java");
-        SemanticAnalyzer mockSemanticAnalyzer = mock(SemanticAnalyzer.class);
-        ASTNode mockTypedAST = mock(ASTNode.class);
-        ByteCodeGenerator mockByteCodeGenerator = mock(ByteCodeGenerator.class);
 
-        // Mock the behavior
+            Class<?> clazz = Class.forName("src.resources.input.combinedFeatureTests.AllFeaturesClassExample");
-        when(mockLexer.nextToken()).thenReturn(null);
+            ClassLoader classLoader = getClass().getClassLoader();
-        when(mockTokenStream.getTokens()).thenReturn(new ArrayList<>());
+           // Class<?> clazz = classLoader.loadClass("main.AllFeaturesClassExample");
-        when(mockParser.program()).thenReturn((SimpleJavaParser.ProgramContext) mockParseTree);
-        when(mockASTBuilder.visit(mockParseTree)).thenReturn(mockASTNode);
-        when(SemanticAnalyzer.generateTast(mockASTNode)).thenReturn(mockTypedAST);
 
-        // Use reflection to invoke the compileFile method
+            // Class Name
-        Method compileFileMethod = main.Main.class.getDeclaredMethod("compileFile", CharStream.class, String.class);
+            assertEquals("main.AllFeaturesClassExample", clazz.getName());
-        compileFileMethod.setAccessible(true);
 
-        compileFileMethod.invoke(null, mockInputCharStream, outputDirectoryPath);
+            // Constructors
+            Constructor<?>[] actualConstructors = clazz.getDeclaredConstructors();
+            assertTrue(actualConstructors.length > 0, "No constructors found");
 
-        // Verify each step
+            Constructor<?> expectedConstructor = clazz.getConstructor(int.class, boolean.class, char.class);
-        verify(mockLexer, times(1)).nextToken();
-        verify(mockTokenStream, times(1)).getTokens();
-        verify(mockParser, times(1)).program();
-        verify(mockASTBuilder, times(1)).visit(mockParseTree);
-        verify(mockSemanticAnalyzer, times(1)).generateTast(mockASTNode);
-        verify(mockByteCodeGenerator, times(1)).visit((ProgramNode) mockTypedAST);
-    }
 
-    @Test
+            boolean constructorFound = false;
-    public void testCompileFile2() throws Exception {
+            for (Constructor<?> constructor : actualConstructors) {
-        // Mock the behavior
+                if (constructor.equals(expectedConstructor)) {
-        when(mockLexer.nextToken()).thenReturn(null);
+                    constructorFound = true;
-        when(mockTokenStream.getTokens()).thenReturn(new ArrayList<>());
+                    break;
-        when(mockParser.program()).thenReturn((SimpleJavaParser.ProgramContext) mockParseTree);
+                }
-        when(mockASTBuilder.visit(mockParseTree)).thenReturn(mockASTNode);
+            }
-        when(SemanticAnalyzer.generateTast(mockASTNode)).thenReturn(mockTypedAST);
+            assertTrue(constructorFound, "Expected constructor not found in actual constructors");
 
-        // Use reflection to invoke the compileFile method
+            // Methods
-        Method compileFileMethod = main.Main.class.getDeclaredMethod("compileFile", CharStream.class, String.class);
+            Method[] actualMethodNames = clazz.getDeclaredMethods();
-        compileFileMethod.setAccessible(true);
+            assertTrue(actualMethodNames.length > 0);
+            for (Method method : actualMethodNames) {
+                System.out.println("Method: " + method.getName());
+            }
 
-        compileFileMethod.invoke(null, mockInputCharStream, outputDirectoryPath);
+            // Method Names
+            String[] expectedMethodNames = {
+                "controlStructures",
+                "logicalOperations",
+                "add",
+                "subtract",
+                "multiply",
+                "divide",
+                "modulo",
+                "main"
+            };
 
-        // Verify each step
+            for (Method method : actualMethodNames) {
-        verify(mockLexer, times(1)).nextToken();
+                assertTrue(Arrays.asList(expectedMethodNames).contains(method.getName()));
-        verify(mockTokenStream, times(1)).getTokens();
+            }
-        verify(mockParser, times(1)).program();
+
-        verify(mockASTBuilder, times(1)).visit(mockParseTree);
+            // Fields
-        verify(mockSemanticAnalyzer, times(1)).generateTast(mockASTNode);
+            Field[] actualFields = clazz.getDeclaredFields();
-        verify(mockByteCodeGenerator, times(1)).visit((ProgramNode) mockTypedAST);
+            assertTrue(actualFields.length > 0, "No fields found");
-    }
+
+            Field expectedField = clazz.getDeclaredField("c");
+            assertEquals(expectedField.getType(), char.class);
+
+            boolean fieldFound = false;
+            for (Field field : actualFields) {
+                if (field.equals(expectedField)) {
+                    fieldFound = true;
+                    break;
+                }
+            }
+            assertTrue(fieldFound, "Expected field not found in actual fields");
 
 
 
-
+        } catch (ClassNotFoundException | NoSuchFieldException | NoSuchMethodException e) {
-
+            e.printStackTrace();
-
+        } catch (Exception e) {
-    @Test
+            throw new RuntimeException(e);
-    public void testLexer() {
+        }
-        // Mock the behavior
-        when(mockLexer.nextToken()).thenReturn(null);
-
-        // Test the lexer
-        SimpleJavaLexer lexer = new SimpleJavaLexer(mockInputCharStream);
-        CommonTokenStream tokenStream = new CommonTokenStream(lexer);
-        tokenStream.fill();
-
-        assertNotNull(tokenStream.getTokens());
-        verify(mockLexer, atLeastOnce()).nextToken();
-    }
-
-    @Test
-    public void testParser() {
-        // Mock the behavior
-        when(mockParser.program()).thenReturn((SimpleJavaParser.ProgramContext) mockParseTree);
-
-        // Test the parser
-        SimpleJavaParser parser = new SimpleJavaParser(mockTokenStream);
-        ParseTree parseTree = parser.program();
-
-        assertNotNull(parseTree);
-        verify(mockParser, times(1)).program();
-    }
-
-    @Test
-    public void testASTBuilder() {
-        // Mock the behavior
-        when(mockASTBuilder.visit(mockParseTree)).thenReturn(mockASTNode);
-
-        // Test the AST builder
-        ASTBuilder astBuilder = new ASTBuilder();
-        ASTNode abstractSyntaxTree = astBuilder.visit(mockParseTree);
-
-        assertNotNull(abstractSyntaxTree);
-        verify(mockASTBuilder, times(1)).visit(mockParseTree);
-    }
-
-    @Test
-    public void testSemanticAnalyzer() {
-        // Mock the behavior
-        when(SemanticAnalyzer.generateTast(mockASTNode)).thenReturn(mockTypedAST);
-
-        // Test the semantic analyzer
-        ASTNode typedAst = SemanticAnalyzer.generateTast(mockASTNode);
-
-        assertNotNull(typedAst);
-        verify(mockSemanticAnalyzer, times(1)).generateTast(mockASTNode);
-    }
-
-    @Test
-    public void testByteCodeGenerator() {
-        // Test the bytecode generator
-        ByteCodeGenerator byteCodeGenerator = new ByteCodeGenerator(outputDirectoryPath, true, true);
-        byteCodeGenerator.visit((ProgramNode) mockTypedAST);
-
-        verify(mockByteCodeGenerator, times(1)).visit((ProgramNode) mockTypedAST);
     }
 }
-

src/test/java/main/FailureTest.java

@@ -1,48 +0,0 @@
-package main;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.junit.jupiter.api.Test;
-
-import javax.tools.JavaCompiler;
-import javax.tools.ToolProvider;
-import java.io.File;
-
-public class FailureTest {
-    /**
-     * This test method checks if invalid Java files fail to compile as expected.
-     * It uses the JavaCompiler from the ToolProvider to compile the files.
-     * The test passes if all the files fail to compile.
-     */
-    @Test
-    public void areTestFilesActuallyFailTest() {
-        // Get the system Java compiler
-        JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
-        // Assert that the compiler is available
-        assertNotNull(javac, "Java Compiler is not available");
-
-        String directoryPath = "src/test/resources/input/failureTests";
-        File folder = new File(directoryPath);
-
-        if (folder.isDirectory()) {
-            File[] files = folder.listFiles((dir, name) -> name.endsWith(".java"));
-
-            if (files != null) {
-                for (File file : files) {
-                    // Try to compile the file and get the result
-                    // The run method returns 0 if the compilation was successful, and non-zero otherwise
-                    int result = javac.run(null, null, null, file.getPath());
-
-                    // Assert that the compilation failed (i.e., the result is non-zero)
-                    assertTrue(result != 0, "Expected compilation failure for " + file.getName());
-                }
-            } else {
-                System.out.println("No files found in the directory.");
-            }
-        } else {
-            System.out.println("The provided path is not a directory.");
-        }
-    }
-}
-

src/test/java/main/FeatureTest.java

@@ -1,46 +0,0 @@
-package main;
-
-import org.junit.jupiter.api.Test;
-
-import javax.tools.JavaCompiler;
-import javax.tools.ToolProvider;
-import java.io.File;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class FeatureTest {
-    /**
-     * This test method checks if valid Java files compile successfully.
-     * It uses the JavaCompiler from the ToolProvider to compile the files.
-     * The test passes if all the files compile without errors.
-     */
-    @Test
-    public void areTestFilesActuallyValid() {
-        // Get the system Java compiler
-        JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
-        // Assert that the compiler is available
-        assertNotNull(javac, "Java Compiler is not available");
-
-        String directoryPath = "src/test/resources/input/featureTests";
-        File folder = new File(directoryPath);
-
-        if (folder.isDirectory()) {
-            File[] files = folder.listFiles((dir, name) -> name.endsWith(".java"));
-
-            if (files != null) {
-                for (File file : files) {
-                    // Try to compile the file and get the result
-                    // The run method returns 0 if the compilation was successful, and non-zero otherwise
-                    int result = javac.run(null, null, null, file.getPath());
-
-                    // Assert that the compilation succeeded (i.e., the result is zero)
-                    assertEquals(0, result, "Expected compilation success for " + file.getName());
-                }
-            } else {
-                System.out.println("No files found in the directory.");
-            }
-        } else {
-            System.out.println("The provided path is not a directory.");
-        }
-    }
-}

src/test/java/main/InputFilesTest.java

@@ -0,0 +1,104 @@
+package main;
+
+import org.junit.jupiter.api.Test;
+
+import javax.tools.JavaCompiler;
+import javax.tools.ToolProvider;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class InputFilesTest {
+
+    /**
+     * This test method checks if valid Java files compile successfully.
+     * It uses the JavaCompiler from the ToolProvider to compile the files.
+     * The test passes if all the files compile without errors.
+     */
+    @Test
+    public void areTestFilesActuallyValid() throws IOException {
+        // Get the system Java compiler
+        JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
+        // Assert that the compiler is available
+        assertNotNull(javac, "Java Compiler is not available");
+
+        File folder1 = new File("src/test/resources/input/combinedFeatureTests");
+        File folder2 = new File("src/test/resources/input/singleFeatureTests");
+        File folder3 = new File("src/test/resources/input/typedAstFeatureTests");
+
+        List<File> files = getJavaFilesFromDirectory(folder1);
+        files.addAll(getJavaFilesFromDirectory(folder2));
+        files.addAll(getJavaFilesFromDirectory(folder3));
+
+        if (!files.isEmpty()) {
+            for (File file : files) {
+                // Try to compile the file and get the result
+                int result = javac.run(null, null, null, file.getPath());
+
+                // Assert that the compilation succeeded (i.e., the result is zero)
+                assertEquals(0, result, "Expected compilation success for " + file.getName());
+            }
+        } else {
+            System.out.println("No files found in the directories.");
+        }
+    }
+
+
+    /**
+     * This test method checks if invalid Java files fail to compile as expected.
+     * It uses the JavaCompiler from the ToolProvider to compile the files.
+     * The test passes if all the files fail to compile.
+     */
+    @Test
+    public void areTestFilesActuallyFails() throws IOException {
+        // Get the system Java compiler
+        JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
+        // Assert that the compiler is available
+        assertNotNull(javac, "Java Compiler is not available");
+
+
+        File folder1 = new File("src/test/resources/input/failureTests");
+        File folder2 = new File("src/test/resources/input/typedAstExceptionsTest");
+
+        List<File> files = getJavaFilesFromDirectory(folder1);
+        files.addAll(getJavaFilesFromDirectory(folder2));
+
+
+        if (!files.isEmpty()) {
+            for (File file : files) {
+                // Try to compile the file and get the result
+                // The run method returns 0 if the compilation was successful, and non-zero otherwise
+                int result = javac.run(null, null, null, file.getPath());
+
+                // Assert that the compilation failed (i.e., the result is non-zero)
+                assertTrue(result != 0, "Expected compilation failure for " + file.getName());
+            }
+        } else {
+            System.out.println("No files found in the directory.");
+        }
+
+    }
+
+    /**
+     * Helper method to get all .java files from a directory.
+     *
+     * @param directory the directory to search for .java files
+     * @return a list of .java files
+     * @throws IOException if an I/O error occurs
+     */
+    private List<File> getJavaFilesFromDirectory(File directory) throws IOException {
+        if (directory.isDirectory()) {
+            return Files.list(directory.toPath())
+                    .filter(path -> path.toString().endsWith(".java"))
+                    .map(java.nio.file.Path::toFile)
+                    .collect(Collectors.toList());
+        } else {
+            System.out.println("The provided path is not a directory: " + directory.getPath());
+            return List.of();
+        }
+    }
+}

src/test/java/main/ReflectionsTest.java

@@ -0,0 +1,145 @@
+package main;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+
+import org.antlr.v4.runtime.CharStream;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+
+public class ReflectionsTest {
+
+    @Test
+    public void testSimpleJavaLexerClass() throws ClassNotFoundException, NoSuchMethodException {
+        Class<?> clazz = Class.forName("parser.generated.SimpleJavaLexer");
+
+        // Class Name
+        assertEquals("parser.generated.SimpleJavaLexer", clazz.getName());
+
+        // Constructors
+        Constructor<?>[] actualConstructors = clazz.getDeclaredConstructors();
+        assertTrue(actualConstructors.length > 0, "No constructors found");
+
+        Constructor<?> expectedConstructor = clazz.getConstructor(CharStream.class);
+
+        boolean constructorFound = false;
+        for (Constructor<?> constructor : actualConstructors) {
+            if (constructor.equals(expectedConstructor)) {
+                constructorFound = true;
+                break;
+            }
+        }
+        assertTrue(constructorFound, "Expected constructor not found in actual constructors");
+
+
+
+        // Methods
+        Method[] actualMethodNames = clazz.getDeclaredMethods();
+        assertTrue(actualMethodNames.length > 0);
+        Arrays.stream(actualMethodNames).forEach(method -> System.out.println("Method: " + method.getName()));
+
+        List<String> expectedMethodNames = Arrays.asList(
+                "getTokenNames",
+                "getVocabulary",
+                "getGrammarFileName",
+                "getRuleNames",
+                "getSerializedATN",
+                "getChannelNames",
+                "getModeNames",
+                "getATN",
+                "makeRuleNames",
+                "makeLiteralNames",
+                "makeSymbolicNames"
+        );
+
+        for (Method method : actualMethodNames) {
+            assertTrue(expectedMethodNames.contains(method.getName()));
+        }
+
+        for (String expectedMethodName : expectedMethodNames) {
+            boolean methodFound = false;
+            for (Method method : actualMethodNames) {
+                if (method.getName().equals(expectedMethodName)) {
+                    methodFound = true;
+                    break;
+                }
+            }
+            assertTrue(methodFound, "Expected method " + expectedMethodName + " not found in actual methods");
+        }
+
+
+        // Fields
+        Field[] actualFieldNames = clazz.getDeclaredFields();
+        assertTrue(actualFieldNames.length > 0);
+        Arrays.stream(actualFieldNames).forEach(field -> System.out.println("Field: " + field.getName()));
+
+        List<String> expectedFieldNames = Arrays.asList(
+                "_decisionToDFA",
+                "_sharedContextCache",
+                "channelNames",
+                "modeNames",
+                "ruleNames",
+                "_LITERAL_NAMES",
+                "_SYMBOLIC_NAMES",
+                "VOCABULARY",
+                "tokenNames",
+                "_serializedATN",
+                "_ATN"
+        );
+
+        for (Field field : actualFieldNames) {
+            assertTrue(expectedFieldNames.contains(field.getName()));
+        }
+    }
+
+    @Test
+    public void testSimpleJavaParserClass() throws ClassNotFoundException {
+        Class<?> clazz = Class.forName("parser.generated.SimpleJavaParser");
+
+        // Class Name
+        assertEquals("parser.generated.SimpleJavaParser", clazz.getName());
+
+        // Constructors
+        Constructor<?>[] constructors = clazz.getDeclaredConstructors();
+        assertTrue(constructors.length > 0);
+
+        // Methods
+        Method[] methods = clazz.getDeclaredMethods();
+        assertTrue(methods.length > 0);
+        Arrays.stream(methods).forEach(method -> System.out.println("Method: " + method.getName()));
+
+        // Fields
+        Field[] fields = clazz.getDeclaredFields();
+        assertTrue(fields.length > 0);
+        Arrays.stream(fields).forEach(field -> System.out.println("Field: " + field.getName()));
+    }
+
+    @Test
+    public void testASTBuilderClass() throws ClassNotFoundException {
+        Class<?> clazz = Class.forName("parser.astBuilder.ASTBuilder");
+
+        // Class Name
+        assertEquals("parser.astBuilder.ASTBuilder", clazz.getName());
+
+        // Constructors
+        Constructor<?>[] constructors = clazz.getDeclaredConstructors();
+        assertTrue(constructors.length > 0);
+
+        // Methods
+        Method[] methods = clazz.getDeclaredMethods();
+        assertTrue(methods.length > 0);
+        Arrays.stream(methods).forEach(method -> System.out.println("Method: " + method.getName()));
+
+        // Fields
+        Field[] fields = clazz.getDeclaredFields();
+        assertTrue(fields.length > 0);
+        Arrays.stream(fields).forEach(field -> System.out.println("Field: " + field.getName()));
+    }
+
+    // Similarly, you can add tests for SemanticAnalyzer and ByteCodeGenerator
+}

src/test/java/parser/AstBuilderTest.java

@@ -14,23 +14,19 @@ import ast.members.*;
 import ast.parameters.ParameterNode;
 import ast.statementexpressions.AssignNode;
 import ast.statementexpressions.AssignableNode;
+import ast.statementexpressions.NewDeclarationNode;
 import ast.statementexpressions.crementexpressions.CrementType;
 import ast.statementexpressions.crementexpressions.DecrementNode;
 import ast.statementexpressions.crementexpressions.IncrementNode;
-import ast.statementexpressions.NewDeclarationNode;
 import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode;
-import ast.statements.*;
 import ast.statementexpressions.methodcallstatementnexpressions.TargetNode;
-import ast.statements.BlockNode;
+import ast.statements.*;
-import ast.statements.LocalVariableDeclarationNode;
-import ast.statements.ReturnNode;
 import ast.type.AccessModifierNode;
 import ast.type.EnumValueNode;
 import ast.type.ValueNode;
 import ast.type.type.BaseType;
 import ast.type.type.ReferenceType;
 import ast.type.type.TypeEnum;
-
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -39,104 +35,106 @@ import static org.assertj.core.api.Assertions.assertThat;
 @DisplayName("Untyped Abstract Syntax Tree")
 class AstBuilderTest {
 
+    private final static String directoryPath = "src/test/resources/input/singleFeatureTests/";
+
     @Test
     @DisplayName("Empty Class Test")
-    public void emptyClassTest(){
+    public void emptyClassTest() {
-        ClassNode emptyClass = Helper.generateEmptyClass("TestClass");
+        ClassNode emptyClass = Helper.generateEmptyClass("EmptyClass");
         ProgramNode expected = new ProgramNode();
         expected.addClass(emptyClass);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/EmptyClass.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "EmptyClass.java");
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
     @DisplayName("Multiple Empty Classes Test")
     public void multipleEmptyClassesTest() {
-        ClassNode class1 = Helper.generateEmptyClass("TestClass1");
+        ClassNode class1 = Helper.generateEmptyClass("MultipleClasses");
         ClassNode class2 = Helper.generateEmptyClass("TestClass2");
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
         expected.addClass(class2);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/MultipleClasses.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "MultipleClasses.java");
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
     @DisplayName("Empty Class Test with Constructor")
     public void emptyClassWithConstructorTest() {
-        ClassNode class1 = Helper.generateEmptyClass("TestClass");
+        ClassNode class1 = Helper.generateEmptyClass("EmptyClassWithConstructor");
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/EmptyClassWithConstructor.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "EmptyClassWithConstructor.java");
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
     @DisplayName("Field Test")
     public void fieldTest() {
-        ClassNode class1 = Helper.generateEmptyClass("TestClass");
+        ClassNode class1 = Helper.generateEmptyClass("Field");
         class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a"));
 
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/Field.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "Field.java");
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
     @DisplayName("Field Test with Accessmodifier")
     public void fieldTestWithModifier() {
-        ClassNode class1 = Helper.generateEmptyClass("TestClass");
+        ClassNode class1 = Helper.generateEmptyClass("FieldWithAccessModifier");
         class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a"));
 
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/FieldWithAccessModifier.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "FieldWithAccessModifier.java");
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
-    @DisplayName("Commments Ignore Test")
+    @DisplayName("Comments Ignore Test")
-    public void commmentsIgnoreTest(){
+    public void commentsIgnoreTest() {
-        ClassNode class1 = Helper.generateEmptyClass("TestClass");
+        ClassNode class1 = Helper.generateEmptyClass("Comments");
         class1.addMember(new FieldNode(new AccessModifierNode("private"), new BaseType(TypeEnum.INT), "a"));
 
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/Comments.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "Comments.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
-    @DisplayName("Constructor Paramerter Test")
+    @DisplayName("Constructor Parameter Test")
-    public void constructorParameterTest(){
+    public void constructorParameterTest() {
         BlockNode block = new BlockNode();
         block.addStatement(new ReturnNode(null));
-        ConstructorNode constructor = new ConstructorNode("public", "TestClass", block);
+        ConstructorNode constructor = new ConstructorNode("public", "ConstructorParameter", block);
         constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a"));
         constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "b"));
 
-        ClassNode class1 = new ClassNode("public", "TestClass");
+        ClassNode class1 = new ClassNode("public", "ConstructorParameter");
         class1.addMember(constructor);
 
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/ConstructorParameter.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "ConstructorParameter.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
     @DisplayName("This Dot Test")
-    public void thisDotTest(){
+    public void thisDotTest() {
         BlockNode block = new BlockNode();
         MemberAccessNode memberAccess = new MemberAccessNode(true);
         memberAccess.addIdentifier("a");
@@ -148,23 +146,23 @@ class AstBuilderTest {
 
         block.addStatement(new AssignNode(assignable, expression));
         block.addStatement(new ReturnNode(null));
-        ConstructorNode constructor = new ConstructorNode("public", "TestClass", block);
+        ConstructorNode constructor = new ConstructorNode("public", "ThisDot", block);
 
-        ClassNode class1 = new ClassNode("public", "TestClass");
+        ClassNode class1 = new ClassNode("public", "ThisDot");
         class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a"));
         class1.addMember(constructor);
 
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/ThisDot.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "ThisDot.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
     @DisplayName("Constructor This Dot Test")
-    public void constructorThisDotTest(){
+    public void constructorThisDotTest() {
         BlockNode block = new BlockNode();
         MemberAccessNode memberAccess = new MemberAccessNode(true);
         memberAccess.addIdentifier("a");
@@ -175,25 +173,25 @@ class AstBuilderTest {
 
         block.addStatement(new AssignNode(assignable, expression));
         block.addStatement(new ReturnNode(null));
-        ConstructorNode constructor = new ConstructorNode("public", "TestClass", block);
+        ConstructorNode constructor = new ConstructorNode("public", "ConstructorThisDot", block);
         constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a"));
 
-        ClassNode class1 = new ClassNode("public", "TestClass");
+        ClassNode class1 = new ClassNode("public", "ConstructorThisDot");
         class1.addMember(new FieldNode(new AccessModifierNode("private"), new BaseType(TypeEnum.INT), "a"));
         class1.addMember(constructor);
 
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/ConstructorThisDot.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "ConstructorThisDot.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
     @DisplayName("Void Methoden Test")
-    public void voidMethodenTest(){
+    public void voidMethodenTest() {
-        ClassNode class1 = Helper.generateEmptyClass("TestClass");
+        ClassNode class1 = Helper.generateEmptyClass("VoidMethod");
         BlockNode block = new BlockNode();
         block.addStatement(new ReturnNode(null));
         class1.addMember(new MethodNode("public", null, true, "test", block));
@@ -201,14 +199,14 @@ class AstBuilderTest {
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/VoidMethod.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "VoidMethod.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
     @DisplayName("Constructor Method call Test")
-    public void constructorMethodCallTest(){
+    public void constructorMethodCallTest() {
         BlockNode blockCon = new BlockNode();
         MemberAccessNode memberAccess = new MemberAccessNode(true);
         memberAccess.addIdentifier("a");
@@ -219,13 +217,13 @@ class AstBuilderTest {
 
         blockCon.addStatement(new AssignNode(assignable, expression));
         blockCon.addStatement(new ReturnNode(null));
-        ConstructorNode constructor = new ConstructorNode("public", "TestClass", blockCon);
+        ConstructorNode constructor = new ConstructorNode("public", "ConstructorMethodCall", blockCon);
 
         BlockNode blockMethod = new BlockNode();
         blockMethod.addStatement(new ReturnNode(new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "1"))));
         MethodNode method = new MethodNode("public", new BaseType(TypeEnum.INT), false, "testMethod", blockMethod);
 
-        ClassNode class1 = new ClassNode("public", "TestClass");
+        ClassNode class1 = new ClassNode("public", "ConstructorMethodCall");
         class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a"));
         class1.addMember(constructor);
         class1.addMember(method);
@@ -233,14 +231,14 @@ class AstBuilderTest {
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/ConstructorMethodCall.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "ConstructorMethodCall.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
     @DisplayName("Constructor Method call Parameters Test")
-    public void constructorMethodCallParametersTest(){
+    public void constructorMethodCallParametersTest() {
         BlockNode blockCon = new BlockNode();
         MemberAccessNode memberAccess = new MemberAccessNode(true);
         memberAccess.addIdentifier("a");
@@ -253,7 +251,7 @@ class AstBuilderTest {
 
         blockCon.addStatement(new AssignNode(assignable, expression));
         blockCon.addStatement(new ReturnNode(null));
-        ConstructorNode constructor = new ConstructorNode("public", "TestClass", blockCon);
+        ConstructorNode constructor = new ConstructorNode("public", "ConstructorMethodCallParameters", blockCon);
         constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a"));
 
         BlockNode blockMethod = new BlockNode();
@@ -261,7 +259,7 @@ class AstBuilderTest {
         MethodNode method = new MethodNode("public", new BaseType(TypeEnum.INT), false, "testMethod", blockMethod);
         method.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a"));
 
-        ClassNode class1 = new ClassNode("public", "TestClass");
+        ClassNode class1 = new ClassNode("public", "ConstructorMethodCallParameters");
         class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a"));
         class1.addMember(constructor);
         class1.addMember(method);
@@ -269,14 +267,14 @@ class AstBuilderTest {
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/ConstructorMethodCallParameters.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "ConstructorMethodCallParameters.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
     @DisplayName("Char Test")
-    public void charTest(){
+    public void charTest() {
         BlockNode blockCon = new BlockNode();
         MemberAccessNode memberAccess = new MemberAccessNode(true);
         memberAccess.addIdentifier("a");
@@ -289,7 +287,7 @@ class AstBuilderTest {
 
         blockCon.addStatement(new AssignNode(assignable, expression));
         blockCon.addStatement(new ReturnNode(null));
-        ConstructorNode constructor = new ConstructorNode("public", "TestClass", blockCon);
+        ConstructorNode constructor = new ConstructorNode("public", "Char", blockCon);
         constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.CHAR), "a"));
 
         BlockNode blockMethod = new BlockNode();
@@ -297,7 +295,7 @@ class AstBuilderTest {
         MethodNode method = new MethodNode("public", new BaseType(TypeEnum.CHAR), false, "testMethod", blockMethod);
         method.addParameter(new ParameterNode(new BaseType(TypeEnum.CHAR), "a"));
 
-        ClassNode class1 = new ClassNode("public", "TestClass");
+        ClassNode class1 = new ClassNode("public", "Char");
         class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.CHAR), "a"));
         class1.addMember(constructor);
         class1.addMember(method);
@@ -305,14 +303,14 @@ class AstBuilderTest {
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/Char.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "Char.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
 
     @Test
     @DisplayName("Null Test")
-    public void nullTest(){
+    public void nullTest() {
         BlockNode blockCon = new BlockNode();
         MemberAccessNode memberAccess = new MemberAccessNode(true);
         memberAccess.addIdentifier("a");
@@ -321,16 +319,102 @@ class AstBuilderTest {
 
         blockCon.addStatement(new AssignNode(assignable, new UnaryNode(new ValueNode(EnumValueNode.NULL_VALUE, "null"))));
         blockCon.addStatement(new ReturnNode(null));
-        ConstructorNode constructor = new ConstructorNode("public", "TestClass", blockCon);
+        ConstructorNode constructor = new ConstructorNode("public", "Null", blockCon);
 
-        ClassNode class1 = new ClassNode("public", "TestClass");
+        ClassNode class1 = new ClassNode("public", "Null");
-        class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a"));
+        class1.addMember(new FieldNode(new AccessModifierNode("public"), new ReferenceType("Null"), "a"));
         class1.addMember(constructor);
 
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/Null.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "Null.java");
+
+        assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    }
+
+    @Test
+    @DisplayName("If Test")
+    public void ifTest() {
+        BlockNode block = new BlockNode();
+        block.addStatement(new LocalVariableDeclarationNode(new BaseType(TypeEnum.INT), "intValue", "=", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "5"))));
+
+        BlockNode ifBlock = new BlockNode();
+        ifBlock.addStatement(new DecrementNode(CrementType.SUFFIX, new AssignableNode("intValue")));
+        block.addStatement(new IfElseNode(new IfNode(new NonCalculationNode(new UnaryNode("intValue"), "==", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "5"))), ifBlock), null));
+
+        block.addStatement(new ReturnNode(null));
+
+        ConstructorNode constructor = new ConstructorNode("public", "If", block);
+
+        ClassNode class1 = new ClassNode("public", "If");
+        class1.addMember(constructor);
+
+        ProgramNode expected = new ProgramNode();
+        expected.addClass(class1);
+
+        ASTNode actual = Helper.generateAST(directoryPath + "If.java");
+
+        assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    }
+
+    @Test
+    @DisplayName("If Else Test")
+    public void ifElseTest() {
+        BlockNode block = new BlockNode();
+        block.addStatement(new LocalVariableDeclarationNode(new BaseType(TypeEnum.INT), "intValue", "=", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "5"))));
+
+        BlockNode ifBlock = new BlockNode();
+        ifBlock.addStatement(new DecrementNode(CrementType.SUFFIX, new AssignableNode("intValue")));
+        BlockNode elseBlock = new BlockNode();
+        elseBlock.addStatement(new IncrementNode(CrementType.SUFFIX, new AssignableNode("intValue")));
+        block.addStatement(new IfElseNode(new IfNode(new NonCalculationNode(new UnaryNode("intValue"), "==", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "5"))), ifBlock), new ElseNode(elseBlock)));
+
+        block.addStatement(new ReturnNode(null));
+
+        ConstructorNode constructor = new ConstructorNode("public", "IfElse", block);
+
+        ClassNode class1 = new ClassNode("public", "IfElse");
+        class1.addMember(constructor);
+
+        ProgramNode expected = new ProgramNode();
+        expected.addClass(class1);
+
+        ASTNode actual = Helper.generateAST(directoryPath + "IfElse.java");
+
+        assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    }
+
+    @Test
+    @DisplayName("If Else If ElseTest")
+    public void ifElseIfElseTest() {
+        BlockNode block = new BlockNode();
+        block.addStatement(new LocalVariableDeclarationNode(new BaseType(TypeEnum.INT), "intValue", "=", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "5"))));
+
+        BlockNode ifBlock = new BlockNode();
+        ifBlock.addStatement(new DecrementNode(CrementType.SUFFIX, new AssignableNode("intValue")));
+        BlockNode elseBlock = new BlockNode();
+        elseBlock.addStatement(new IncrementNode(CrementType.SUFFIX, new AssignableNode("intValue")));
+
+        IfElseNode ifElseStatement = new IfElseNode(new IfNode(new NonCalculationNode(new UnaryNode("intValue"), "==", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "5"))), ifBlock), new ElseNode(elseBlock));
+
+        BlockNode ifElseBlock = new BlockNode();
+        ifElseBlock.addStatement(new IncrementNode(CrementType.SUFFIX, new AssignableNode("intValue")));
+        ifElseStatement.addElseIfStatement(new IfNode(new NonCalculationNode(new UnaryNode("intValue"), "==", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "4"))), ifElseBlock));
+
+        block.addStatement(ifElseStatement);
+
+        block.addStatement(new ReturnNode(null));
+
+        ConstructorNode constructor = new ConstructorNode("public", "IfElseIfElse", block);
+
+        ClassNode class1 = new ClassNode("public", "IfElseIfElse");
+        class1.addMember(constructor);
+
+        ProgramNode expected = new ProgramNode();
+        expected.addClass(class1);
+
+        ASTNode actual = Helper.generateAST(directoryPath + "IfElseIfElse.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
@@ -339,9 +423,9 @@ class AstBuilderTest {
     @DisplayName("Self Reference Test")
     public void selfReferneceTest(){
 
-        ClassNode testClass = Helper.generateEmptyClass("TestClass");
+        ClassNode testClass = Helper.generateEmptyClass("SelfReference");
 
-        MemberNode testClassObject = new FieldNode(new AccessModifierNode("public"), new ReferenceType("TestClass"),"testClass");
+        MemberNode testClassObject = new FieldNode(new AccessModifierNode("public"), new ReferenceType("SelfReference"),"selfReference");
 
         BlockNode testMethod1Block = new BlockNode();
         testMethod1Block.addStatement(new ReturnNode(new UnaryNode(new MethodCallNode(new TargetNode(true), "testMethod2"))));
@@ -352,10 +436,10 @@ class AstBuilderTest {
         MethodNode testMethod2 = new MethodNode("public", new BaseType(TypeEnum.INT), false, "testMethod2", testMethod2Block);
 
         BlockNode testMethod3Block = new BlockNode();
-        testMethod3Block.addStatement(new LocalVariableDeclarationNode(new ReferenceType("TestClass"),"testClass1", "=", new UnaryNode(new NewDeclarationNode("TestClass")))); // Assing einfach "=" ?
+        testMethod3Block.addStatement(new LocalVariableDeclarationNode(new ReferenceType("SelfReference"),"selfReference1", "=", new UnaryNode(new NewDeclarationNode("SelfReference")))); // Assing einfach "=" ?
         MemberAccessNode methodAccess = new MemberAccessNode(false);
-        methodAccess.addIdentifier("testClass1");
+        methodAccess.addIdentifier("selfReference1");
-        methodAccess.addIdentifier("testClass");
+        methodAccess.addIdentifier("selfReference");
         TargetNode methodTarget = new TargetNode(methodAccess);
         testMethod3Block.addStatement(new ReturnNode(new UnaryNode(new MethodCallNode(methodTarget,"testMethod1"))));
         MethodNode testMethod3 = new MethodNode("public", new BaseType(TypeEnum.INT), false, "testMethod3", testMethod3Block);
@@ -368,7 +452,7 @@ class AstBuilderTest {
         ProgramNode expected = new ProgramNode();
         expected.addClass(testClass);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/SelfReference.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "SelfReference.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
@@ -376,7 +460,7 @@ class AstBuilderTest {
     @Test
     @DisplayName("Variable Compare Test")
     public void variableCompareTest(){
-        ClassNode class1 = Helper.generateEmptyClass("TestClass");
+        ClassNode class1 = Helper.generateEmptyClass("VariableCompare");
         UnaryNode trueValue = new UnaryNode(new ValueNode(EnumValueNode.BOOLEAN_VALUE,"true"));
         UnaryNode falseValue = new UnaryNode(new ValueNode(EnumValueNode.BOOLEAN_VALUE,"false"));
 
@@ -419,7 +503,7 @@ class AstBuilderTest {
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/variableCompare.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "VariableCompare.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
@@ -427,7 +511,7 @@ class AstBuilderTest {
     @Test
     @DisplayName("Variable Calculation Test")
     public void variableCalculationTest(){
-        ClassNode class1 = Helper.generateEmptyClass("TestClass");
+        ClassNode class1 = Helper.generateEmptyClass("VariableCalculation");
 
         BlockNode aPlusBBlock = new BlockNode();
         aPlusBBlock.addStatement(new ReturnNode(new CalculationNode(new CalculationNode(new DotNode(new DotSubstractionNode("a"))), "+", new DotNode(new DotSubstractionNode("b")))));
@@ -489,7 +573,7 @@ class AstBuilderTest {
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/variableCalculation.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "VariableCalculation.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
@@ -497,7 +581,7 @@ class AstBuilderTest {
     @Test
     @DisplayName("Main Method Test")
     public void mainMethodTest(){
-        ClassNode class1 = Helper.generateEmptyClass("TestClass");
+        ClassNode class1 = Helper.generateEmptyClass("MainMethod");
 
         BlockNode block = new BlockNode();
         block.addStatement(new ReturnNode(null));
@@ -507,7 +591,7 @@ class AstBuilderTest {
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/MainMethod.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "MainMethod.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
@@ -528,13 +612,13 @@ class AstBuilderTest {
         blockCon.addStatement(new ReturnNode(null));
         ConstructorNode constructor = new ConstructorNode("public", "TestClass", blockCon);
 
-        ClassNode class1 = new ClassNode("public", "TestClass");
+        ClassNode class1 = new ClassNode("public", "While");
         class1.addMember(constructor);
 
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/While.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "While.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
@@ -559,13 +643,13 @@ class AstBuilderTest {
         blockCon.addStatement(new ReturnNode(null));
         ConstructorNode constructor = new ConstructorNode("public", "TestClass", blockCon);
 
-        ClassNode class1 = new ClassNode("public", "TestClass");
+        ClassNode class1 = new ClassNode("public", "DoWhile");
         class1.addMember(constructor);
 
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/DoWhile.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "DoWhile.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }
@@ -595,13 +679,13 @@ class AstBuilderTest {
         blockCon.addStatement(new ReturnNode(null));
         ConstructorNode constructor = new ConstructorNode("public", "TestClass", blockCon);
 
-        ClassNode class1 = new ClassNode("public", "TestClass");
+        ClassNode class1 = new ClassNode("public", "For");
         class1.addMember(constructor);
 
         ProgramNode expected = new ProgramNode();
         expected.addClass(class1);
 
-        ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/For.java");
+        ASTNode actual = Helper.generateAST(directoryPath + "For.java");
 
         assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
     }

src/test/java/semantic/BeginnToTAST.java

@@ -0,0 +1,45 @@
+package semantic;
+
+import ast.ProgramNode;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.junit.jupiter.api.Test;
+import parser.astBuilder.ASTBuilder;
+import parser.generated.SimpleJavaLexer;
+import parser.generated.SimpleJavaParser;
+
+import java.io.IOException;
+import java.nio.file.Paths;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class BeginnToTAST {
+
+    @Test
+    public void FieldTests() {
+        SemanticAnalyzer.clearAnalyzer();
+
+        CharStream codeCharStream = null;
+        try {
+            codeCharStream = CharStreams.fromPath(Paths.get("src/test/resources/input/johnsTests/FieldTests.java"));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        SimpleJavaLexer lexer = new SimpleJavaLexer(codeCharStream);
+        CommonTokenStream tokenStream = new CommonTokenStream(lexer);
+
+        SimpleJavaParser parser = new SimpleJavaParser(tokenStream);
+        ParseTree parseTree = parser.program(); // parse the input
+
+        /* ------------------------- AST builder -> AST ------------------------- */
+        ASTBuilder astBuilder = new ASTBuilder();
+        ProgramNode abstractSyntaxTree = (ProgramNode) astBuilder.visit(parseTree);
+
+        var result = SemanticAnalyzer.generateTast(abstractSyntaxTree);
+
+        assertTrue(SemanticAnalyzer.errors.isEmpty());
+    }
+
+}

src/test/java/semantic/EndToTypedAstTest.java

@@ -26,6 +26,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.junit.jupiter.api.Test;
+import semantic.exceptions.*;
+import semantic.exceptions.NotDeclaredException;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -38,17 +40,14 @@ public class EndToTypedAstTest {
 
         CharStream codeCharStream = null;
         try {
-            codeCharStream = CharStreams.fromPath(Paths.get("src/test/resources/input/typedAstFeaturesTests/CorrectTest.java"));
+            codeCharStream = CharStreams.fromPath(Paths.get("src/test/resources/input/typedAstFeatureTests/CorrectTest.java"));
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
         SimpleJavaLexer lexer = new SimpleJavaLexer(codeCharStream);
         CommonTokenStream tokenStream = new CommonTokenStream(lexer);
-
         SimpleJavaParser parser = new SimpleJavaParser(tokenStream);
-        ParseTree parseTree = parser.program(); // parse the input
+        ParseTree parseTree = parser.program();
-
-        /* ------------------------- AST builder -> AST ------------------------- */
         ASTBuilder astBuilder = new ASTBuilder();
         ProgramNode abstractSyntaxTree = (ProgramNode) astBuilder.visit(parseTree);
 
@@ -115,7 +114,7 @@ public class EndToTypedAstTest {
 
     @Test
     public void featureTest() {
-        String directoryPath = "src/test/resources/input/typedAstFeaturesTests";
+        String directoryPath = "src/test/resources/input/typedAstFeatureTests";
         File folder = new File(directoryPath);
         if (folder.isDirectory()) {
             File[] files = folder.listFiles((_, name) -> name.endsWith(".java"));
@@ -155,6 +154,132 @@ public class EndToTypedAstTest {
         }
     }
 
+    /*
+    @Test
+    public void notDeclared() {
+        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/johnsTests/NotDeclared.java");
+
+        SemanticAnalyzer.generateTast(tast);
+
+        assertFalse(SemanticAnalyzer.errors.isEmpty());
+        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof NotDeclaredException));
+    }*/
+
+    @Test
+    public void typeMismatchTest() {
+        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/TypeMismatchIntBool.java");
+
+        SemanticAnalyzer.generateTast(tast);
+
+        assertFalse(SemanticAnalyzer.errors.isEmpty());
+        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof TypeMismatchException));
+    }
+
+    @Test
+    public void parameterAlreadyDecleared() {
+        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/ParameterAlreadyDecleared.java");
+
+        SemanticAnalyzer.generateTast(tast);
+
+        assertFalse(SemanticAnalyzer.errors.isEmpty());
+        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof AlreadyDeclaredException));
+    }
+
+    @Test
+    public void fieldAlreadyDecleared(){
+        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/FieldAlreadyDecleared.java");
+        SemanticAnalyzer.generateTast(tast);
+
+        assertFalse(SemanticAnalyzer.errors.isEmpty());
+        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof AlreadyDeclaredException));
+
+    }
+
+    @Test
+    public void typeMismatchRefType(){
+        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/TypeMismatchRefType.java");
+
+        SemanticAnalyzer.generateTast(tast);
+
+        assertFalse(SemanticAnalyzer.errors.isEmpty());
+        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof TypeMismatchException));
+    }
+
+    @Test
+    public void correctRetType(){
+        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/CorrectRetType.java");
+
+        SemanticAnalyzer.generateTast(tast);
+
+        assertTrue(SemanticAnalyzer.errors.isEmpty());
+    }
+
+    @Test
+    public void retTypeMismatch(){
+        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/RetTypeMismatch.java");
+
+        SemanticAnalyzer.generateTast(tast);
+
+        assertFalse(SemanticAnalyzer.errors.isEmpty());
+        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof TypeMismatchException));
+    }
+
+    @Test
+    public void multipleRetType(){
+        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/MultipleRetTypes.java");
+
+        SemanticAnalyzer.generateTast(tast);
+
+        assertFalse(SemanticAnalyzer.errors.isEmpty());
+        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof MultipleReturnTypes));
+    }
+
+    @Test
+    public void BothTypesMustBeSameGreaterSmallerEqual(){
+
+        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/BothTypesMustBeSame.java");
+
+        SemanticAnalyzer.generateTast(tast);
+
+        assertFalse(SemanticAnalyzer.errors.isEmpty());
+        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof TypeMismatchException));
+
+    }
+
+    @Test
+    public void NoSuchType(){
+
+        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/ClassNotDeclared.java");
+
+        SemanticAnalyzer.generateTast(tast);
+
+        assertFalse(SemanticAnalyzer.errors.isEmpty());
+        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof NotDeclaredException));
+
+    }
+
+    @Test
+    public void FieldIsNotVisible(){
+
+        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/FieldIsNotVisible.java");
+
+        SemanticAnalyzer.generateTast(tast);
+
+        assertFalse(SemanticAnalyzer.errors.isEmpty());
+        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof NotVisibleException));
+
+    }
+
+    @Test
+    public void ChainedMethods(){
+
+        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/ChainedMethods.java");
+
+        SemanticAnalyzer.generateTast(tast);
+
+        assertTrue(SemanticAnalyzer.errors.isEmpty());
+
+    }
 
     // ------------------ Helpers ------------------
 

src/test/java/semantic/SemanticHelper.java

@@ -0,0 +1,32 @@
+package semantic;
+
+import ast.ASTNode;
+import ast.ProgramNode;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.tree.ParseTree;
+import parser.astBuilder.ASTBuilder;
+import parser.generated.SimpleJavaLexer;
+import parser.generated.SimpleJavaParser;
+
+import java.io.IOException;
+
+public class SemanticHelper {
+    public static ASTNode generateTypedASTFrom(String filePath) {
+        CharStream testFile = null;
+        try {
+            testFile = CharStreams.fromFileName(filePath);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        SimpleJavaLexer lexer = new SimpleJavaLexer(testFile);
+        CommonTokenStream tokenStream = new CommonTokenStream(lexer);
+        tokenStream.fill();
+        SimpleJavaParser parser = new SimpleJavaParser(tokenStream);
+        ParseTree parseTree = parser.program();
+        ASTBuilder astBuilder = new ASTBuilder();
+
+        return (ProgramNode) astBuilder.visit(parseTree);
+    }
+}

src/test/java/semantic/SemanticTest.java

@@ -2,112 +2,4 @@ package semantic;
 
 public class SemanticTest {
 
-
-    public void test(){
-
-    }
-
-    public void test(int a, boolean b){
-
-    }
-
-    public void test(boolean b, int a){
-
-    }
-
-//    @Test
-//    public void alreadyDeclaredLocalFieldVar() {
-//        ProgramNode programNode = new ProgramNode();
-//        List<ClassNode> classList = new ArrayList<>();
-//        AccessTypeNode accessTypeNode = new AccessTypeNode(EnumAccessTypeNode.PUBLIC);
-//        ClassNode classNode = new ClassNode(accessTypeNode, "testClass");
-//
-//        SemanticAnalyzer semanticAnalyzer = new SemanticAnalyzer();
-//        ASTNode tast = semanticAnalyzer.generateTast(ast);
-//
-//        MemberNode memberNode2 = new FieldNode(accessTypeNode, new BaseTypeNode(EnumTypeNode.INT), "testVar");
-//        classNode.members.add(memberNode2);
-//
-//        classList.add(classNode);
-//        programNode.classes = classList;
-//
-//        ASTNode typedAst = SemanticAnalyzer.generateTast(programNode);
-//
-//        assertEquals(1, SemanticAnalyzer.errors.size());
-//        assertInstanceOf(AlreadyDeclaredException.class, SemanticAnalyzer.errors.getFirst());
-//        assertNull(typedAst);
-//    }
-//
-//    @Test
-//    public void shouldWorkWithNoError() {
-//        ProgramNode programNode = new ProgramNode();
-//        List<ClassNode> classList = new ArrayList<>();
-//        AccessTypeNode accessTypeNode = new AccessTypeNode(EnumAccessTypeNode.PUBLIC);
-//        ClassNode classNode = new ClassNode(accessTypeNode, "testClass");
-//
-//        SemanticAnalyzer semanticAnalyzer = new SemanticAnalyzer();
-//        ASTNode tast = semanticAnalyzer.generateTast(ast);
-//
-//        assertEquals(semanticAnalyzer.errors.size(), 0);
-//        assertNotNull(tast);
-//
-//        MemberNode memberNode3 = getMemberNode(accessTypeNode);
-//        classNode.members.add(memberNode3);
-//
-//        classList.add(classNode);
-//        programNode.classes = classList;
-//
-//        ASTNode typedAst = SemanticAnalyzer.generateTast(programNode);
-//
-//        assertEquals(0, SemanticAnalyzer.errors.size());
-//        assertEquals(programNode, typedAst);
-//    }
-//
-//    /**
-// * This method is used to create a MemberNode representing a method.
-// * It first creates a list of ParameterNodes and adds a ParameterNode to it.
-// * Then, it creates a ParameterListNode using the list of ParameterNodes.
-// * After that, it creates a list of StatementNodes and adds a StatementNode to it by calling the getStatementNode method.
-// * Finally, it creates a MethodNode using the provided AccessTypeNode, a BaseTypeNode representing the return type of the method,
-// * the method name, the ParameterListNode, and the list of StatementNodes, and returns this MethodNode.
-// *
-// * @param accessTypeNode The AccessTypeNode representing the access type of the method.
-// * @return The created MemberNode representing the method.
-// */
-//private static MemberNode getMemberNode(AccessTypeNode accessTypeNode) {
-//    List<ParameterNode> parameterNodeList = new ArrayList<>();
-//    ParameterNode parameterNode1 = new ParameterNode(new BaseTypeNode(EnumTypeNode.INT), "param1");
-//    parameterNodeList.add(parameterNode1);
-//    ParameterListNode parameterListNode = new ParameterListNode(parameterNodeList);
-//
-//    List<StatementNode> statementNodeList = new ArrayList<>();
-//
-//    StatementNode statementNode1 = getStatementNode();
-//    statementNodeList.add(statementNode1);
-//
-//    return new MethodNode(accessTypeNode, new BaseTypeNode(EnumTypeNode.INT), "testVar2", parameterListNode, statementNodeList);
-//}
-//
-//    /**
-// * This method is used to create a StatementNode for an assignment operation.
-// * It first creates two IdentifierExpressionNodes for 'this' and 'objectVar'.
-// * Then, it creates a BinaryExpressionNode to represent the operation 'this.objectVar'.
-// * After that, it creates a LiteralNode to represent the integer value 1.
-// * Finally, it creates another BinaryExpressionNode to represent the assignment operation 'this.objectVar = 1',
-// * and wraps this expression in an AssignmentStatementNode.
-// *
-// * @return The created AssignmentStatementNode representing the assignment operation 'this.objectVar = 1'.
-// */
-//private static StatementNode getStatementNode() {
-//    ExpressionNode expressionNodeObjectVariableLeft = new IdentifierExpressionNode("this");
-//    ExpressionNode expressionNodeObjectVariableRight = new IdentifierExpressionNode("objectVar");
-//
-//    ExpressionNode expressionNodeLeft = new BinaryExpressionNode(expressionNodeObjectVariableLeft, expressionNodeObjectVariableRight, ExpresssionOperator.DOT);
-//
-//    ExpressionNode expressionNodeRight = new LiteralNode(1);
-//
-//    BinaryExpressionNode expressionNode = new BinaryExpressionNode(expressionNodeLeft, expressionNodeRight, ExpresssionOperator.ASSIGNMENT);
-//
-//    return new AssignmentStatementNode(expressionNode);
-//}
 }

src/test/resources/input/CombinedExample.java

@@ -1,23 +0,0 @@
-public class CombinedExample {
-    int number;
-    boolean flag;
-    char letter;
-
-    public CombinedExample(int number, boolean flag, char letter) {
-        this.number = number;
-        this.flag = flag;
-        this.letter = letter;
-    }
-
-    public void displayValues() {
-        System.out.println("Number: " + number);
-        System.out.println("Flag: " + flag);
-        System.out.println("Letter: " + letter);
-    }
-
-    public static void main(String[] args) {
-        CombinedExample obj = new CombinedExample(10, true, 'X');
-        obj.displayValues();
-    }
-}
-

src/test/resources/input/CompilerInput.java

@@ -1,16 +0,0 @@
-public class CompilerInput {
-
-    public int a;
-
-    public static int testMethod(char x){
-        return 0;
-    }
-
-    public class Test {
-
-        public static int testMethod(char x, int a){
-            return 0;
-        }
-    }
-}
-

src/test/resources/input/MoreFeaturesClassExample.java

@@ -1,6 +0,0 @@
-public class MoreFeaturesClassExample {
-    int hallo;
-    private class Inner {
-        int hallo2;
-    }
-}

src/test/resources/input/combinedFeatureTests/AllFeaturesClassExample.java

@@ -4,7 +4,7 @@ public class AllFeaturesClassExample {
     char c;
 
     // Konstruktor
-    AllFeaturesClassExample(int a, boolean b, char c) {
+    public AllFeaturesClassExample(int a, boolean b, char c) {
         this.a = a;
         this.b = b;
         this.c = c;
@@ -14,47 +14,54 @@ public class AllFeaturesClassExample {
     void controlStructures() {
         // if-else Anweisung
         if (a > 10) {
-           // System.out.println("a ist größer als 10");
         } else {
-           // System.out.println("a ist nicht größer als 10");
         }
 
         // while Schleife
         while (a > 0) {
-          //  System.out.println("a ist " + a);
             a--;
         }
-
+        int c = 0;
         // for Schleife
         for (int i = 0; i < 5; i++) {
-           // System.out.println("for Schleife Iteration: " + i);
+            c++;
         }
+
     }
 
     // Methode zur Arbeit mit logischen Operatoren
     void logicalOperations() {
         // Logische UND-Operation
         if (b && a > 5) {
-          //  System.out.println("a ist größer als 5 und b ist wahr");
         }
 
         // Logische ODER-Operation
         if (b || a < 5) {
-           // System.out.println("b ist wahr oder a ist kleiner als 5");
         }
     }
 
-    void mathOperations() {
+    int add(int a, int b) {
-        // Addition
+        return a + b;
-        int sum = a + 5;
+    }
-        // Subtraktion
+
-        int difference = a - 5;
+    int subtract(int a, int b) {
-        // Multiplikation
+        return a - b;
-        int product = a * 5;
+    }
-        // Division
+
-        int quotient = a / 5;
+    int multiply(int a, int b) {
-        // Modulo
+        return a * b;
-        int remainder = a % 5;
+    }
+
+    int divide(int a, int b) {
+        return a / b;
+    }
+
+    int modulo(int a, int b) {
+        return a % b;
+    }
+
+    boolean greaterThan(int a, int b) {
+        return a > b;
     }
 
     public static void main(String[] args) {

src/test/resources/input/javaCases/ConstructorParameter.java

@@ -1,5 +0,0 @@
-class TestClass {
-    public TestClass(int a, int b){
-
-    }
-}

src/test/resources/input/javaCases/ConstructorThisDot.java

@@ -1,8 +0,0 @@
-class TestClass{
-
-    private int a;
-
-    public TestClass(int a){
-        this.a = a;
-    }
-}

src/test/resources/input/javaCases/EmptyClass.java

@@ -1 +0,0 @@
-class TestClass {}

src/test/resources/input/javaCases/EmptyClassWithConstructor.java

@@ -1,5 +0,0 @@
-public class TestClass {
-    public TestClass() {
-
-    }
-}

src/test/resources/input/javaCases/Field.java

@@ -1,3 +0,0 @@
-public class TestClass {
-    int a;
-}

src/test/resources/input/javaCases/FieldWithAccessModifier.java

@@ -1,3 +0,0 @@
-public class TestClass {
-    public int a;
-}

src/test/resources/input/javaCases/MultipleClasses.java

@@ -1,3 +0,0 @@
-class TestClass1 {}
-
-class TestClass2{}

src/test/resources/input/javaCases/Null.java

@@ -1,8 +0,0 @@
-class TestClass{
-
-    int a;
-
-    public TestClass(){
-        this.a = null;
-    }
-}

src/test/resources/input/javaCases/SelfReference.java

@@ -1,18 +0,0 @@
-class TestClass{
-
-    TestClass testClass;
-
-    int testMethod1() {
-        return this.testMethod2();
-    }
-
-    int testMethod2() {
-        return 1;
-    }
-
-    int testMethod3(){
-        TestClass testClass1 = new TestClass();
-        return testClass1.testClass.testMethod1();
-    }
-
-}

src/test/resources/input/javaCases/SwitchCase.java

@@ -1,10 +0,0 @@
-class TestClass{
-
-    TestClasd (){
-        switch (a){
-            case 1:
-                b = 1;
-
-        }
-    }
-}

src/test/resources/input/javaCases/VoidMethod.java

@@ -1,3 +0,0 @@
-class TestClass{
-    void test(){}
-}

src/test/resources/input/singleFeatureSemanticTests/BothTypesMustBeSame.java

@@ -5,5 +5,18 @@ public class AllFeaturesClassExample {
         while (a > bool) {
             a--;
         }
+
+        if (a == bool) {
+
+        } else {
+
+        }
+
+        if (a < bool) {
+
+        } else {
+
+        }
+
     }
 }

src/test/resources/input/singleFeatureSemanticTests/ChainedMethods.java

@@ -0,0 +1,29 @@
+public class Test {
+
+    public House h;
+
+    public int test(House h){
+        return h.getW().getSize();
+    }
+
+
+}
+
+public class House {
+
+    private Window w;
+
+    public Window getW(){
+        return w;
+    }
+
+}
+
+public class Window{
+
+    private int size;
+
+    public int getSize() {
+        return size;
+    }
+}

src/test/resources/input/singleFeatureSemanticTests/ClassNotDeclared.java

@@ -0,0 +1,7 @@
+// @expected: NotDeclaredException
+public class Test {
+
+    public House1 h;
+
+
+}

src/test/resources/input/singleFeatureSemanticTests/CorrectRetType.java

@@ -1,7 +1,5 @@
-public class Example {
+public class CorrectRetType {
-
     public static int testMethod(int x){
         return x;
     }
-
 }

src/test/resources/input/singleFeatureSemanticTests/FieldAlreadyDecleared.java

@@ -0,0 +1,4 @@
+public class FieldAlreadyDecleared {
+    public int a;
+    public int a;
+}

src/test/resources/input/singleFeatureSemanticTests/FieldTests.java

@@ -0,0 +1,5 @@
+public class Test{
+
+    int a = 10;
+
+}

src/test/resources/input/singleFeatureSemanticTests/MultipleRetTypes.java

@@ -0,0 +1,6 @@
+public class MultipleRetTypes {
+    public static int testMethod(int x, char c){
+        return x;
+        return c;
+    }
+}

src/test/resources/input/singleFeatureSemanticTests/NotDeclared.java

@@ -0,0 +1,5 @@
+public class NotDeclared {
+    public void Method() {
+        i = 10;
+    }
+}

src/test/resources/input/singleFeatureSemanticTests/ParameterAlreadyDecleared.java

@@ -0,0 +1,3 @@
+public class ParameterAlreadyDecleared {
+    public void Method(int a, int a) {}
+}

src/test/resources/input/singleFeatureSemanticTests/RetTypeMismatch.java

@@ -0,0 +1,5 @@
+public class Example {
+    public static int testMethod(char x){
+        return x;
+    }
+}

src/test/resources/input/singleFeatureSemanticTests/TypeMismatchIntBool.java

@@ -0,0 +1,6 @@
+public class TypeMismatchIntBool {
+    public void Method() {
+        int intVariable;
+        intVariable = true;
+    }
+}

src/test/resources/input/singleFeatureSemanticTests/TypeMismatchRefType.java

@@ -0,0 +1,13 @@
+public class TypeMismatchRefType {
+    public static int Methode(Class1 class1, Class2 class2){
+        class1 = class2;
+    }
+}
+
+public class Class1{
+    public int a;
+}
+
+public class Class2{
+    public boolean a;
+}

src/test/resources/input/singleFeatureTests/Char.java

@@ -1,8 +1,8 @@
-class TestClass{
+class Char {
 
     char a;
 
-    public TestClass(char a){
+    public Char(char a){
         this.a = testMethod(a);
     }
 

src/test/resources/input/singleFeatureTests/Comments.java

@@ -3,6 +3,6 @@
     Mutliple Line Comment. Ignore
 
  */
-class TestClass{
+class Comments{
     private int a; // Ignore
 }

src/test/resources/input/singleFeatureTests/ConstructorMethodCall.java

@@ -1,8 +1,8 @@
-class TestClass {
+public class ConstructorMethodCall {
 
     int a;
 
-    public TestClass(){
+    public ConstructorMethodCall(){
         this.a = testMethod();
     }
 

src/test/resources/input/singleFeatureTests/ConstructorMethodCallParameters.java

@@ -1,8 +1,8 @@
-class TestClass {
+class ConstructorMethodCallParameters {
 
     int a;
 
-    public TestClass(int a){
+    public ConstructorMethodCallParameters(int a){
         this.a = testMethod(a);
     }
 

src/test/resources/input/singleFeatureTests/ConstructorParameter.java

@@ -0,0 +1,5 @@
+class ConstructorParameter {
+    public ConstructorParameter(int a, int b){
+
+    }
+}

src/test/resources/input/singleFeatureTests/ConstructorThisDot.java

@@ -0,0 +1,8 @@
+class ConstructorThisDot {
+
+    private int a;
+
+    public ConstructorThisDot(int a){
+        this.a = a;
+    }
+}

src/test/resources/input/singleFeatureTests/DoWhile.java

@@ -1,6 +1,6 @@
-class TestClass{
+class DoWhile{
 
-    public TestClass(){
+    public DoWhile(){
         int i = 0;
 
         do{

src/test/resources/input/singleFeatureTests/EmptyClass.java

@@ -0,0 +1 @@
+class EmptyClass {}

src/test/resources/input/singleFeatureTests/EmptyClassWithConstructor.java

@@ -0,0 +1,5 @@
+public class EmptyClassWithConstructor {
+    public EmptyClassWithConstructor() {
+
+    }
+}

src/test/resources/input/singleFeatureTests/Field.java

@@ -0,0 +1,3 @@
+class Field {
+    int a;
+}

src/test/resources/input/singleFeatureTests/FieldWithAccessModifier.java

@@ -0,0 +1,3 @@
+public class FieldWithAccessModifier {
+    public int a;
+}

src/test/resources/input/singleFeatureTests/For.java

@@ -1,6 +1,6 @@
-class TestClass{
+class For{
 
-    public TestClass(){
+    public For(){
         for(int i = 0; i < 10; i++){
             int a;
         }

src/test/resources/input/singleFeatureTests/If.java

@@ -0,0 +1,8 @@
+public class If {
+    public If() {
+        int intValue = 5;
+        if(intValue == 5) {
+            intValue--;
+        }
+    }
+}

src/test/resources/input/singleFeatureTests/IfElse.java

@@ -0,0 +1,10 @@
+public class IfElse {
+    public IfElse() {
+        int intValue = 5;
+        if(intValue == 5) {
+            intValue--;
+        } else {
+            intValue++;
+        }
+    }
+}

src/test/resources/input/singleFeatureTests/IfElseIfElse.java

@@ -0,0 +1,12 @@
+public class IfElseIfElse {
+    public IfElseIfElse() {
+        int intValue = 5;
+        if(intValue == 5) {
+            intValue--;
+        } else if(intValue ==4) {
+            intValue++;
+        } else {
+            intValue++;
+        }
+    }
+}

src/test/resources/input/singleFeatureTests/Increment.java

@@ -5,7 +5,7 @@ public class Increment {
     public void increment(int p) {
         test = p++;
 
-        for(int i = 1; i<=10, i++) {
+        for(int i = 1; i<=10; i++) {
             int a = 5;
         }
     }

src/test/resources/input/singleFeatureTests/MainMethod.java

@@ -1,4 +1,4 @@
-class TestClass{
+class MainMethod{
 
     public static void main(String[] args) {
     }

src/test/resources/input/singleFeatureTests/MultipleClasses.java

@@ -0,0 +1,3 @@
+class MultipleClasses {}
+
+class TestClass2{}

src/test/resources/input/singleFeatureTests/Null.java

@@ -0,0 +1,8 @@
+class Null{
+
+    Null a;
+
+    public Null(){
+      this.a = null;
+    }
+}

src/test/resources/input/singleFeatureTests/SelfReference.java

@@ -0,0 +1,18 @@
+class SelfReference{
+
+    SelfReference selfReference;
+
+    int testMethod1() {
+        return this.testMethod2();
+    }
+
+    int testMethod2() {
+        return 1;
+    }
+
+    int testMethod3(){
+        SelfReference selfReference1 = new SelfReference();
+        return selfReference1.selfReference.testMethod1();
+    }
+
+}

src/test/resources/input/singleFeatureTests/ThisDot.java

@@ -1,8 +1,8 @@
-class TestClass{
+class ThisDot {
 
     public int a;
 
-    public TestClass() {
+    public ThisDot() {
         this.a = 1;
     }
 }

src/test/resources/input/singleFeatureTests/VariableCalculation.java

@@ -1,4 +1,4 @@
-class TestClass{
+class VariableCalculation{
 
     int aPlusB(int a, int b){
         return a + b;

src/test/resources/input/singleFeatureTests/VariableCompare.java

@@ -1,4 +1,4 @@
-class TestClass{
+class VariableCompare{
 
     boolean trueMethod() {
         return true;

src/test/resources/input/singleFeatureTests/VoidMethod.java

@@ -0,0 +1,3 @@
+class VoidMethod{
+    void test(){}
+}

src/test/resources/input/singleFeatureTests/While.java

@@ -1,6 +1,6 @@
-class TestClass{
+class While{
 
-    public TestClass(){
+    public While(){
         int i = 10;
 
         while ( i > 0){

src/test/resources/input/typedAstExceptionsTests/CompareBoolInt.java

@@ -1,13 +0,0 @@
-// @expected: TypeMismatchException
-public class Test{
-
-    public void test(boolean b){
-        if(b == 2){
-
-        } else {
-
-        }
-
-    }
-
-}

src/test/resources/input/typedAstExceptionsTests/MissingOverloadingParameter.java

@@ -1,19 +0,0 @@
-// @expected: WrongOverloading
-public class Test{
-
-    public void test(int x){
-
-        if(this.get()){
-
-        } else {
-
-        }
-
-    }
-    public boolean b;
-
-    public boolean get(int c){
-        return b;
-    }
-
-}

src/test/resources/input/typedAstExceptionsTests/SelectWrongMethodCauseParameter.java

@@ -6,7 +6,7 @@ public class Test{
 
     public int test(){
 
-        return this.test(i);
+        return test(i);
 
     }