#1345 fixed fn:substring-after assuming delimiter is only 1 character

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Mar 25, 2022 · 97935ad · 97935ad
1 parent 0d78e1c
commit 97935ad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/...eholders/src/main/java/org/eclipse/ditto/placeholders/PipelineFunctionSubstringAfter.java b/...eholders/src/main/java/org/eclipse/ditto/placeholders/PipelineFunctionSubstringAfter.java
@@ -44,7 +44,8 @@ public PipelineElement apply(final PipelineElement value, final String paramsInc
 
         return value.onResolved(previousStage -> {
             if (previousStage.contains(splitValue)) {
-                return PipelineElement.resolved(previousStage.substring(previousStage.indexOf(splitValue) + 1));
+                return PipelineElement.resolved(previousStage.substring(previousStage.indexOf(splitValue) +
+                        splitValue.length()));
             } else {
                 return PipelineElement.unresolved();
             }

diff --git a/...ders/src/test/java/org/eclipse/ditto/placeholders/PipelineFunctionSubstringAfterTest.java b/...ders/src/test/java/org/eclipse/ditto/placeholders/PipelineFunctionSubstringAfterTest.java
@@ -51,6 +51,11 @@ public void apply() {
         assertThat(function.apply(KNOWN_INPUT, "('" + SUBSTRING_AT + "')", expressionResolver)).contains(EXPECTED_RESULT);
     }
 
+    @Test
+    public void applyForLongerDelimiter() {
+        assertThat(function.apply(KNOWN_INPUT, "('eclipse.ditto:')", expressionResolver)).contains(EXPECTED_RESULT);
+    }
+
     @Test
     public void returnsEmptyForEmptyInput() {
         assertThat(function.apply(EMPTY_INPUT, "('" + SUBSTRING_AT + "')", expressionResolver)).isEmpty();

diff --git a/...ers/src/test/java/org/eclipse/ditto/placeholders/PipelineFunctionSubstringBeforeTest.java b/...ers/src/test/java/org/eclipse/ditto/placeholders/PipelineFunctionSubstringBeforeTest.java
@@ -51,6 +51,11 @@ public void apply() {
         assertThat(function.apply(KNOWN_INPUT, "('" + SUBSTRING_AT + "')", expressionResolver)).contains(EXPECTED_RESULT);
     }
 
+    @Test
+    public void applyForLongerDelimiter() {
+        assertThat(function.apply(KNOWN_INPUT, "(':any.thing.o')", expressionResolver)).contains(EXPECTED_RESULT);
+    }
+
     @Test
     public void returnsEmptyForEmptyInput() {
         assertThat(function.apply(EMPTY_INPUT, "('" + SUBSTRING_AT + "')", expressionResolver)).isEmpty();