Fixing reject filter evaluation when it has argument(s)

src/main/java/com/hubspot/jinjava/lib/filter/RejectFilter.java

@@ -11,7 +11,9 @@
 import com.hubspot.jinjava.util.ForLoop;
 import com.hubspot.jinjava.util.ObjectIterator;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 @JinjavaDoc(
   value = "Filters a sequence of objects by applying a test to the object and rejecting the ones with the test succeeding.",
@@ -31,49 +33,20 @@
     )
   }
 )
-public class RejectFilter implements Filter {
+public class RejectFilter extends SelectFilter {
 
   @Override
   public String getName() {
     return "reject";
   }
 
   @Override
-  public Object filter(Object var, JinjavaInterpreter interpreter, String... args) {
-    List<Object> result = new ArrayList<>();
-
-    if (args.length < 1) {
-      throw new TemplateSyntaxException(
-        interpreter,
-        getName(),
-        "requires 1 argument (name of expression test to filter by)"
-      );
-    }
-
-    if (args[0] == null) {
-      throw new InvalidArgumentException(interpreter, this, InvalidReason.NULL, 0);
-    }
-
-    ExpTest expTest = interpreter.getContext().getExpTest(args[0]);
-    if (expTest == null) {
-      throw new InvalidArgumentException(
-        interpreter,
-        this,
-        InvalidReason.EXPRESSION_TEST,
-        0,
-        args[0]
-      );
-    }
-
-    ForLoop loop = ObjectIterator.getLoop(var);
-    while (loop.hasNext()) {
-      Object val = loop.next();
-
-      if (!expTest.evaluate(val, interpreter)) {
-        result.add(val);
-      }
-    }
-
-    return result;
+  boolean evaluate(
+    JinjavaInterpreter interpreter,
+    Object[] expArgs,
+    ExpTest expTest,
+    Object val
+  ) {
+    return !super.evaluate(interpreter, expArgs, expTest, val);
   }
 }

src/main/java/com/hubspot/jinjava/lib/filter/SelectFilter.java

@@ -92,11 +92,20 @@ public Object filter(
     while (loop.hasNext()) {
       Object val = loop.next();
 
-      if (expTest.evaluate(val, interpreter, expArgs)) {
+      if (evaluate(interpreter, expArgs, expTest, val)) {
         result.add(val);
       }
     }
 
     return result;
   }
+
+  boolean evaluate(
+    JinjavaInterpreter interpreter,
+    Object[] expArgs,
+    ExpTest expTest,
+    Object val
+  ) {
+    return expTest.evaluate(val, interpreter, expArgs);
+  }
 }

src/test/java/com/hubspot/jinjava/lib/filter/RejectFilterTest.java

@@ -0,0 +1,43 @@
+package com.hubspot.jinjava.lib.filter;
+
+import com.google.common.collect.Lists;
+import com.hubspot.jinjava.BaseJinjavaTest;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class RejectFilterTest extends BaseJinjavaTest {
+
+  @Before
+  public void setup() {
+    jinjava.getGlobalContext().put("numbers", Lists.newArrayList(1L, 2L, 3L, 4L, 5L));
+  }
+
+  @Test
+  public void testReject() {
+    assertThat(jinjava.render("{{numbers|reject('odd')}}", new HashMap<>()))
+      .isEqualTo("[2, 4]");
+    assertThat(jinjava.render("{{numbers|reject('even')}}", new HashMap<>()))
+      .isEqualTo("[1, 3, 5]");
+  }
+
+  @Test
+  public void testRejectWithEqualToAttr() {
+    assertThat(jinjava.render("{{numbers|reject('equalto', 3)}}", new HashMap<>()))
+      .isEqualTo("[1, 2, 4, 5]");
+  }
+
+  @Test
+  public void itThrowsInvalidArgumentForNullExpTestArgument() {
+    Map<String, Object> context = new HashMap<>();
+    context.put("test", null);
+    assertThatThrownBy(() -> jinjava.render("{{numbers|reject(test, 3)}}", context))
+      .hasMessageContaining("'exp_test' argument cannot be null");
+  }
+}