Add More Tests

Author: rcosta358

liquidjava-verifier/src/test/java/liquidjava/rj_language/opt/ExpressionSimplifierTest.java

@@ -684,6 +684,14 @@ void testRepeatedEqualDefinitionPropagatesWhenUsageComesFirst() {
         assertEquals("explicit(param)", result.getValue().toString());
     }
 
+    @Test
+    void testRepeatedFunctionInvocationDefinitionPropagatesIntoTernaryCondition() {
+        Expression expression = parse("modeOf(param) == 2 && (modeOf(param) == 2 ? explicit(param) : start(param))");
+        ValDerivationNode result = ExpressionSimplifier.simplify(expression);
+
+        assertEquals("explicit(param)", result.getValue().toString());
+    }
+
     @Test
     void testRepeatedEqualDefinitionsPropagateIntoNestedTernaryConditions() {
         Expression expression = parse("mode == 2 && other == 3 && (mode == 2 ? (other == 3 ? a(p) : b(p)) : c(p))");

liquidjava-verifier/src/test/java/liquidjava/rj_language/opt/VariableResolverTest.java

@@ -128,6 +128,32 @@ void testRepeatedEqualDefinitionCountsAsUsageBeforeDefinitionConjunct() {
         assertEquals("2", result.get("mode").toString());
     }
 
+    @Test
+    void testRepeatedFunctionInvocationDefinitionCountsAsUsage() {
+        Expression expression = parse("modeOf(param) == 2 && (modeOf(param) == 2 ? explicit(param) : start(param))");
+        Map<String, Expression> result = VariableResolver.resolve(expression);
+
+        assertEquals(1, result.size(), "Function invocation definition should count repeated nested equality as usage");
+        assertEquals("2", result.get("modeOf(param)").toString());
+    }
+
+    @Test
+    void testRepeatedExpressionDefinitionCountsAsUsage() {
+        Expression expression = parse("limit == max - 1 && (limit == max - 1 ? a(p) : b(p))");
+        Map<String, Expression> result = VariableResolver.resolve(expression);
+
+        assertEquals(1, result.size(), "Expression definition should count repeated nested equality as usage");
+        assertEquals("max - 1", result.get("limit").toString());
+    }
+
+    @Test
+    void testRepeatedTopLevelDefinitionsOnlyDoNotCountAsUsage() {
+        Expression expression = parse("mode == 2 && mode == 2");
+        Map<String, Expression> result = VariableResolver.resolve(expression);
+
+        assertTrue(result.isEmpty(), "Repeated top-level definitions alone should not count as usage");
+    }
+
     @Test
     void testReturnVariableIsNotSubstituted() {
         Expression expression = parse("x > 0 && #ret_1 == x");