fn:filter() review: adjusted signature text to state that first param…

…eter is optional * enhanced unit tests of PipelineFunctionFilterTest to also include tests using the added or "|" Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Feb 7, 2022 · ce1b19a · ce1b19a
1 parent 4e87b9c
commit ce1b19a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/placeholders/src/main/java/org/eclipse/ditto/placeholders/PipelineFunctionFilter.java b/placeholders/src/main/java/org/eclipse/ditto/placeholders/PipelineFunctionFilter.java
@@ -240,8 +240,9 @@ public Class<String> getType() {
 
         @Override
         public String getDescription() {
-            return "Specifies the value that should be taken into account for filtering. " +
-                    "It may be a constant in single or double quotes or a placeholder";
+            return "Specifies the optional value that should be taken into account for filtering. " +
+                    "It may be a constant in single or double quotes or a placeholder or may be omitted completely " +
+                    "in order to apply the filtering on the previous pipeline element instead.";
         }
 
     }

diff --git a/placeholders/src/test/java/org/eclipse/ditto/placeholders/PipelineFunctionFilterTest.java b/placeholders/src/test/java/org/eclipse/ditto/placeholders/PipelineFunctionFilterTest.java
@@ -180,6 +180,14 @@ public void filterByLike() {
         testPatternMatching("x", "*", true);
         testPatternMatching("x", "?", true);
 
+        // OR case
+        testPatternMatching("x", "x|y", true);
+        testPatternMatching("x", "y|z", false);
+        testPatternMatching("x", "y|z|x", true);
+        testPatternMatching("x", "||", false);
+        testPatternMatching("x", "y|*", true);
+        testPatternMatching("x", "?|z", true);
+
         // argument order matters
         testPatternMatching("*y", "xy", false);
         testPatternMatching("xy", "*y", true);
@@ -212,6 +220,13 @@ public void likeSucceedsWithTwoValues() {
         assertThat(underTest.apply(KNOWN_INPUT, params, expressionResolver)).contains(KNOWN_VALUE);
     }
 
+    @Test
+    public void likeSucceedsWithTwoValuesUsingOr() {
+        final String params = String.format("(\"%s\",\"%s\")", "like", "foo|bar|*value");
+
+        assertThat(underTest.apply(KNOWN_INPUT, params, expressionResolver)).contains(KNOWN_VALUE);
+    }
+
     @Test
     public void likeFailsWithTwoValues() {
         final String params = String.format("(\"%s\",\"%s\")", "like", "*elavue");