Handle alternate exptest syntax for is false and is true exp tests

jasmith-hs · jasmith-hs · commit 60e931fddf7b · 2022-12-13T14:55:35.000-05:00
diff --git a/src/main/java/com/hubspot/jinjava/el/ext/ExtendedParser.java b/src/main/java/com/hubspot/jinjava/el/ext/ExtendedParser.java
@@ -281,9 +281,10 @@ protected AstNode nonliteral() throws ScanException, ParseException {
     switch (getToken().getSymbol()) {
       case IDENTIFIER:
         String name = consumeToken().getImage();
+        Symbol lookahead = lookahead(0).getSymbol();
         if (
           getToken().getSymbol() == COLON &&
-          lookahead(0).getSymbol() == IDENTIFIER &&
+          (lookahead == IDENTIFIER || lookahead == FALSE || lookahead == TRUE) &&
           (lookahead(1).getSymbol() == LPAREN || (isPossibleExpTestOrFilter(name)))
         ) { // ns:f(...)
           consumeToken();
diff --git a/src/test/java/com/hubspot/jinjava/el/ExpressionResolverTest.java b/src/test/java/com/hubspot/jinjava/el/ExpressionResolverTest.java
@@ -602,6 +602,40 @@ public void itResolvesLazyExpressionsInNested() {
     assertThat(interpreter.getErrorsCopy()).isEmpty();
   }
 
+  @Test
+  public void itResolvesAlternateExpTestSyntax() {
+    assertThat(interpreter.render("{% if 2 is even %}yes{% endif %}")).isEqualTo("yes");
+
+    assertThat(
+        interpreter.render(
+          "{% if exptest:even.evaluate(2, ____int3rpr3t3r____) %}yes{% endif %}"
+        )
+      )
+      .isEqualTo("yes");
+    assertThat(
+        interpreter.render(
+          "{% if exptest:false.evaluate(false, ____int3rpr3t3r____) %}yes{% endif %}"
+        )
+      )
+      .isEqualTo("yes");
+  }
+
+  @Test
+  public void itResolvesAlternateExpTestSyntaxForTrueAndFalseExpTests() {
+    assertThat(
+        interpreter.render(
+          "{% if exptest:false.evaluate(false, ____int3rpr3t3r____) %}yes{% endif %}"
+        )
+      )
+      .isEqualTo("yes");
+    assertThat(
+        interpreter.render(
+          "{% if exptest:true.evaluate(true, ____int3rpr3t3r____) %}yes{% endif %}"
+        )
+      )
+      .isEqualTo("yes");
+  }
+
   public String result(String value, TestClass testClass) {
     testClass.touch();
     return value;
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/ExtendedParserTest.java b/src/test/java/com/hubspot/jinjava/el/ext/ExtendedParserTest.java
@@ -3,8 +3,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
+import com.hubspot.jinjava.lib.exptest.IsEvenExpTest;
+import com.hubspot.jinjava.lib.exptest.IsFalseExpTest;
+import com.hubspot.jinjava.lib.exptest.IsTrueExpTest;
 import de.odysseus.el.tree.impl.Builder;
+import de.odysseus.el.tree.impl.Builder.Feature;
 import de.odysseus.el.tree.impl.ast.AstBinary;
+import de.odysseus.el.tree.impl.ast.AstDot;
 import de.odysseus.el.tree.impl.ast.AstIdentifier;
 import de.odysseus.el.tree.impl.ast.AstMethod;
 import de.odysseus.el.tree.impl.ast.AstNested;
@@ -127,6 +132,39 @@ public void itParsesExpTestLikeDictionary() {
     assertThat(astNode).isInstanceOf(AstDict.class);
   }
 
+  @Test
+  public void itResolvesAlternateExpTestSyntax() {
+    AstNode regularSyntax = buildExpressionNodes("#{2 is even}");
+
+    assertThat(regularSyntax).isInstanceOf(AstMethod.class);
+    assertThat(regularSyntax.getChild(0)).isInstanceOf(AstDot.class);
+    assertThat(regularSyntax.getChild(1)).isInstanceOf(AstParameters.class);
+    AstNode alternateSyntax = buildExpressionNodes(
+      "#{exptest:even.evaluate(2, ____int3rpr3t3r____)}"
+    );
+
+    assertThat(alternateSyntax).isInstanceOf(AstMethod.class);
+    assertThat(alternateSyntax.getChild(0)).isInstanceOf(AstDot.class);
+    assertThat(alternateSyntax.getChild(1)).isInstanceOf(AstParameters.class);
+  }
+
+  @Test
+  public void itResolvesAlternateExpTestSyntaxForTrueAndFalseExpTests() {
+    AstNode falseExpTest = buildExpressionNodes(
+      "#{exptest:false.evaluate(2, ____int3rpr3t3r____)}"
+    );
+    assertThat(falseExpTest).isInstanceOf(AstMethod.class);
+    assertThat(falseExpTest.getChild(0)).isInstanceOf(AstDot.class);
+    assertThat(falseExpTest.getChild(1)).isInstanceOf(AstParameters.class);
+
+    AstNode trueExpTest = buildExpressionNodes(
+      "#{exptest:true.evaluate(2, ____int3rpr3t3r____)}"
+    );
+    assertThat(trueExpTest).isInstanceOf(AstMethod.class);
+    assertThat(trueExpTest.getChild(0)).isInstanceOf(AstDot.class);
+    assertThat(trueExpTest.getChild(1)).isInstanceOf(AstParameters.class);
+  }
+
   private void assertForExpression(
     AstNode astNode,
     String leftExpected,
@@ -164,7 +202,10 @@ private void assertLeftAndRightByOperator(
   }
 
   private AstNode buildExpressionNodes(String input) {
-    ExtendedCustomParser extendedParser = new ExtendedCustomParser(new Builder(), input);
+    ExtendedCustomParser extendedParser = new ExtendedCustomParser(
+      new Builder(Feature.METHOD_INVOCATIONS),
+      input
+    );
     extendedParser.consumeTokenExpose();
     extendedParser.consumeTokenExpose();
 
