Add More Tests

Author: rcosta358

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

@@ -666,4 +666,37 @@ void testRepeatedEqualDefinitionPropagatesIntoTernaryCondition() {
 
         assertEquals("explicit(param)", result.getValue().toString());
     }
+
+    @Test
+    void testRepeatedEqualDefinitionsPropagateIntoCompoundTernaryCondition() {
+        Expression expression = parse(
+                "mode == 2 && other == 5 && ((mode == 2 && other == 5) ? explicit(param) : start(param))");
+        ValDerivationNode result = ExpressionSimplifier.simplify(expression);
+
+        assertEquals("explicit(param)", result.getValue().toString());
+    }
+
+    @Test
+    void testRepeatedEqualDefinitionPropagatesWhenUsageComesFirst() {
+        Expression expression = parse("(mode == 2 ? explicit(param) : start(param)) && mode == 2");
+        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))");
+        ValDerivationNode result = ExpressionSimplifier.simplify(expression);
+
+        assertEquals("a(p)", result.getValue().toString());
+    }
+
+    @Test
+    void testRepeatedEqualDefinitionsPropagateIntoNestedTernaryElseBranch() {
+        Expression expression = parse("mode == 2 && other == 4 && (mode == 2 ? (other == 3 ? a(p) : b(p)) : c(p))");
+        ValDerivationNode result = ExpressionSimplifier.simplify(expression);
+
+        assertEquals("b(p)", result.getValue().toString());
+    }
 }

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

@@ -108,6 +108,26 @@ void testRepeatedEqualDefinitionCountsAsUsage() {
         assertEquals("2", result.get("mode").toString());
     }
 
+    @Test
+    void testRepeatedEqualDefinitionsInCompoundIteConditionCountAsUsage() {
+        Expression expression = parse(
+                "mode == 2 && other == 5 && ((mode == 2 && other == 5) ? explicit(param) : start(param))");
+        Map<String, Expression> result = VariableResolver.resolve(expression);
+
+        assertEquals(2, result.size(), "Compound ternary condition should count as a use of both variables");
+        assertEquals("2", result.get("mode").toString());
+        assertEquals("5", result.get("other").toString());
+    }
+
+    @Test
+    void testRepeatedEqualDefinitionCountsAsUsageBeforeDefinitionConjunct() {
+        Expression expression = parse("(mode == 2 ? explicit(param) : start(param)) && mode == 2");
+        Map<String, Expression> result = VariableResolver.resolve(expression);
+
+        assertEquals(1, result.size(), "Conjunct order should not affect repeated equality usage detection");
+        assertEquals("2", result.get("mode").toString());
+    }
+
     @Test
     void testReturnVariableIsNotSubstituted() {
         Expression expression = parse("x > 0 && #ret_1 == x");