Split Tests

Author: rcosta358

liquidjava-verifier/src/test/java/liquidjava/rj_language/ast/ExpressionFormatterTest.java

@@ -4,17 +4,12 @@
 
 import org.junit.jupiter.api.Test;
 
-import liquidjava.rj_language.Predicate;
 import liquidjava.rj_language.parsing.RefinementsParser;
 
 class ExpressionFormatterTest {
 
     private static Expression parse(String refinement) {
-        return parse(refinement, "");
-    }
-
-    private static Expression parse(String refinement, String prefix) {
-        return RefinementsParser.createAST(refinement, prefix);
+        return RefinementsParser.createAST(refinement, "");
     }
 
     @Test
@@ -23,15 +18,6 @@ void formatsUnary() {
         assertEquals("!false", parse("!false").toDisplayString());
     }
 
-    @Test
-    void formatsInternalVariables() {
-        assertEquals("x", parse("x").toDisplayString());
-        assertEquals("x²", parse("#x_2").toDisplayString());
-        assertEquals("#fresh¹²", parse("#fresh_12").toDisplayString());
-        assertEquals("#ret³", parse("#ret_3").toDisplayString());
-        assertEquals("this#Class", parse("this#Class").toDisplayString());
-    }
-
     @Test
     void formatsEnums() {
         assertEquals("Color.RED", parse("Color.RED").toDisplayString());
@@ -103,21 +89,4 @@ void formatsTernaryExpressions() {
         assertEquals("a ? b : c", parse("a ? b : c").toDisplayString());
     }
 
-    @Test
-    void formatsWithQualifiedNames() {
-        Expression exp = new BinaryExpression(parse("size(this)", "java.util.ArrayList"), "==",
-                parse("size(this)", "java.util.ArrayDeque"));
-        assertEquals("java.util.ArrayList.size(this) == java.util.ArrayDeque.size(this)", exp.toDisplayString());
-
-        Predicate differentInstances = Predicate.createEquals(Predicate.createVar("#java.util.ArrayList.size_1"),
-                Predicate.createVar("#java.util.ArrayDeque.size_2"));
-        assertEquals("java.util.ArrayList.size¹ == java.util.ArrayDeque.size²",
-                differentInstances.getExpression().toDisplayString());
-    }
-
-    @Test
-    void formatsWithoutQualifiedNames() {
-        assertEquals("size(this)", parse("size(this)", "java.util.List").toDisplayString());
-        assertEquals("size(this) == size(this)", parse("size(this) == size(this)", "java.util.List").toDisplayString());   
-    }
 }

liquidjava-verifier/src/test/java/liquidjava/rj_language/ast/formatter/ExpressionNameResolverTest.java

@@ -0,0 +1,45 @@
+package liquidjava.rj_language.ast.formatter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import liquidjava.rj_language.Predicate;
+import liquidjava.rj_language.ast.BinaryExpression;
+import liquidjava.rj_language.ast.Expression;
+import liquidjava.rj_language.parsing.RefinementsParser;
+
+class ExpressionNameResolverTest {
+
+    private static Expression parse(String refinement, String prefix) {
+        return RefinementsParser.createAST(refinement, prefix);
+    }
+
+    @Test
+    void stripsQualifiedNamesWhenUnambiguous() {
+        ExpressionNameResolver resolver = ExpressionNameResolver
+                .forExpression(parse("size(this) == size(this)", "java.util.List"));
+
+        assertEquals("size", resolver.resolveFunction("java.util.List.size"));
+    }
+
+    @Test
+    void keepsQualifiedNamesForDifferentPrefixes() {
+        Expression expression = new BinaryExpression(parse("size(this)", "java.util.ArrayList"), "==",
+                parse("size(this)", "java.util.ArrayDeque"));
+        ExpressionNameResolver resolver = ExpressionNameResolver.forExpression(expression);
+
+        assertEquals("java.util.ArrayList.size", resolver.resolveFunction("java.util.ArrayList.size"));
+        assertEquals("java.util.ArrayDeque.size", resolver.resolveFunction("java.util.ArrayDeque.size"));
+    }
+
+    @Test
+    void keepsQualifiedNamesForDifferentInstances() {
+        Predicate differentInstances = Predicate.createEquals(Predicate.createVar("#java.util.ArrayList.size_1"),
+                Predicate.createVar("#java.util.ArrayDeque.size_2"));
+        ExpressionNameResolver resolver = ExpressionNameResolver.forExpression(differentInstances.getExpression());
+
+        assertEquals("java.util.ArrayList.size¹", resolver.resolveVariable("#java.util.ArrayList.size_1"));
+        assertEquals("java.util.ArrayDeque.size²", resolver.resolveVariable("#java.util.ArrayDeque.size_2"));
+    }
+}

liquidjava-verifier/src/test/java/liquidjava/rj_language/ast/formatter/VariableFormatterTest.java

@@ -0,0 +1,17 @@
+package liquidjava.rj_language.ast.formatter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+class VariableFormatterTest {
+
+    @Test
+    void formatsVariables() {
+        assertEquals("x", VariableFormatter.format("x"));
+        assertEquals("x²", VariableFormatter.format("#x_2"));
+        assertEquals("#fresh¹²", VariableFormatter.format("#fresh_12"));
+        assertEquals("#ret³", VariableFormatter.format("#ret_3"));
+        assertEquals("this#Class", VariableFormatter.format("this#Class"));
+    }
+}