#4204 Make indexOf() and lastIndexOf() return -1 when not found

Author: stroomdev66

stroom-query/stroom-query-language/src/main/java/stroom/query/language/functions/Substring.java

@@ -188,11 +188,7 @@ public Val eval(final StoredValues storedValues, final Supplier<ChildData> child
             int start = startPos;
             int end = endPos;
 
-            if (start < 0) {
-                start = 0;
-            }
-
-            if (end < 0 || end < start || start >= value.length()) {
+            if (start < 0 || end < start || start >= value.length()) {
                 return ValString.EMPTY;
             }
 

stroom-query/stroom-query-language/src/test/java/stroom/query/language/functions/TestExpressionParser.java

@@ -499,7 +499,7 @@ void testIndexOf3() {
     void testIndexOf4() {
         compute("substring(${val1}, indexOf(${val1}, 'q'), stringLength(${val1}))",
                 Val.of("aa-bb"),
-                out -> assertThat(out.type().isError()).isTrue());
+                out -> assertThat(out.toString()).isEqualTo(""));
     }
 
     @Test
@@ -527,7 +527,7 @@ void testLastIndexOf3() {
     void testLastIndexOf4() {
         compute("substring(${val1}, lastIndexOf(${val1}, 'q'), stringLength(${val1}))",
                 Val.of("aa-bb"),
-                out -> assertThat(out.type().isError()).isTrue());
+                out -> assertThat(out.toString()).isEqualTo(""));
     }
 
     @Test