Merge branch 'pr55' into v7.0

npryce · npryce · commit 42ea0596b8bc · 2014-12-24T14:04:08.000Z
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/StringContainsInOrder.java b/hamcrest-library/src/main/java/org/hamcrest/text/StringContainsInOrder.java
@@ -19,7 +19,7 @@ public boolean matchesSafely(String s) {
         
         for (String substring : substrings) {
             fromIndex = s.indexOf(substring, fromIndex);
-            if (fromIndex == -1) {
+            if (fromIndex++ == -1) {
                 return false;
             }
         }
diff --git a/hamcrest-library/src/test/java/org/hamcrest/text/StringContainsInOrderTest.java b/hamcrest-library/src/test/java/org/hamcrest/text/StringContainsInOrderTest.java
@@ -7,24 +7,26 @@
 
 
 public class StringContainsInOrderTest extends AbstractMatcherTest {
-    Matcher<String> m = stringContainsInOrder("a", "b", "c");
+    Matcher<String> m = stringContainsInOrder("a", "b", "c", "c");
 
     @Override
     protected Matcher<?> createMatcher() {
         return m;
     }
     
     public void testMatchesOnlyIfStringContainsGivenSubstringsInTheSameOrder() {
-        assertMatches("substrings in order", m, "abc");
-        assertMatches("substrings separated", m, "1a2b3c4");
+        assertMatches("all substrings adjacent in order", m, "abcc");
+        assertMatches("all substrings separated in order", m, "1a2b3c4c5");
         
-        assertDoesNotMatch("substrings out of order", m, "cab");
-        assertDoesNotMatch("no substrings in string", m, "xyz");
-        assertDoesNotMatch("substring missing", m, "ac");
+        assertDoesNotMatch("cumulative substring length longer than string", m, "abc");
+        assertDoesNotMatch("substrings out of order", m, "cabc");
+        assertDoesNotMatch("no substrings in string", m, "wxyz");
+        assertDoesNotMatch("substring not occurring", m, "axcc");
+        assertDoesNotMatch("substring missing", m, "acc");
         assertDoesNotMatch("empty string", m, "");
     }
     
     public void testHasAReadableDescription() {
-        assertDescription("a string containing \"a\", \"b\", \"c\" in order", m);
+        assertDescription("a string containing \"a\", \"b\", \"c\", \"c\" in order", m);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public boolean matchesSafely(String s) {`
`19`	`19`
`20`	`20`	`for (String substring : substrings) {`
`21`	`21`	`fromIndex = s.indexOf(substring, fromIndex);`
`22`		`- if (fromIndex == -1) {`
	`22`	`+ if (fromIndex++ == -1) {`
`23`	`23`	`return false;`
`24`	`24`	`}`
`25`	`25`	`}`