new tests

src/test/java/codegen/CodeGeneratorTest.java

@@ -4,6 +4,7 @@ import lexer.StupsLexer;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.Lexer;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -24,6 +25,7 @@ import java.util.Map;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 class CodeGeneratorTest {
 
@@ -38,6 +40,17 @@ class CodeGeneratorTest {
         stupsGrammar = grammar;
     }
 
+    private static String readProgram(String prog) {
+        try {
+            final Path progPath = Paths.get(CodeGeneratorTest.class.getClassLoader().getResource("examplePrograms/" + prog).toURI());
+            return Files.readString(progPath);
+        } catch (URISyntaxException | IOException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
     private static AST lexParseProgram(String prog) {
         final Lexer lex = new StupsLexer(CharStreams.fromString(prog));
 
@@ -108,6 +121,16 @@ class CodeGeneratorTest {
                + ";\n\t\t} " + elseBlc + "\n\t\tSystem.out.println(i);\n\t}\n}";
     }
 
+    private static String buildLoopProgram(String expr, String condition, String body) {
+        return "class TestOutput {\n\tpublic static void main(String[] args) {\n\t\tint i = "
+               + expr
+               + ";\n\t\twhile ("
+               + condition
+               + ") {\n\t\t\t"
+               + body
+               + ";\n\t\t}\n\t\tSystem.out.println(i);\n\t}\n}";
+    }
+
     private static String buildLogicProgram(String expr) {
         return "class TestOutput {\n\tpublic static void main(String[] args) {\n\t\tboolean b = "
                + expr
@@ -186,6 +209,29 @@ class CodeGeneratorTest {
         );
     }
 
+    public static Stream<Arguments> compileLoopProgramsArgs() {
+        return Stream.of(
+                Arguments.of("0", "i <= 5", "System.out.println(i); i = i + 1", "0\n1\n2\n3\n4\n5\n6"),
+                Arguments.of("5 - 9", "i != 0", "System.out.println(i); i = i + 1", "-4\n-3\n-2\n-1\n0"),
+                Arguments.of("0", "i < 0", "System.out.println(i); i = i + 1", "0"),
+                Arguments.of("2", "i <= 5", "System.out.println(i); i = i * i", "2\n4\n16")
+        );
+    }
+
+    public static Stream<Arguments> compileProgramsArgs() {
+        return Stream.of(
+                Arguments.of("EmptyMain.stups", ""), // 1
+                Arguments.of("GeneralComment.stups", "Test"),
+                Arguments.of("GeneralIfElse.stups", "x ist kleiner als y.\nx und y sind gleich gross."),
+                Arguments.of("Println.stups", "Hey\ntrue\n5\n1\nHey\nfalse"),
+                Arguments.of("CompileAllInOne1.stups", "0\nfalse\nELSE"), // 5
+                Arguments.of("Fibonacci.stups", "1\n2\n3\n5\n8\n13\n21\n34"),
+                Arguments.of("Factorial.stups", "1\n2\n6\n24\n120"),
+                Arguments.of("Squares.stups", "1\n4\n9\n16\n25\n36\n49\n64\n81\n100"),
+                Arguments.of("Multiplication.stups", "5\n10\n15\n20")
+        );
+    }
+
     @ParameterizedTest
     @MethodSource("compileArithmeticProgramsArgs")
     void compileArithmeticProgramsTest(String prog, int result) {
@@ -230,4 +276,45 @@ class CodeGeneratorTest {
         compileJasmin(srcProg.toString());
         assertThat(Boolean.parseBoolean(executeCompiledProgram())).isEqualTo(result);
     }
+
+    @ParameterizedTest
+    @MethodSource("compileLoopProgramsArgs")
+    void compileLoopProgramsTest(String expr, String condition, String body, String result) {
+        final String program = buildLoopProgram(expr, condition, body);
+        System.out.println(program);
+
+        final AST tree = lexParseProgram(program);
+        final Map<ASTNode, String> nodeTable = TypeChecker.validate(tree);
+        final CodeGenerator gen = CodeGenerator.fromAST(tree, nodeTable);
+        final StringBuilder srcProg = gen.generateCode("TestOutput");
+
+        compileJasmin(srcProg.toString());
+        assertThat(executeCompiledProgram()).isEqualTo(result);
+    }
+
+    @ParameterizedTest
+    @MethodSource("compileProgramsArgs")
+    void compileProgramsTest(String prog, String result) {
+        final String program = readProgram(prog);
+        System.out.print(program);
+
+        final AST tree = lexParseProgram(program);
+        final Map<ASTNode, String> nodeTable = TypeChecker.validate(tree);
+        final CodeGenerator gen = CodeGenerator.fromAST(tree, nodeTable);
+        final StringBuilder srcProg = gen.generateCode("TestOutput");
+
+        compileJasmin(srcProg.toString());
+        assertThat(executeCompiledProgram()).isEqualTo(result);
+    }
+
+    @Test
+    void compileEmptyProgramTest() {
+        final String program = readProgram("EmptyFile.stups");
+
+        final AST tree = lexParseProgram(program);
+        final Map<ASTNode, String> nodeTable = TypeChecker.validate(tree);
+        final CodeGenerator gen = CodeGenerator.fromAST(tree, nodeTable);
+
+        assertThatThrownBy(() -> gen.generateCode("TestOutput")).isInstanceOf(CodeGenerationException.class);
+    }
 }

src/test/resources/examplePrograms/CompileAllInOne1.stups

@@ -0,0 +1,25 @@
+class TestOutput {
+    public static void main(String[] args) {
+        int a = 5;
+        int b = 10;
+        int i = a * b - 4 * b;
+        boolean bo = false && true;
+        String s = "";
+
+        while (i > 0) {
+            if (i % 2 == 1) {
+                bo = !bo && true;
+                s = "TRUE";
+            } else {
+                i = i - 1;
+                s = "ELSE";
+            }
+
+            i = i - 1;
+        }
+
+        System.out.println(i);
+        System.out.println(bo);
+        System.out.println(s);
+    }
+}

src/test/resources/examplePrograms/DanglingElse.stups

@@ -1,10 +0,0 @@
-class DanglingElse {
-
-    public static void main(String[] args) {
-        if (expr) {
-            expr;
-        } else {
-            expr;
-        }
-    }
-}

src/test/resources/examplePrograms/DeclarationAssignment.stups

@@ -1,4 +1,4 @@
-class WhileClass {
+class TestOutput {
 
     public static void main(String[] args) {
 

src/test/resources/examplePrograms/EmptyMain.stups

@@ -1,6 +1,6 @@
-class EmptyClass {
+class TestOutput {
 
     public static void main(String[] args) {
-        
+
     }
 }

src/test/resources/examplePrograms/ExistingSymbol.stups

@@ -1,4 +1,4 @@
-class SingleSymbol {
+class TestOutput {
     public static void main(String[] args) {
         int i = 0;
         String i = "Hi";

src/test/resources/examplePrograms/ExistingSymbol2.stups

@@ -1,4 +1,4 @@
-class SingleSymbol {
+class TestOutput {
     public static void main(String[] args) {
         int i = 0;
         i = 1;

src/test/resources/examplePrograms/Expr.stups

@@ -1,4 +1,4 @@
-class MyClass {
+class TestOutput {
 
     public static void main(String[] args) {
         // Integer

src/test/resources/examplePrograms/Factorial.stups

@@ -0,0 +1,12 @@
+class TestOutput {
+    public static void main(String[] args) {
+        int i = 1;
+        int fac = 1;
+
+        while (i <= 5) {
+            fac = fac * i;
+            i = i + 1;
+            System.out.println(fac);
+        }
+    }
+}

src/test/resources/examplePrograms/FailingEmptyParExpr2.stups

@@ -1,4 +1,4 @@
-class MyClass {
+class TestOutput {
     public static void main(String[] args) {
         i = 1 * ();
     }

src/test/resources/examplePrograms/Fibonacci.stups

@@ -0,0 +1,14 @@
+class TestOutput {
+    public static void main(String[] args) {
+        int old = 0;
+        int new = 1;
+
+        while (new < 25) {
+            int temp = new;
+            new = new + old;
+            old = temp;
+
+            System.out.println(new);
+        }
+    }
+}

src/test/resources/examplePrograms/GeneralComment.stups

@@ -1,5 +1,5 @@
 // Tolle Testklasse
-class CommentClass {
+class TestOutput {
 
     // Das ist ein Kommentar
     public static void main(String[] args) {

src/test/resources/examplePrograms/GeneralIfElse.stups

@@ -1,4 +1,4 @@
-class IfElseClass {
+class TestOutput {
 
     public static void main(String[] args) {
         int x = 5;

src/test/resources/examplePrograms/GeneralOperator.stups

@@ -1,4 +1,4 @@
-class MyClass {
+class TestOutput {
     public static void main(String[] args) {
         int a = 1 + 2 * 3;
     }

src/test/resources/examplePrograms/GeneralWhile.stups

@@ -1,4 +1,4 @@
-class WhileClass {
+class TestOutput {
 
     public static void main(String[] args) {
         int a = 1;

src/test/resources/examplePrograms/MultipleDeclarations.stups

@@ -1,4 +1,4 @@
-class WhileClass {
+class TestOutput {
 
     public static void main(String[] args) {
 

src/test/resources/examplePrograms/MultipleSymbol.stups

@@ -1,4 +1,4 @@
-class SingleSymbol {
+class TestOutput {
     public static void main(String[] args) {
         int i = 0;
         int ii = 0;

src/test/resources/examplePrograms/Multiplication.stups

@@ -0,0 +1,13 @@
+class TestOutput {
+    public static void main(String[] args) {
+        int a = 4;
+        int b = 5;
+        int result = 0;
+
+        while (a > 0) {
+            result = result + b;
+            a = a - 1;
+            System.out.println(result);
+        }
+    }
+}

src/test/resources/examplePrograms/Println.stups

@@ -1,4 +1,4 @@
-class MyClass {
+class TestOutput {
     public static void main(String[] args) {
         int x = 1;
         String y = "Hey";

src/test/resources/examplePrograms/SingleSymbol.stups

@@ -1,4 +1,4 @@
-class SingleSymbol {
+class TestOutput {
     public static void main(String[] args) {
         int i = 0;
     }

src/test/resources/examplePrograms/Squares.stups

@@ -0,0 +1,10 @@
+class TestOutput {
+    public static void main(String[] args) {
+        int i = 1;
+
+        while (i <= 10) {
+            System.out.println(i * i);
+            i = i + 1;
+        }
+    }
+}