Passing tests

Author: alcides

liquidjava-verifier/pom.xml

@@ -74,18 +74,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>${pVersion.surefire}</version>
-				<configuration>
-					<!-- the following is required to have the same execution semantics 
-						as eclipse (hence all tests passing) -->
-					<useSystemClassLoader>false</useSystemClassLoader>
-					<forkCount>1</forkCount>
-					<argLine>-Dgumtree.match.gt.minh=1</argLine>
-					<!-- we put the tests in src/main/java so that it's easier to navigate 
-						and understand on Github (recall that's an example code project, not a production 
-						app or library ) -->
-					<testSourceDirectory>${basedir}/test/main/java/</testSourceDirectory>
-					<testClassesDirectory>${project.build.directory}/classes/</testClassesDirectory>
-				</configuration>
 			</plugin>
 
 			<plugin>

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

@@ -60,13 +60,17 @@ public static ErrorEmitter launch(String file) {
         processingManager.addProcessor(processor);
 
         System.out.println("before process");
-
-        // To only search the last package - less time spent
-        CtPackage v = factory.Package().getAll().stream().reduce((first, second) -> second).orElse(null);
-        if (v != null)
-            processingManager.process(v);
-        // To search all previous packages
-        // processingManager.process(factory.Package().getRootPackage());
+        try {
+            // To only search the last package - less time spent
+            CtPackage v = factory.Package().getAll().stream().reduce((first, second) -> second).orElse(null);
+            if (v != null)
+                processingManager.process(v);
+            // To search all previous packages
+            // processingManager.process(factory.Package().getRootPackage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw e;
+        }
 
         return ee;
     }

liquidjava-verifier/src/main/java/liquidjava/errors/ErrorHandler.java

@@ -27,7 +27,6 @@ public static <T> void printError(CtElement var, Predicate expectedType, Predica
 
     public static <T> void printError(CtElement var, String moreInfo, Predicate expectedType, Predicate cSMT,
             HashMap<String, PlacementInCode> map, ErrorEmitter errorl) {
-
         String resumeMessage = "Type expected:" + expectedType.toString(); // + "; " +"Refinement found:" +
         // cSMT.toString();
 

liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/general_checkers/MethodsFunctionsChecker.java

@@ -33,6 +33,7 @@
 import spoon.reflect.declaration.CtMethod;
 import spoon.reflect.declaration.CtParameter;
 import spoon.reflect.reference.CtExecutableReference;
+import spoon.reflect.reference.CtTypeReference;
 
 public class MethodsFunctionsChecker {
 
@@ -254,12 +255,13 @@ public RefinedFunction getRefinementFunction(String methodName, String className
     }
 
     private void searchMethodInLibrary(CtExecutableReference<?> ctr, CtInvocation<?> invocation) {
-        String ctype = "";
-        if (ctr.getDeclaringType() == null && invocation.getTarget() != null) {
+        CtTypeReference<?> ctref = ctr.getDeclaringType();
+        if (ctref == null) {
+            // Plan B: get us get the definition from the invocation.
             CtExpression<?> o = invocation.getTarget();
-            ctype = o.getType().toString();
-        } else
-            ctype = ctr.getDeclaringType().toString(); // missing
+            ctref = o.getType();
+        }
+        String ctype = (ctref != null) ? ctref.toString() : null;
 
         String name = ctr.getSimpleName(); // missing
         if (rtc.getContext().getFunction(name, ctype) != null) { // inside rtc.context

liquidjava-verifier/src/test/java/liquidjava/api/tests/TestExamples.java

@@ -6,10 +6,14 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
+import org.junit.Test;
+
 import liquidjava.api.CommandLineLauncher;
 import liquidjava.errors.ErrorEmitter;
 
 public class TestExamples {
+
+    @Test
     public void testFile() {
         try {
             Files.find(Paths.get("../liquidjava-example/src/main/java/"), Integer.MAX_VALUE,