src/test/java/semantic/EndToTypedAstTest.java

@@ -26,7 +26,10 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.junit.jupiter.api.Test;
-import semantic.exceptions.*;
+import semantic.exceptions.AlreadyDeclaredException;
+import semantic.exceptions.MultipleReturnTypes;
+import semantic.exceptions.NotDeclaredException;
+import semantic.exceptions.TypeMismatchException;
 import semantic.exceptions.NotDeclaredException;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -233,46 +236,6 @@ public class EndToTypedAstTest {
         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/johnsTests/BothTypesMustBeSame.java");
-
-        SemanticAnalyzer.generateTast(tast);
-
-        assertFalse(SemanticAnalyzer.errors.isEmpty());
-        assertEquals(3, SemanticAnalyzer.errors.size());
-        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof TypeMismatchException));
-
-    }
-
-    @Test
-    public void NoSuchType(){
-
-        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/johnsTests/ClassNotDeclared.java");
-
-        SemanticAnalyzer.generateTast(tast);
-
-        assertFalse(SemanticAnalyzer.errors.isEmpty());
-        assertEquals(1, SemanticAnalyzer.errors.size());
-        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof NotDeclaredException));
-
-    }
-
-    @Test
-    public void FieldIsNotVisible(){
-
-        ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/johnsTests/FieldIsNotVisible.java");
-
-        SemanticAnalyzer.generateTast(tast);
-
-        assertFalse(SemanticAnalyzer.errors.isEmpty());
-        assertEquals(1, SemanticAnalyzer.errors.size());
-        assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof NotVisibleException));
-
-    }
-
     // ------------------ Helpers ------------------
 
     /**

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

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

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

@@ -4,4 +4,9 @@ public class Test {
     public House1 h;
 
 
+}
+
+public class House {
+
+
 }

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

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