Assert: checked assert validation tests

Author: RajShivu

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

@@ -161,6 +161,7 @@ private Predicate handleFunctionRefinements(RefinedFunction f, CtElement method,
         Optional<Predicate> oret = rtc.getRefinementFromAnnotation(method);
         Predicate ret = oret.orElse(new Predicate());
         ret = ret.substituteVariable("return", Keys.WILDCARD);
+        ret = ret.substituteVariable("$result", Keys.WILDCARD);// added for refinement
         f.setRefReturn(ret);
         return Predicate.createConjunction(joint, ret);
     }
@@ -180,6 +181,13 @@ public <R> void getReturnRefinements(CtReturn<R> ret) throws LJError {
                 RefinedFunction fi = rtc.getContext().getFunction(method.getSimpleName(),
                         ((CtClass<?>) method.getParent()).getQualifiedName(), method.getParameters().size());
 
+                if (fi == null)
+                    return;// null check refinement
+
+                if (fi.getRefReturn() == null) {
+                    return;
+                }
+
                 List<Variable> lv = fi.getArguments();
                 for (Variable v : lv) {
                     rtc.getContext().addVarToContext(v);

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

@@ -14,7 +14,7 @@ public void testMultipleErrorDirectory() {
         String path = "../liquidjava-example/src/main/java/testMultiple/errors";
         CommandLineLauncher.launch(path);
         Diagnostics diagnostics = Diagnostics.getInstance();
-        assertEquals(9, diagnostics.getErrors().size());// 9
+        assertEquals(9, diagnostics.getErrors().size());
     }
 
     @Test
@@ -39,7 +39,7 @@ public void testMultipleDirectory() {
         CommandLineLauncher.launch(path);
         Diagnostics diagnostics = Diagnostics.getInstance();
 
-        assertEquals(11, diagnostics.getErrors().size());// 11
+        assertEquals(11, diagnostics.getErrors().size());
         assertEquals(3, diagnostics.getWarnings().size());
     }
 }