Improve Expected Pattern in Tests

liquidjava-example/src/main/java/testSuite/ErrorAfterIf.java

@@ -15,7 +15,7 @@ public void afterIf1(int a, int b) {
                 pos = b;
         }
         @Refinement("_ == a || _ == b")
-        int r = pos; // Refinement Error
+        int r = pos; // Expect: Refinement Error
     }
 
     public void afterIf2() {
@@ -26,6 +26,6 @@ public void afterIf2() {
         }
         k = 50;
         @Refinement("_ < 10")
-        int m = k; // Refinement Error
+        int m = k; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorAlias.java

@@ -14,6 +14,6 @@ public static int getNum() {
 
     public static void main(String[] args) {
         @Refinement("InRange( _, 10, 15)")
-        int j = getNum(); // Refinement Error
+        int j = getNum(); // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorAliasArgumentSize.java

@@ -8,7 +8,7 @@
 public class ErrorAliasArgumentSize {
 
     public static void main(String[] args) {
-        @Refinement("InRange(j, 10)") // Argument Mismatch Error
+        @Refinement("InRange(j, 10)") // Expect: Argument Mismatch Error
         int j = 15;
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorAliasEmptyArguments.java

@@ -8,7 +8,7 @@
 public class ErrorAliasEmptyArguments {
 
     public static void main(String[] args) {
-        @Refinement("InRange()") // Argument Mismatch Error
+        @Refinement("InRange()") // Expect: Argument Mismatch Error
         int j = 15;
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorAliasNotFound.java

@@ -5,7 +5,7 @@
 public class ErrorAliasNotFound {
 
     public static void main(String[] args) {
-        @Refinement("UndefinedAlias(x)") // Not Found Error
+        @Refinement("UndefinedAlias(x)") // Expect: Not Found Error
         int x = 5;
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorAliasSimple.java

@@ -9,6 +9,6 @@ public class ErrorAliasSimple {
 
     public static void main(String[] args) {
         @Refinement("PtGrade(_)")
-        double positiveGrade2 = 20 * 0.5 + 20 * 0.6; // Refinement Error
+        double positiveGrade2 = 20 * 0.5 + 20 * 0.6; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorAliasTypeMismatch.java

@@ -12,7 +12,7 @@ public static void main(String[] args) {
         @Refinement("PtGrade(_)")
         double positiveGrade2 = 20 * 0.5 + 20 * 0.5;
 
-        @Refinement("Positive(_)") // Argument Mismatch Error
+        @Refinement("Positive(_)") // Expect: Argument Mismatch Error
         double positive = positiveGrade2;
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorArithmeticBinaryOperations.java

@@ -8,6 +8,6 @@ public static void main(String[] args) {
         @Refinement("_ < 100")
         int y = 50;
         @Refinement("_ > 0")
-        int z = y - 51; // Refinement Error
+        int z = y - 51; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorArithmeticFP.java

@@ -7,30 +7,30 @@ public class ErrorArithmeticFP {
 
     private static void arithmetic1() {
         @Refinement("_ > 5.0")
-        double a = 5.0; // Refinement Error
+        double a = 5.0; // Expect: Refinement Error
     }
 
     private static void arithmetic2() {
         @Refinement("_ > 5.0")
         double a = 5.5;
 
         @Refinement("_ == 10.0")
-        double c = a * 2.0; // Refinement Error
+        double c = a * 2.0; // Expect: Refinement Error
     }
 
     private static void arithmetic3() {
         @Refinement("_ > 5.0")
         double a = 5.5;
 
         @Refinement("_ < -5.5")
-        double d = -a; // Refinement Error
+        double d = -a; // Expect: Refinement Error
     }
 
     private static void arithmetic4() {
         @Refinement("_ > 5.0")
         double a = 5.5;
 
         @Refinement("_ < -5.5")
-        double d = -(a - 2.0); // Refinement Error
+        double d = -(a - 2.0); // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorAssignementAfterDeclaration.java

@@ -12,6 +12,6 @@ public static void main(String[] args) {
         u = 11 + z;
         u = z * 2;
         u = 30 + z;
-        u = 500; // Refinement Error
+        u = 500; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorAssignmentBeforeReturn.java

@@ -6,6 +6,6 @@ public class ErrorAssignmentBeforeReturn {
     @Refinement("_ > 0")
     static int example(int x) {
         x = x + 1;
-        return x; // Refinement Error
+        return x; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorBoolean.java

@@ -6,6 +6,6 @@ public class ErrorBoolean {
 
     @Refinement("_ == true")
     boolean mustBeTrue(boolean value) {
-        return value; // Refinement Error
+        return value; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorBooleanFunInvocation.java

@@ -21,6 +21,6 @@ public static void main(String[] args) {
         boolean o = !(a == 12);
 
         @Refinement("_ == true")
-        boolean m = greaterThanTen(a); // Refinement Error
+        boolean m = greaterThanTen(a); // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorBooleanLiteral.java

@@ -12,6 +12,6 @@ public static void main(String[] args) {
         boolean k = (a < 11);
 
         @Refinement("_ == false")
-        boolean t = !(a == 12); // Refinement Error
+        boolean t = !(a == 12); // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorBoxedTypes.java

@@ -6,16 +6,16 @@
 public class ErrorBoxedTypes {
     public static void errorBoxedBoolean() {
         @Refinement("_ == true")
-        Boolean b = false; // Refinement Error
+        Boolean b = false; // Expect: Refinement Error
     }
 
     public static void errorBoxedInteger() {
         @Refinement("_ > 0")
-        Integer j = -1; // Refinement Error
+        Integer j = -1; // Expect: Refinement Error
     }
 
     public static void errorBoxedDouble() {
         @Refinement("_ > 0")
-        Double d = -1.0; // Refinement Error
+        Double d = -1.0; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorChars.java

@@ -8,6 +8,6 @@ static void printLetter(@Refinement("_ >= 65 && _ <= 90 || _ >= 97 && _ <= 122")
     }
 
     public static void main(String[] args) {
-        printLetter('$'); // Refinement Error
+        printLetter('$'); // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorDependentRefinement.java

@@ -10,6 +10,6 @@ public static void main(String[] args) {
         @Refinement("bigger > 20")
         int bigger = 50;
         @Refinement("_ > smaller && _ < bigger")
-        int middle = 21; // Refinement Error
+        int middle = 21; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorDependentUpperBound.java

@@ -8,6 +8,6 @@ public class ErrorDependentUpperBound {
     int nextIndex(
             @Refinement("_ > 0") int len,
             @Refinement("0 <= _ && _ < len") int i) {
-        return i + 1; // Refinement Error
+        return i + 1; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorDotNotationIncrementOnce.java

@@ -15,6 +15,6 @@ public void incrementOnce() {}
     public static void main(String[] args) {
         ErrorDotNotationIncrementOnce t = new ErrorDotNotationIncrementOnce();
         t.incrementOnce();
-        t.incrementOnce(); // State Refinement Error
+        t.incrementOnce(); // Expect: State Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorDotNotationMultiple.java

@@ -12,7 +12,7 @@ public ErrorDotNotationMultiple() {
     }
 
     public static void main(String[] args) {
-        @Refinement("_ == this.not.size()") // Syntax Error
+        @Refinement("_ == this.not.size()") // Expect: Syntax Error
         int x = 0;
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorDotNotationTrafficLight.java

@@ -21,7 +21,7 @@ public void transitionToRed() {}
     public static void main(String[] args) {
         ErrorDotNotationTrafficLight tl = new ErrorDotNotationTrafficLight();
         tl.transitionToAmber();
-        tl.transitionToGreen(); // State Refinement Error
+        tl.transitionToGreen(); // Expect: State Refinement Error
         tl.transitionToRed();
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorEnumFunctionRefinement.java

@@ -18,6 +18,6 @@ Color changeColor(@Refinement("newColor == Color.Red || newColor == Color.Green"
 	public static void main(String[] args) {
 		ErrorEnumFunctionRefinement e = new ErrorEnumFunctionRefinement();
 		e.changeColor(Color.Red);
-		e.changeColor(Color.Blue); // Refinement Error
+		e.changeColor(Color.Blue); // Expect: Refinement Error
 	}
 }

liquidjava-example/src/main/java/testSuite/ErrorEnumNegation.java

@@ -13,6 +13,6 @@ void process(@Refinement("status != Status.Inactive") Status status) {}
     public static void main(String[] args) {
         ErrorEnumNegation e = new ErrorEnumNegation();
         e.process(Status.Active);
-        e.process(Status.Inactive); // Refinement Error
+        e.process(Status.Inactive); // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorEnumNull.java

@@ -10,6 +10,6 @@ enum Color {
 
 	public static void main(String[] args) {
 		@Refinement("c == Color.Red || c == Color.Green")
-		Color c = null; // Refinement Error
+		Color c = null; // Expect: Refinement Error
 	}
 }

liquidjava-example/src/main/java/testSuite/ErrorEnumUsage.java

@@ -28,6 +28,6 @@ public static void main(String[] args) {
 		// Correct
 		ErrorEnumUsage st = new ErrorEnumUsage();
 		st.setMode(Mode.Video);
-		st.takePhoto(); // State Refinement Error
+		st.takePhoto(); // Expect: State Refinement Error
 	}
 }

liquidjava-example/src/main/java/testSuite/ErrorExtraToken.java

@@ -6,7 +6,7 @@
 public class ErrorExtraToken {
 
     void test() {
-        @Refinement("true false") // Syntax Error
+        @Refinement("true false") // Expect: Syntax Error
         int a = 1;
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorFunctionDeclarations.java

@@ -5,6 +5,6 @@
 public class ErrorFunctionDeclarations {
     @Refinement("_ >= d && _ < i")
     private static int range(@Refinement("d >= 0") int d, @Refinement("i > d") int i) {
-        return i + 1; // Refinement Error
+        return i + 1; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorFunctionInvocation.java

@@ -30,7 +30,7 @@ private static int getOne() {
 
     public static void invocation1() {
         @Refinement("_ > 10")
-        int p = 10; // Refinement Error
+        int p = 10; // Expect: Refinement Error
         p = posMult(10, 4);
     }
 
@@ -40,12 +40,12 @@ public static void invocation2() {
 
         @Refinement("_ > 0")
         int c = getOne();
-        c = getZero(); // Refinement Error
+        c = getZero(); // Expect: Refinement Error
     }
 
     public static void invocationWParams() {
         @Refinement("_ >= 0")
         int p = 10;
-        p = posMult(10, 12); // Refinement Error
+        p = posMult(10, 12); // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorGhostArgsTypes.java

@@ -7,6 +7,6 @@
 public class ErrorGhostArgsTypes {
     @Refinement("open(4.5) == true")
     public int one() {
-        return 1; // Argument Mismatch Error
+        return 1; // Expect: Argument Mismatch Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorGhostNotFound.java

@@ -5,7 +5,7 @@
 public class ErrorGhostNotFound {
 
     public static void main(String[] args) {
-        @Refinement("notFound(x)") // Not Found Error
+        @Refinement("notFound(x)") // Expect: Not Found Error
         int x = 5;
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorGhostNumberArgs.java

@@ -7,6 +7,6 @@
 public class ErrorGhostNumberArgs {
     @Refinement("open(1,2) == true")
     public int one() {
-        return 1; // Argument Mismatch Error
+        return 1; // Expect: Argument Mismatch Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorIdentity.java

@@ -6,6 +6,6 @@ public class ErrorIdentity {
 
     @Refinement("_ > 0")
     int positiveIdentity(int x) {
-        return x; // Refinement Error
+        return x; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorIfAssignment.java

@@ -12,14 +12,14 @@ public static void ifAssignment1() {
             @Refinement("b > 0")
             int b = a;
             b++;
-            a = 10; // Refinement Error
+            a = 10; // Expect: Refinement Error
         }
     }
 
     public static void ifAssignment2() {
         @Refinement("_ < 10")
         int a = 5;
         if (a < 0)
-            a = 100; // Refinement Error
+            a = 100; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorImageWriteParamModes.java

@@ -12,6 +12,6 @@ static void requireExplicit(@Refinement("_ == ImageWriteParam.MODE_EXPLICIT") in
 
     public static void main(String[] args) {
         // MODE_DEFAULT is 1, not 2 (MODE_EXPLICIT).
-        requireExplicit(ImageWriteParam.MODE_DEFAULT); // Refinement Error
+        requireExplicit(ImageWriteParam.MODE_DEFAULT); // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorImplementationSearchValueIntArray.java

@@ -12,6 +12,6 @@ public static int getIndexWithValue(
         if (l[i] == val) return i;
         if (i >= l.length) // with or without -1
         return -1;
-        else return getIndexWithValue(l, i + 1, val); // Refinement Error
+        else return getIndexWithValue(l, i + 1, val); // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorInstanceVarInRefinement.java

@@ -10,7 +10,7 @@ public static void varInRefinementInIf() {
         if (a > 0) {
             a = -2;
             @Refinement("b < a")
-            int b = -3; // Refinement Error
+            int b = -3; // Expect: Refinement Error
         }
     }
 
@@ -19,6 +19,6 @@ public static void varInRefinement() {
         int a = 6;
 
         @Refinement("_ > a")
-        int b = 9; // Refinement Error
+        int b = 9; // Expect: Refinement Error
     }
 }

liquidjava-example/src/main/java/testSuite/ErrorIntegerDivision.java

@@ -6,6 +6,6 @@ public class ErrorIntegerDivision {
 
     @Refinement("_ > 0")
     int half(@Refinement("_ > 0") int x) {
-        return x / 2; // Refinement Error
+        return x / 2; // Expect: Refinement Error
     }
 }