Merged with mster

Author: alcides

README.md

@@ -28,8 +28,13 @@ You can find out more about LiquidJava in the following resources:
 
 ## Setup the project
 1. Clone the repository;
+<<<<<<< HEAD
 2. Open Eclipse and do `Ìmport...\ Existing Maven Project` selecting the current folder and waiting for the build process to finish (bottom right update bar)
 3. Select the current folder, right click it and select `Run as...\Maven install...`
+=======
+2. Open Eclipse and do `Ìmport...\ Existing Maven Project` selecting the project folder `liquidjava` and waiting for the build process to finish (bottom right update bar)
+3. Select the `liquidjava-umbrella` folder, right click it and select `Run as...\Maven install...`
+>>>>>>> 8f871c3c15eaf408a01354a867e71466d45115be
 4. If inside the `liquidjava-verifier` build path there is not a `target/generated-sources/antr4`: Select `liquidjava-verifier`, on right-click, go to `Build Path\Link Source...` and browse for `liquidjava-verifier\target\generated-sources\antlr4` and select `Finish`
 
 ## Run verification

liquidjava-api/pom.xml

@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
+			<version>4.13.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

liquidjava-verifier/src/main/java/liquidjava/api/CommandLineLauncher.java

@@ -26,14 +26,15 @@ public static void main(String[] args) {
         }
     }
 
-    public static void launchTest(String file) {
+    public static ErrorEmitter launchTest(String file) {
         ErrorEmitter ee = launch(file);
         if (ee.foundError()) {
             System.out.println(ee.getFullMessage());
-            System.exit(ee.getErrorStatus());
+            // System.exit(ee.getErrorStatus());
         } else {
             System.out.println("Analysis complete!");
         }
+        return ee;
     }
 
     public static ErrorEmitter launch(String file) {

liquidjava-verifier/src/main/java/liquidjava/api/tests/TestAbstract.java

@@ -4,38 +4,20 @@
 
 import java.security.Permission;
 import liquidjava.api.CommandLineLauncher;
+import liquidjava.errors.ErrorEmitter;
 
 public abstract class TestAbstract {
     String testPath = "../liquidjava-example/src/test/java/liquidjava/";
 
     protected void testCorrect(String filename) {
-        try {
-            CommandLineLauncher.launchTest(filename);
-        } catch (SecurityException e) {
+        ErrorEmitter errorEmitter = CommandLineLauncher.launchTest(filename);
+        if (errorEmitter.foundError())
             fail();
-        }
     }
 
     protected void testWrong(String filename) {
-        try {
-            CommandLineLauncher.launchTest(filename);
-        } catch (SecurityException e) {
-            return;
-        }
-        fail();
-    }
-
-    class MySecurityManager extends SecurityManager {
-        // Handles exit(1) when the refinements are not respected
-        @Override
-        public void checkExit(int status) {
-            if (status == 1 || status == 2)
-                throw new SecurityException("subtyping");
-        }
-
-        @Override
-        public void checkPermission(Permission perm) {
-            // Allow other activities by default
-        }
+        ErrorEmitter errorEmitter = CommandLineLauncher.launchTest(filename);
+        if (!errorEmitter.foundError())
+            fail();
     }
 }