Test update

.idea/misc.xml

@@ -24,7 +24,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-22" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="openjdk-22" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/target" />
   </component>
 </project>

src/main/java/abstractSyntaxTree/Class/FieldDecl.java

@@ -72,7 +72,8 @@ public class FieldDecl extends AbstractType implements Node {
         if (o == null || getClass() != o.getClass()) return false;
         FieldDecl fieldDecl = (FieldDecl) o;
         boolean result = Objects.equals(type, fieldDecl.type)
-                &&  Objects.equals(identifier, fieldDecl.identifier);
+                &&  Objects.equals(identifier, fieldDecl.identifier)
+                &&  Objects.equals(expression, fieldDecl.expression);
 
         System.out.println("In FieldDecl: " + result);
         return result;

src/main/java/abstractSyntaxTree/Statement/BlockStatement.java

@@ -129,9 +129,9 @@ public class BlockStatement extends AbstractType implements IStatement {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         BlockStatement blockStatement = (BlockStatement) o;
-        boolean result = (Objects.equals(localVars, blockStatement.localVars)
-                &&  Objects.equals(returnType, blockStatement.returnType)
-                &&  Objects.equals(statements, blockStatement.statements)
+        boolean result =   Objects.equals(returnType, blockStatement.returnType)
+                &&  Objects.equals(statements, blockStatement.statements
+               /*&& (Objects.equals(localVars, blockStatement.localVars)*/
         );
         System.out.println("In ParameterList: " + result);
 

src/test/java/AST/testAll.java

@@ -8,9 +8,16 @@ public class testAll {
     AstComparer astComparer;
     public testAll()
     {
-        this.astComparer = new AstComparer("test/resources");
+        this.astComparer = new AstComparer("src/test/resources");
     }
 
+
+    @Test
+    public void testClassWithMain(){
+        Program ast = ClassWithMainAST.getProgram();
+        String pathToCode = "basicClasses/classWithMain.java";
+        testAst(ast, pathToCode);
+    }
     @Test
     public void testEmptyClass(){
         Program ast = emptyClassAST.getEmptyProgramm();
@@ -38,6 +45,21 @@ public class testAll {
         String pathToCode = "failTests/AssignWrongType.java";
         testAst(ast, pathToCode);
     }
+
+    @Test
+    public void testDivideByZero(){
+        Program ast = AssignWrongTypeAST.getProgram();
+        String pathToCode = "failTests/DivideByzero.java";
+        testAst(ast, pathToCode);
+    }
+
+    @Test
+    public void testcharArgument(){
+        Program ast = CharArgumentAST.getProgram();
+        String pathToCode = "SimpleTests/CharArgument.java";
+        testAst(ast, pathToCode);
+    }
+
     public void testAst(Program ast, String pathToCode)
     {
 

src/test/java/ASTs/AssignWrongTypeASTTyped.java

@@ -0,0 +1,59 @@
+package ASTs;
+
+import abstractSyntaxTree.Class.FieldDecl;
+import abstractSyntaxTree.Class.MethodDecl;
+import abstractSyntaxTree.Class.RefType;
+import abstractSyntaxTree.Expression.BooleanConstantExpression;
+import abstractSyntaxTree.Expression.IntConstantExpression;
+import abstractSyntaxTree.Expression.LocalVarIdentifier;
+import abstractSyntaxTree.Parameter.ParameterList;
+import abstractSyntaxTree.Program;
+import abstractSyntaxTree.Statement.BlockStatement;
+import abstractSyntaxTree.Statement.IStatement;
+import abstractSyntaxTree.Statement.LocalVarDecl;
+import abstractSyntaxTree.Statement.ReturnStatement;
+import abstractSyntaxTree.StatementExpression.AssignStatementExpression;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AssignWrongTypeASTTyped {
+    public static Program getProgram(){
+
+        // TestMethod
+        //Expressions
+        // 0
+        IntConstantExpression intConstantExpression0 = new IntConstantExpression(1);
+        LocalVarDecl localVarDecl = new LocalVarDecl("int", "x", intConstantExpression0);
+
+        //1
+        LocalVarIdentifier localVarIdentifier0 = new LocalVarIdentifier("x");
+        BooleanConstantExpression booleanConstantExpression0 = new BooleanConstantExpression(true);
+        AssignStatementExpression assignStatementExpression0 = new AssignStatementExpression("=", localVarIdentifier0, booleanConstantExpression0);
+
+        //2
+        ReturnStatement returnStatement0 = new ReturnStatement(localVarIdentifier0);
+
+        String classThatContainsMethod = "AssignWrongType";
+        String nameMethod0 = "test";
+        String returnType = "int";
+        ParameterList parameterList = new ParameterList(new ArrayList<>());
+        List<IStatement> iStatementList = new ArrayList<>();
+        iStatementList.add(localVarDecl);
+        iStatementList.add(assignStatementExpression0);
+        iStatementList.add(returnStatement0);
+        BlockStatement codeBlock = new BlockStatement(iStatementList, null);
+        MethodDecl test = new MethodDecl(classThatContainsMethod, returnType, nameMethod0, parameterList, codeBlock);
+
+        String name = "AssignWrongType";
+        List<FieldDecl> fieldDeclList = new ArrayList<>();
+        List<MethodDecl> methodDeclList = new ArrayList<>();
+        methodDeclList.add(test);
+        boolean hasMain = false;
+        RefType assignWrongType = new RefType(name, fieldDeclList, methodDeclList, hasMain);
+        List<RefType> refTypeList = new ArrayList<>();
+        refTypeList.add(assignWrongType);
+        Program program = new Program(refTypeList);
+        return program;
+    }
+}

src/test/java/ASTs/CharArgumentAST.java

@@ -0,0 +1,73 @@
+package ASTs;
+
+import abstractSyntaxTree.Class.FieldDecl;
+import abstractSyntaxTree.Class.MethodDecl;
+import abstractSyntaxTree.Class.RefType;
+import abstractSyntaxTree.Expression.*;
+import abstractSyntaxTree.Parameter.Parameter;
+import abstractSyntaxTree.Parameter.ParameterList;
+import abstractSyntaxTree.Program;
+import abstractSyntaxTree.Statement.BlockStatement;
+import abstractSyntaxTree.Statement.IStatement;
+import abstractSyntaxTree.Statement.ReturnStatement;
+import abstractSyntaxTree.StatementExpression.AssignStatementExpression;
+import abstractSyntaxTree.StatementExpression.MethodCallStatementExpression;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CharArgumentAST {
+    public static Program getProgram() {
+
+        List<RefType> classes = new ArrayList<>();
+        classes.add(getRefType());
+        Program program = new Program(classes);
+        return program;
+    }
+
+    public static RefType getRefType() {
+        FieldDecl fieldDecl0 = new FieldDecl("char", "c", null);
+        List<FieldDecl> fieldDeclList = new ArrayList<>();
+        fieldDeclList.add(fieldDecl0);
+        List<MethodDecl> methodDeclList = new ArrayList<>();
+        methodDeclList.add(method0());
+        methodDeclList.add(method1());
+        RefType charArgumentClass = new RefType("CharArgument", fieldDeclList, methodDeclList, false);
+
+        return charArgumentClass;
+    }
+
+    public static MethodDecl method0(){
+        SubReceiver subReceiver0 =new SubReceiver(true);
+        List<SubReceiver> subReceiverList0 = new ArrayList<>();
+        subReceiverList0.add(subReceiver0);
+        InstVarExpression instVarExpression0 = new InstVarExpression(subReceiverList0, new ArrayList<>(), "c");
+        CharConstantExpression charConstantExpression0 = new CharConstantExpression('a');
+        List<IExpression> argumentList0 = new ArrayList<>();
+        argumentList0.add(charConstantExpression0);
+        MethodCallStatementExpression methodCallStatementExpression0 = new MethodCallStatementExpression("foo", null, new ArrayList<>(), argumentList0);
+        AssignStatementExpression assignStatementExpression0 = new AssignStatementExpression("=", instVarExpression0,methodCallStatementExpression0);
+        List<IStatement> iStatementList0 = new ArrayList<>();
+        iStatementList0.add(assignStatementExpression0);
+        BlockStatement blockStatement0 = new BlockStatement(iStatementList0, null);
+        MethodDecl methodDecl0 =new MethodDecl("CharArgument", null,
+                "CharArgument", new ParameterList(new ArrayList<>()), blockStatement0);
+
+        return methodDecl0;
+    }
+
+    public static MethodDecl method1(){
+        ReturnStatement returnStatement0 =new ReturnStatement(new LocalVarIdentifier("c"));
+        List<IStatement> iStatementList0 =new ArrayList<>();
+        iStatementList0.add(returnStatement0);
+        BlockStatement blockStatement0 = new BlockStatement(iStatementList0, null);
+        Parameter parameter00 = new Parameter("char", "c");
+        List<Parameter> parameterList0 = new ArrayList<>();
+        parameterList0.add(parameter00);
+        ParameterList parameterListObj0 = new ParameterList(parameterList0);
+        MethodDecl methodDecl = new MethodDecl("CharArgument", "char", "foo",
+                parameterListObj0, blockStatement0);
+
+        return methodDecl;
+    }
+}

src/test/java/ASTs/CharArgumentASTTyped.java

@@ -0,0 +1,73 @@
+package ASTs;
+
+import abstractSyntaxTree.Class.FieldDecl;
+import abstractSyntaxTree.Class.MethodDecl;
+import abstractSyntaxTree.Class.RefType;
+import abstractSyntaxTree.Expression.*;
+import abstractSyntaxTree.Parameter.Parameter;
+import abstractSyntaxTree.Parameter.ParameterList;
+import abstractSyntaxTree.Program;
+import abstractSyntaxTree.Statement.BlockStatement;
+import abstractSyntaxTree.Statement.IStatement;
+import abstractSyntaxTree.Statement.ReturnStatement;
+import abstractSyntaxTree.StatementExpression.AssignStatementExpression;
+import abstractSyntaxTree.StatementExpression.MethodCallStatementExpression;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CharArgumentASTTyped {
+    public static Program getProgram() {
+
+        List<RefType> classes = new ArrayList<>();
+        classes.add(getRefType());
+        Program program = new Program(classes);
+        return program;
+    }
+
+    public static RefType getRefType() {
+        FieldDecl fieldDecl0 = new FieldDecl("char", "c", null);
+        List<FieldDecl> fieldDeclList = new ArrayList<>();
+        fieldDeclList.add(fieldDecl0);
+        List<MethodDecl> methodDeclList = new ArrayList<>();
+        methodDeclList.add(method0());
+        methodDeclList.add(method1());
+        RefType charArgumentClass = new RefType("CharArgument", fieldDeclList, methodDeclList, false);
+
+        return charArgumentClass;
+    }
+
+    public static MethodDecl method0(){
+        SubReceiver subReceiver0 =new SubReceiver(true);
+        List<SubReceiver> subReceiverList0 = new ArrayList<>();
+        subReceiverList0.add(subReceiver0);
+        InstVarExpression instVarExpression0 = new InstVarExpression(subReceiverList0, new ArrayList<>(), "c");
+        CharConstantExpression charConstantExpression0 = new CharConstantExpression('a');
+        List<IExpression> argumentList0 = new ArrayList<>();
+        argumentList0.add(charConstantExpression0);
+        MethodCallStatementExpression methodCallStatementExpression0 = new MethodCallStatementExpression("foo", null, new ArrayList<>(), argumentList0);
+        AssignStatementExpression assignStatementExpression0 = new AssignStatementExpression("=", instVarExpression0,methodCallStatementExpression0);
+        List<IStatement> iStatementList0 = new ArrayList<>();
+        iStatementList0.add(assignStatementExpression0);
+        BlockStatement blockStatement0 = new BlockStatement(iStatementList0, null);
+        MethodDecl methodDecl0 =new MethodDecl("CharArgument", null,
+                "CharArgument", new ParameterList(new ArrayList<>()), blockStatement0);
+
+        return methodDecl0;
+    }
+
+    public static MethodDecl method1(){
+        ReturnStatement returnStatement0 =new ReturnStatement(new LocalVarIdentifier("c"));
+        List<IStatement> iStatementList0 =new ArrayList<>();
+        iStatementList0.add(returnStatement0);
+        BlockStatement blockStatement0 = new BlockStatement(iStatementList0, null);
+        Parameter parameter00 = new Parameter("char", "c");
+        List<Parameter> parameterList0 = new ArrayList<>();
+        parameterList0.add(parameter00);
+        ParameterList parameterListObj0 = new ParameterList(parameterList0);
+        MethodDecl methodDecl = new MethodDecl("CharArgument", "char", "foo",
+                parameterListObj0, blockStatement0);
+
+        return methodDecl;
+    }
+}

src/test/java/ASTs/ClassWithMainAST.java

@@ -0,0 +1,41 @@
+package ASTs;
+
+import abstractSyntaxTree.Class.FieldDecl;
+import abstractSyntaxTree.Class.MethodDecl;
+import abstractSyntaxTree.Class.RefType;
+import abstractSyntaxTree.Parameter.Parameter;
+import abstractSyntaxTree.Parameter.ParameterList;
+import abstractSyntaxTree.Program;
+import abstractSyntaxTree.Statement.BlockStatement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ClassWithMainAST {
+
+    public static Program getProgram() {
+        List<RefType> refTypeList = new ArrayList<>();
+        refTypeList.add(getRefType());
+        Program program = new Program(refTypeList);
+
+        return program;
+    }
+    public static RefType getRefType(){
+        List<FieldDecl> fieldDeclList = new ArrayList<>();
+        List<MethodDecl> methodDeclList = new ArrayList<>();
+        methodDeclList.add(method0());
+        RefType classWithMain = new RefType("classWithMain", fieldDeclList, methodDeclList, true);
+
+        return classWithMain;
+    }
+
+    public static MethodDecl method0(){
+        BlockStatement blockStatement = new BlockStatement(new ArrayList<>(), null);
+        List<Parameter> parameterList = new ArrayList<>();
+        ParameterList parameterListObj = new ParameterList(parameterList);
+        MethodDecl methodDecl =new MethodDecl("classWithMain", "void", "main",
+                parameterListObj, blockStatement);
+
+        return methodDecl;
+    }
+}

src/test/java/ASTs/ClassWithMainASTTyped.java

@@ -0,0 +1,40 @@
+package ASTs;
+
+import abstractSyntaxTree.Class.FieldDecl;
+import abstractSyntaxTree.Class.MethodDecl;
+import abstractSyntaxTree.Class.RefType;
+import abstractSyntaxTree.Parameter.Parameter;
+import abstractSyntaxTree.Parameter.ParameterList;
+import abstractSyntaxTree.Program;
+import abstractSyntaxTree.Statement.BlockStatement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ClassWithMainASTTyped {
+    public static Program getProgram() {
+        List<RefType> refTypeList = new ArrayList<>();
+        refTypeList.add(getRefType());
+        Program program = new Program(refTypeList);
+
+        return program;
+    }
+    public static RefType getRefType(){
+        List<FieldDecl> fieldDeclList = new ArrayList<>();
+        List<MethodDecl> methodDeclList = new ArrayList<>();
+        methodDeclList.add(method0());
+        RefType classWithMain = new RefType("classWithMain", fieldDeclList, methodDeclList, true);
+
+        return classWithMain;
+    }
+
+    public static MethodDecl method0(){
+        BlockStatement blockStatement = new BlockStatement(new ArrayList<>(), "void");
+        List<Parameter> parameterList = new ArrayList<>();
+        ParameterList parameterListObj = new ParameterList(parameterList);
+        MethodDecl methodDecl =new MethodDecl("classWithMain", "void", "main",
+                parameterListObj, blockStatement);
+
+        return methodDecl;
+    }
+}

src/test/java/ASTs/DivideByZeroAST.java

@@ -0,0 +1,30 @@
+package ASTs;
+
+import abstractSyntaxTree.Class.FieldDecl;
+import abstractSyntaxTree.Class.MethodDecl;
+import abstractSyntaxTree.Class.RefType;
+import abstractSyntaxTree.Parameter.Parameter;
+import abstractSyntaxTree.Parameter.ParameterList;
+import abstractSyntaxTree.Statement.BlockStatement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DivideByZeroAST {
+/*
+    public static RefType getRefType(){
+        List<FieldDecl> fieldDeclList = new ArrayList<>();
+        List<MethodDecl> methodDeclList = new ArrayList<>();
+        RefType refType = new RefType("DivideByZero", fieldDeclList, methodDeclList, false);
+
+        return refType;
+    }
+    public static MethodDecl method0(){
+
+        BlockStatement blockStatement = new BlockStatement();
+        List<Parameter> parameterList = new ArrayList<>();
+        ParameterList parameterListObj = new ParameterList(parameterList);
+        MethodDecl methodDecl = new MethodDecl("DivideByZero", "int", "test",
+                );
+    }*/
+}

src/test/java/ASTs/DivideByZeroASTTyped.java

@@ -0,0 +1,4 @@
+package ASTs;
+
+public class DivideByZeroASTTyped {
+}

src/test/java/ASTs/EmptyClassWithConstructorASTTyped.java

@@ -0,0 +1,31 @@
+package ASTs;
+
+import abstractSyntaxTree.Class.FieldDecl;
+import abstractSyntaxTree.Class.MethodDecl;
+import abstractSyntaxTree.Class.RefType;
+import abstractSyntaxTree.Parameter.ParameterList;
+import abstractSyntaxTree.Program;
+import abstractSyntaxTree.Statement.BlockStatement;
+import abstractSyntaxTree.Statement.IStatement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EmptyClassWithConstructorASTTyped {
+    public static Program getProgram() {
+        List<FieldDecl> fieldDeclList = new ArrayList<>();
+
+        ParameterList emptyParameterList = new ParameterList(new ArrayList<>());
+        List<IStatement> emptyIStatementList = new ArrayList<>();
+        BlockStatement emptyBlockStatement = new BlockStatement(emptyIStatementList, null);
+        MethodDecl constructor = new MethodDecl("EmptyClassWithConstructor", null, "EmptyClassWithConstructor", emptyParameterList, emptyBlockStatement);
+        List<MethodDecl> methodDeclList = new ArrayList<>();
+        methodDeclList.add(constructor);
+        RefType emptyClass = new RefType("EmptyClassWithConstructor", fieldDeclList, methodDeclList, false);
+        List<RefType> classes = new ArrayList<>();
+        classes.add(emptyClass);
+
+        Program program = new Program(classes);
+        return program;
+    }
+}

src/test/java/ASTs/FakultaetASTTyped.java

@@ -0,0 +1,105 @@
+package ASTs;
+
+import abstractSyntaxTree.Class.FieldDecl;
+import abstractSyntaxTree.Class.MethodDecl;
+import abstractSyntaxTree.Class.RefType;
+import abstractSyntaxTree.Expression.BinaryExpression;
+import abstractSyntaxTree.Expression.IntConstantExpression;
+import abstractSyntaxTree.Expression.LocalVarIdentifier;
+import abstractSyntaxTree.Parameter.Parameter;
+import abstractSyntaxTree.Parameter.ParameterList;
+import abstractSyntaxTree.Program;
+import abstractSyntaxTree.Statement.*;
+import abstractSyntaxTree.StatementExpression.AssignStatementExpression;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FakultaetASTTyped {
+    public static Program getProgram() {
+
+        String name = "Fakultaet";
+        List<FieldDecl> fieldDeclList = new ArrayList<>();
+        List<MethodDecl> methodDeclList = new ArrayList<>();
+        methodDeclList.add(method0());
+        methodDeclList.add(method1());
+        List<RefType> classes = new ArrayList<>();
+        RefType fakultaet = new RefType(name, fieldDeclList, methodDeclList, true);
+        classes.add(fakultaet);
+        Program program = new Program(classes);
+
+        return program;
+    }
+
+    private static MethodDecl method0() {
+        String classThatContainsMethod = "Fakultaet";
+        String name = "main";
+        ParameterList parameterList = new ParameterList(new ArrayList<>());
+        String returnType = "void";
+        List<IStatement> iStmtList = new ArrayList<>();
+        BlockStatement blockStatement = new BlockStatement(iStmtList, null);
+        return new MethodDecl(classThatContainsMethod, returnType, name, parameterList, blockStatement);
+    }
+
+    private static MethodDecl method1() {
+        String classThatContainsMethod = "Fakultaet";
+        String name = "fak";
+        // Parameters
+        Parameter param0 = new Parameter("int", "number");
+        List<Parameter> paramList = new ArrayList<>() {{
+            add(param0);
+        }};
+        ParameterList parameterListObj = new ParameterList(paramList);
+
+        String returnType = "int";
+
+        // Block Statement
+        List<IStatement> iStmtList0 = new ArrayList<>();
+        // If Statament
+        //condition
+        LocalVarIdentifier binExprIdentifier = new LocalVarIdentifier("number");
+        IntConstantExpression binExprIntConst = new IntConstantExpression(0);
+        BinaryExpression binExpr = new BinaryExpression("<", binExprIdentifier, binExprIntConst);
+
+        IntConstantExpression return0Expr0 = new IntConstantExpression(1);
+        ReturnStatement returnStatement0 = new ReturnStatement(return0Expr0);
+        List<IStatement> iStmtList1 = new ArrayList<>();
+        iStmtList1.add(returnStatement0);
+        BlockStatement ifStmt = new BlockStatement(iStmtList1, null);
+        IfStatement ifStatement = new IfStatement(binExpr, ifStmt);
+
+        iStmtList0.add(ifStatement);
+
+        // Expression 1
+        IntConstantExpression intConst0 = new IntConstantExpression(1);
+        LocalVarDecl localVarExpr0 = new LocalVarDecl("int", "factorial", intConst0);
+
+        iStmtList0.add(localVarExpr0);
+        // Expression 2
+        IntConstantExpression intConst1 = new IntConstantExpression(0);
+        LocalVarDecl localVarExpr1 = new LocalVarDecl("int", "i", intConst1);
+
+        iStmtList0.add(localVarExpr1);
+
+        //While Statement
+        BinaryExpression whileCondition = new BinaryExpression("<", new LocalVarIdentifier("i"), new LocalVarIdentifier("number"));
+
+        BinaryExpression whileBinExpr = new BinaryExpression("*", new LocalVarIdentifier("factorial"), new LocalVarIdentifier("i"));
+        AssignStatementExpression assignStatementExpression0 = new AssignStatementExpression("=", new LocalVarIdentifier("factorial"), whileBinExpr);
+        List<IStatement> whileBlockStmts = new ArrayList<>();
+        whileBlockStmts.add(assignStatementExpression0);
+        BlockStatement whileBlock = new BlockStatement( whileBlockStmts, null);
+
+        WhileStatement whileStatement0 = new WhileStatement(whileCondition, whileBlock);
+
+        iStmtList0.add(whileStatement0);
+
+        // Return Statement
+        LocalVarIdentifier returnIdentifier = new LocalVarIdentifier("factorial");
+        ReturnStatement returnStatement = new ReturnStatement(returnIdentifier);
+
+        iStmtList0.add(returnStatement);
+        BlockStatement blockStatement = new BlockStatement(iStmtList0, null);
+        return new MethodDecl(classThatContainsMethod, returnType, name, parameterListObj, blockStatement);
+    }
+}

src/test/java/ASTs/emptyClassASTTyped.java

@@ -0,0 +1,21 @@
+package ASTs;
+
+import abstractSyntaxTree.Class.FieldDecl;
+import abstractSyntaxTree.Class.MethodDecl;
+import abstractSyntaxTree.Class.RefType;
+import abstractSyntaxTree.Program;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class emptyClassASTTyped {
+    public static Program getEmptyProgramm() {
+        List<FieldDecl> emptyFieldDeclList = new ArrayList<>();
+        List<MethodDecl> emptyMethodDeclList = new ArrayList<>();
+        RefType emptyClass = new RefType("emptyClass", emptyFieldDeclList, emptyMethodDeclList, false);
+        List<RefType> classes = new ArrayList<>();
+        classes.add(emptyClass);
+
+        return (new Program(classes));
+    }
+}

src/test/java/ByteCode/CompareByteCodeBehaviour.java

@@ -83,6 +83,12 @@ public class CompareByteCodeBehaviour {
                     Object result1 = method1.invoke(obj1, testInputs);
                     Object result2 = method2.invoke(obj2, testInputs);
 
+                    if( (result1 == null) && (result2 == null)) {
+                        return true;
+                    }
+                    if(( result1 == null) || (result2 == null) ) {
+                        return false;
+                    }
 
                     if (!result1.equals(result2)) {
                         return false;

src/test/java/ByteCode/TestAll.java

@@ -26,33 +26,17 @@ public class TestAll {
         byteCodeBehaviourComparer = new CompareByteCodeBehaviour();
     }
 
-    public void testByteCodeFromAst(String classPath, Program abstractSyntaxTree, String className) {
-
-
-        try {
-            abstractSyntaxTree.codeGen();
-        } catch (Exception e){
-            System.out.println("Le Exception in le codegen");
-        }
-
-
-        try {
-            ClassFileLoader classLoader1 = new ClassFileLoader(classPath);
-            ClassFileLoader classLoader2 = new ClassFileLoader(className + ".class");
-
-            Class<?> class1 = classLoader1.findClass(className);
-            Class<?> class2 = classLoader2.findClass(className);
-
-            assertTrue(CompareByteCodeSyntax.haveSameBehavior(class1, class2));
-            assertTrue(byteCodeBehaviourComparer.compareMethodBehaviour(class1, class2));
-
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
+    public void testByteCodeFromAst(String correctClassFilePath, Program abstractSyntaxTree, String className) {
+        testByteCode(false, className, abstractSyntaxTree, correctClassFilePath, null);
     }
 
     public void testByteCodeFromScratch(String correctClassFilePath, String fileToComparePath, String className) {
+        testByteCode(true, className, null, correctClassFilePath, fileToComparePath);
+    }
+    public void testByteCode(boolean generateAST, String className, Program abstractSyntaxTree,
+                             String correctClassFilePath, String fileToComparePath) {
 
+        if(generateAST){
             String content = "";
             try {
                 System.out.println("Classpath: " + Path.of(fileToComparePath));
@@ -73,7 +57,8 @@ public class TestAll {
             ParseTree tree = parser.program();
 
             ASTGenerator generator = new ASTGenerator();
-        Program abstractSyntaxTree = (Program) generator.visit(tree);
+            abstractSyntaxTree = (Program) generator.visit(tree);
+        }
 
         try {
             abstractSyntaxTree.typeCheck();
@@ -128,7 +113,7 @@ public class TestAll {
     public void testFakultaet() {
         String classPath = "src/test/resources/basicClasses/Fakultaet.class";
         Program ast = emptyClassAST.getEmptyProgramm();
-        String className = "Fakultät";
+        String className = "Fakultaet";
         String javacode = "src/test/resources/basicClasses/Fakultaet.java";
         //testByteCodeFromAst(classPath, ast ,className);
         testByteCodeFromScratch(classPath, javacode, className);

src/test/java/Tokens/TestAll.java

@@ -31,4 +31,41 @@ public class TestAll {
     public void testPublicEmptyClass() throws Exception {
         testLexer.testTokens("basicClasses/PublicEmptyClass.java", "basicClasses/PublicEmptyClass.tokens");
     }
+
+    @Test
+    public void testFakultaet() throws Exception {
+        testLexer.testTokens("basicClasses/Fakultaet.java", "basicClasses/Fakultaet.tokens");
+    }
+
+    @Test
+    public void testAssignWrongType() throws Exception {
+        testLexer.testTokens("FailTests/AssignWrongType.java", "FailTests/AssignWrongType.tokens");
+    }
+
+    @Test
+    public void testBoolAssignedInt() throws Exception {
+        testLexer.testTokens("FailTests/BoolAssignedInt.java", "FailTests/BoolAssignedInt.tokens");
+    }
+
+    @Test
+    public void testDivideByZero() throws Exception {
+        testLexer.testTokens("FailTests/DivideByZero.java", "FailTests/DivideByZero.tokens");
+    }
+
+    @Test
+    public void testDuplicateFieldDeclaration() throws Exception {
+        testLexer.testTokens("FailTests/DuplicateFieldDeclaration.java", "FailTests/DuplicateFieldDeclaration.tokens");
+    }
+
+    @Test
+    public void testDuplicateMethod() throws Exception {
+        testLexer.testTokens("FailTests/DuplicateMethod.java", "FailTests/DuplicateMethod.tokens");
+    }
+
+    @Test
+    public void testFieldVar() throws Exception {
+        testLexer.testTokens("SimpleTests/FieldVar.java", "SimpleTests/FieldVar.tokens");
+    }
+
+
 }

src/test/java/Typecheck/TestAll.java

@@ -19,43 +19,98 @@ import static org.junit.Assert.fail;
 
 public class TestAll {
 
+    @Test
+    public void testClassWithMain() {
+        Program emptyClassAst = ClassWithMainAST.getProgram();
+        Program correctAST = ClassWithMainASTTyped.getProgram();
+        boolean expectedResult = true;
+        testTypeCheck(emptyClassAst, correctAST, expectedResult);
+
+    }
     @Test
     public void testEmptyClass() {
         Program emptyClassAst = emptyClassAST.getEmptyProgramm();
-        testTypeCheck(emptyClassAst, false);
+        Program correctAST = emptyClassASTTyped.getEmptyProgramm();
+        boolean expectedResult = false;
+        testTypeCheck(emptyClassAst, correctAST, expectedResult);
+
+    }
+
+    @Test
+    public void testEmptyClassWM() {
+        Program emptyClassAst = emptyClassAST.getEmptyProgramm();
+        Program correctAST = emptyClassASTTyped.getEmptyProgramm();
+        boolean expectedResult = true;
+        testTypeCheckWM(emptyClassAst, correctAST, expectedResult);
 
     }
 
     @Test
     public void testEmptyClassWithConstructor(){
         Program abstractSyntaxTree = EmptyClassWithConstructorAST.getProgram();
+        Program correctAST = EmptyClassWithConstructorASTTyped.getProgram();
+        boolean expectedResult = false;
+        testTypeCheck(abstractSyntaxTree, correctAST, expectedResult);
+    }
+
+    @Test
+    public void testEmptyClassWithConstructorWM(){
+        Program abstractSyntaxTree = EmptyClassWithConstructorAST.getProgram();
+        Program correctAST = EmptyClassWithConstructorASTTyped.getProgram();
+        boolean expectedResult = true;
+        testTypeCheckWM(abstractSyntaxTree, correctAST, expectedResult);
+    }
+
+    /*
+    @Test
+    public void testFourClasses(){
+        Program abstractSyntaxTree = getAst("src/test/resources/basicClasses/FourClasses.java");
         boolean expectedResult = false;
         testTypeCheck(abstractSyntaxTree, expectedResult);
     }
 
     @Test
-    public void testFourClasses(){
-        Program abstractSyntaxTree = getAst("test/resources/basicClasses/FourClasses.java");
+    public void testFourClassesWM(){
+        Program abstractSyntaxTree = getAst("src/test/resources/basicClasses/FourClasses.java");
         boolean expectedResult = true;
-        testTypeCheck(abstractSyntaxTree, expectedResult);
+        testTypeCheckWM(abstractSyntaxTree, expectedResult);
     }
+    */
 
     @Test
     public void testAssignWrongType(){
         Program assignWrongType = AssignWrongTypeAST.getProgram();
-        testTypeCheck(assignWrongType, false);
+        Program correctAST = AssignWrongTypeASTTyped.getProgram();
+        boolean expectedResult = false;
+        testTypeCheck(assignWrongType, correctAST,expectedResult);
+    }
+
+    @Test
+    public void testAssignWrongTypeWM(){
+        Program assignWrongType = AssignWrongTypeAST.getProgram();
+        Program correctAST = AssignWrongTypeASTTyped.getProgram();
+        boolean expectedResult = false;
+        testTypeCheckWM(assignWrongType, correctAST, expectedResult);
     }
 
     @Test
     public void testFakultaet(){
         Program assignWrongType = FakultaetAST.getProgram();
-        testTypeCheck(assignWrongType, true);
+        Program correctAST = FakultaetAST.getProgram();
+        boolean expectedResult = true;
+        testTypeCheck(assignWrongType, correctAST, expectedResult);
     }
 
 
-    public void testTypeCheck(Program abstractSyntaxTree, boolean expectedResult){
+    public void testTypeCheckWM(Program abstractSyntaxTree, Program correctAST, boolean expectedResult){
+        abstractSyntaxTree.classes.add(ClassWithMainASTTyped.getRefType());
+        correctAST.classes.add(ClassWithMainASTTyped.getRefType());
+        testTypeCheck(abstractSyntaxTree, correctAST, expectedResult);
+    }
+
+    public void testTypeCheck(Program abstractSyntaxTree, Program correctAST, boolean expectedResult){
         try {
-            TypeChecker.assertTypeCheckResult(abstractSyntaxTree, expectedResult);
+            TypeChecker.assertTypeCheckResult(abstractSyntaxTree , correctAST,expectedResult);
         } catch (Exception e) {
             fail();
         }

src/test/java/Typecheck/TypeChecker.java

@@ -1,22 +1,14 @@
 package Typecheck;
 
+import ASTs.ClassWithMainAST;
 import TypeCheck.TypeCheckResult;
 import abstractSyntaxTree.Program;
-import gen.DecafLexer;
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.Token;
-
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 
 public class TypeChecker {
     // Method to test if the TypeCheck returns the expected Result
-    static public void assertTypeCheckResult(Program programmToBeTested, boolean expectedResult) throws Exception {
+    static public void assertTypeCheckResult(Program programmToBeTested, Program correctAST, boolean expectedResult) {
         boolean actualResult;
         try {
             TypeCheckResult typeCheckResult = programmToBeTested.typeCheck();
@@ -26,5 +18,7 @@ public class TypeChecker {
         }
 
         assertEquals(expectedResult, actualResult);
+        assertEquals(programmToBeTested, correctAST);
+
     }
 }

src/test/resources/EmptyClassWithConstructor.java

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

src/test/resources/EmtpyClass.java

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

src/test/resources/FailTests/AssignWrongType.tokens

@@ -1,22 +1,23 @@
-Class
-Identifier
-OpenCurlyBracket
-Int
-Identifier
-OpenRoundBracket
-ClosedRoundBracket
-OpenCurlyBracket
-Int
-Identifier
-Assign
-IntValue
-Semicolon
-Identifier
-Assign
-Identifier
-Semicolon
-Return
-Identifier
-Semicolon
-ClosedCurlyBracket
-ClosedCurlyBracket
+Class: "class"
+Identifier: "AssignWrongType"
+OpenCurlyBracket: "{"
+Int: "int"
+Identifier: "test"
+OpenRoundBracket: "("
+ClosedRoundBracket: ")"
+OpenCurlyBracket: "{"
+Int: "int"
+Identifier: "x"
+Assign: "="
+IntValue: "1"
+Semicolon: ";"
+Identifier: "x"
+Assign: "="
+BooleanValue: "true"
+Semicolon: ";"
+Return: "return"
+Identifier: "x"
+Semicolon: ";"
+ClosedCurlyBracket: "}"
+ClosedCurlyBracket: "}"
+EOF: "<EOF>"

src/test/resources/FailTests/BoolAssignedInt.java

@@ -1,7 +1,7 @@
 class BoolAssignedInt {
 
     void foo() {
-        bool myBool = 10;
+        boolean myBool = 10;
     }
 
 }

src/test/resources/FailTests/BoolAssignedInt.tokens

@@ -1,15 +1,16 @@
-Class
-Identifier
-OpenCurlyBracket
-Void
-Identifier
-OpenRoundBracket
-ClosedRoundBracket
-OpenCurlyBracket
-Boolean
-Identifier
-Assign
-Int
-Semicolon
-ClosedCurlyBracket
-ClosedCurlyBracket
+Class: "class"
+Identifier: "BoolAssignedInt"
+OpenCurlyBracket: "{"
+Void: "void"
+Identifier: "foo"
+OpenRoundBracket: "("
+ClosedRoundBracket: ")"
+OpenCurlyBracket: "{"
+Boolean: "boolean"
+Identifier: "myBool"
+Assign: "="
+IntValue: "10"
+Semicolon: ";"
+ClosedCurlyBracket: "}"
+ClosedCurlyBracket: "}"
+EOF: "<EOF>"

src/test/resources/FailTests/DivideByZero.tokens

@@ -1,14 +1,15 @@
-Class
-Identifier
-OpenCurlyBracket
-MainMethodDecl
-OpenCurlyBracket
-Int
-Identifier
-Assign
-IntValue
-DotOperator
-IntValue
-Semicolon
-ClosedCurlyBracket
-ClosedCurlyBracket
+Class: "class"
+Identifier: "DivideByZero"
+OpenCurlyBracket: "{"
+MainMethodDecl: "public static void main(String[] args)"
+OpenCurlyBracket: "{"
+Int: "int"
+Identifier: "a"
+Assign: "="
+IntValue: "1"
+DotOperator: "/"
+IntValue: "0"
+Semicolon: ";"
+ClosedCurlyBracket: "}"
+ClosedCurlyBracket: "}"
+EOF: "<EOF>"

src/test/resources/FailTests/DuplicateFieldDeclaration.tokens

@@ -1,10 +1,11 @@
-Class
-Identifier
-OpenCurlyBracket
-Char
-Identifier
-Semicolon
-Int
-Identifier
-Semicolon
-ClosedCurlyBracket
+Class: "class"
+Identifier: "DuplicateFieldDeclaration"
+OpenCurlyBracket: "{"
+Char: "char"
+Identifier: "i"
+Semicolon: ";"
+Int: "int"
+Identifier: "i"
+Semicolon: ";"
+ClosedCurlyBracket: "}"
+EOF: "<EOF>"

src/test/resources/FailTests/DuplicateMethod.java

@@ -1,4 +1,4 @@
-Class DuplicateMethod {
+class DuplicateMethod {
 
     public void test() { }
 

src/test/resources/FailTests/DuplicateMethod.tokens

@@ -1,18 +1,19 @@
-Class
-Identifier
-OpenCurlyBrackets
-AccessModifier
-Void
-Identifier
-OpenRoundBrackets
-ClosedRoundBrackets
-OpenCurlyBrackets
-ClosedCurlyBrackets
-AccessModifier
-Void
-Identifier
-OpenRoundBrackets
-ClosedRoundBrackets
-OpenCurlyBrackets
-ClosedCurlyBrackets
-ClosedCurlyBrackets
+Class: "class"
+Identifier: "DuplicateMethod"
+OpenCurlyBracket: "{"
+AccessModifierPublic: "public"
+Void: "void"
+Identifier: "test"
+OpenRoundBracket: "("
+ClosedRoundBracket: ")"
+OpenCurlyBracket: "{"
+ClosedCurlyBracket: "}"
+AccessModifierPublic: "public"
+Void: "void"
+Identifier: "test"
+OpenRoundBracket: "("
+ClosedRoundBracket: ")"
+OpenCurlyBracket: "{"
+ClosedCurlyBracket: "}"
+ClosedCurlyBracket: "}"
+EOF: "<EOF>"

src/test/resources/SimpleTests/AutoAccessModifierField.java

@@ -1,7 +0,0 @@
-package SimpleTests;
-
-class AutoAccessModifierField {
-   
-    int autoAccess;
-    
-}

src/test/resources/SimpleTests/CharArgument.java

@@ -1,5 +1,3 @@
-package SimpleTests;
-
 class CharArgument {
 
     char c;

src/test/resources/SimpleTests/CharArgument.tokens

@@ -0,0 +1,18 @@
+Class: "class"
+Identifier: "CharArgument"
+OpenCurlyBracket: "{"
+Char: "char"
+Identifier: "c"
+Semicolon: ";"
+AccessModifierPublic: "public"
+Identifier: "CharArgument"
+OpenRoundBracket: "("
+ClosedRoundBracket: ")"
+OpenCurlyBracket: "{"
+This: "this"
+Dot: "."
+Identifier: "c"
+Assign: "="
+Identifier: "foo"
+OpenRoundBracket: "("
+w

src/test/resources/SimpleTests/FieldVar.java

@@ -0,0 +1,5 @@
+class FieldVar {
+   
+    int field;
+    
+}

src/test/resources/SimpleTests/FieldVar.tokens

@@ -0,0 +1,8 @@
+Class: "class"
+Identifier: "FieldVar"
+OpenCurlyBracket: "{"
+Int: "int"
+Identifier: "field"
+Semicolon: ";"
+ClosedCurlyBracket: "}"
+EOF: "<EOF>"

src/test/resources/basicClasses/Fakultaet.tokens

@@ -0,0 +1,55 @@
+Class: "class"
+Identifier: "Fakultaet"
+OpenCurlyBracket: "{"
+AccessModifierPublic: "public"
+Int: "int"
+Identifier: "fak"
+OpenRoundBracket: "("
+Int: "int"
+Identifier: "number"
+ClosedRoundBracket: ")"
+OpenCurlyBracket: "{"
+If: "if"
+OpenRoundBracket: "("
+Identifier: "number"
+ComparisonOperator: "<"
+IntValue: "0"
+ClosedRoundBracket: ")"
+OpenCurlyBracket: "{"
+Return: "return"
+IntValue: "1"
+Semicolon: ";"
+ClosedCurlyBracket: "}"
+Int: "int"
+Identifier: "factorial"
+Assign: "="
+IntValue: "1"
+Semicolon: ";"
+Int: "int"
+Identifier: "i"
+Assign: "="
+IntValue: "0"
+Semicolon: ";"
+While: "while"
+OpenRoundBracket: "("
+Identifier: "i"
+ComparisonOperator: "<"
+Identifier: "number"
+ClosedRoundBracket: ")"
+OpenCurlyBracket: "{"
+Identifier: "factorial"
+Assign: "="
+Identifier: "factorial"
+DotOperator: "*"
+Identifier: "i"
+Semicolon: ";"
+ClosedCurlyBracket: "}"
+Return: "return"
+Identifier: "factorial"
+Semicolon: ";"
+ClosedCurlyBracket: "}"
+MainMethodDecl: "public static void main(String[] args)"
+OpenCurlyBracket: "{"
+ClosedCurlyBracket: "}"
+ClosedCurlyBracket: "}"
+EOF: "<EOF>"