Update Strman.java (shekhargulati#97)

lizho · shekhargulati · commit d0c2a10a6273 · 2017-11-10T11:29:03.000+05:30
* Update Strman.java

fix bug in between()

* Update StrmanTests.java

* Update StrmanTests.java
diff --git a/src/main/java/strman/Strman.java b/src/main/java/strman/Strman.java
@@ -115,7 +115,9 @@ public static String[] between(final String value, final String start, final Str
         validate(end, NULL_STRING_PREDICATE, () -> "'end' should be not null.");
 
         String[] parts = value.split(end);
-        return Arrays.stream(parts).map(subPart -> subPart.substring(subPart.indexOf(start) + start.length()))
+        return Arrays.stream(parts)
+                .filter(subPart -> subPart.contains(start))
+                .map(subPart -> subPart.substring(subPart.indexOf(start) + start.length()))
                 .toArray(String[]::new);
     }
 
diff --git a/src/test/java/strman/StrmanTests.java b/src/test/java/strman/StrmanTests.java
@@ -92,9 +92,9 @@ public void between_shouldReturnArrayWithStringsBetweenStartAndEnd() throws Exce
     }
 
     @Test
-    public void between_shouldReturnFullStringWhenStartAndEndDoesNotExist() throws Exception {
-        assertThat(between("[abc][def]", "{", "}"), arrayContaining("[abc][def]"));
-        assertThat(between("", "{", "}"), arrayContaining(""));
+    public void between_shouldReturnEmptyArrayWhenStartAndEndDoesNotExist() throws Exception {
+        assertThat(between("[abc][def]", "{", "}").length, equalTo(0));
+        assertThat(between("", "{", "}").length, equalTo(0));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,9 @@ public static String[] between(final String value, final String start, final Str`
`115`	`115`	`validate(end, NULL_STRING_PREDICATE, () -> "'end' should be not null.");`
`116`	`116`
`117`	`117`	`String[] parts = value.split(end);`
`118`		`- return Arrays.stream(parts).map(subPart -> subPart.substring(subPart.indexOf(start) + start.length()))`
	`118`	`+ return Arrays.stream(parts)`
	`119`	`+ .filter(subPart -> subPart.contains(start))`
	`120`	`+ .map(subPart -> subPart.substring(subPart.indexOf(start) + start.length()))`
`119`	`121`	`.toArray(String[]::new);`
`120`	`122`	`}`
`121`	`123`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,9 @@ public void between_shouldReturnArrayWithStringsBetweenStartAndEnd() throws Exce`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Test`
`95`		`- public void between_shouldReturnFullStringWhenStartAndEndDoesNotExist() throws Exception {`
`96`		`- assertThat(between("[abc][def]", "{", "}"), arrayContaining("[abc][def]"));`
`97`		`- assertThat(between("", "{", "}"), arrayContaining(""));`
	`95`	`+ public void between_shouldReturnEmptyArrayWhenStartAndEndDoesNotExist() throws Exception {`
	`96`	`+ assertThat(between("[abc][def]", "{", "}").length, equalTo(0));`
	`97`	`+ assertThat(between("", "{", "}").length, equalTo(0));`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Test`