Merge pull request hamcrest#108 from ghostd/string-contains-in-order-repeated-pattern

sf105 · sf105 · commit d25f617e8aa3 · 2016-04-06T16:19:56.000+02:00
Fix StringContainsInOrder to detect if a repeated pattern is missing
diff --git a/hamcrest-library/src/main/java/org/hamcrest/text/StringContainsInOrder.java b/hamcrest-library/src/main/java/org/hamcrest/text/StringContainsInOrder.java
@@ -22,6 +22,7 @@ public boolean matchesSafely(String s) {
             if (fromIndex == -1) {
                 return false;
             }
+            fromIndex++;
         }
         
         return true;
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,25 @@
 
 
 public class StringContainsInOrderTest extends AbstractMatcherTest {
-    StringContainsInOrder m = new StringContainsInOrder(asList("a", "b", "c"));
+    StringContainsInOrder m = new StringContainsInOrder(asList("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("substrings in order", m, "abcc");
+        assertMatches("substrings separated", m, "1a2b3c4c5");
         
+        assertDoesNotMatch("substrings in order missing a repeated pattern", m, "abc");
         assertDoesNotMatch("substrings out of order", m, "cab");
         assertDoesNotMatch("no substrings in string", m, "xyz");
         assertDoesNotMatch("substring missing", m, "ac");
         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
`@@ -22,6 +22,7 @@ public boolean matchesSafely(String s) {`
`22`	`22`	`if (fromIndex == -1) {`
`23`	`23`	`return false;`
`24`	`24`	`}`
	`25`	`+ fromIndex++;`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -7,24 +7,25 @@`
`7`	`7`
`8`	`8`
`9`	`9`	`public class StringContainsInOrderTest extends AbstractMatcherTest {`
`10`		`- StringContainsInOrder m = new StringContainsInOrder(asList("a", "b", "c"));`
	`10`	`+ StringContainsInOrder m = new StringContainsInOrder(asList("a", "b", "c", "c"));`
`11`	`11`
`12`	`12`	`@Override`
`13`	`13`	`protected Matcher<?> createMatcher() {`
`14`	`14`	`return m;`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public void testMatchesOnlyIfStringContainsGivenSubstringsInTheSameOrder() {`
`18`		`- assertMatches("substrings in order", m, "abc");`
`19`		`- assertMatches("substrings separated", m, "1a2b3c4");`
	`18`	`+ assertMatches("substrings in order", m, "abcc");`
	`19`	`+ assertMatches("substrings separated", m, "1a2b3c4c5");`
`20`	`20`
	`21`	`+ assertDoesNotMatch("substrings in order missing a repeated pattern", m, "abc");`
`21`	`22`	`assertDoesNotMatch("substrings out of order", m, "cab");`
`22`	`23`	`assertDoesNotMatch("no substrings in string", m, "xyz");`
`23`	`24`	`assertDoesNotMatch("substring missing", m, "ac");`
`24`	`25`	`assertDoesNotMatch("empty string", m, "");`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`public void testHasAReadableDescription() {`
`28`		`- assertDescription("a string containing \"a\", \"b\", \"c\" in order", m);`
	`29`	`+ assertDescription("a string containing \"a\", \"b\", \"c\", \"c\" in order", m);`
`29`	`30`	`}`
`30`	`31`	`}`