tidying tests

hamcrest · May 28, 2014 · 5466739 · 5466739
1 parent ba93251
commit 5466739
Showing 1 changed file with 9 additions and 19 deletions.
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/StringStartsWithTest.java b/hamcrest-core/src/test/java/org/hamcrest/core/StringStartsWithTest.java
@@ -17,25 +17,15 @@ protected Matcher<?> createMatcher() {
         return stringStartsWith;
     }
 
-    public void testEvaluatesToTrueIfArgumentContainsSpecifiedSubstring() {
-        assertTrue("should be true if excerpt at beginning",
-                stringStartsWith.matches(EXCERPT + "END"));
-        assertFalse("should be false if excerpt at end",
-                stringStartsWith.matches("START" + EXCERPT));
-        assertFalse("should be false if excerpt in middle",
-                stringStartsWith.matches("START" + EXCERPT + "END"));
-        assertTrue("should be true if excerpt is at beginning and repeated",
-                stringStartsWith.matches(EXCERPT + EXCERPT));
-
-        assertFalse("should be false if excerpt is not in string",
-                stringStartsWith.matches("Something else"));
-        assertFalse("should be false if part of excerpt is at start of string",
-                stringStartsWith.matches(EXCERPT.substring(1)));
-    }
-
-    public void testEvaluatesToTrueIfArgumentIsEqualToSubstring() {
-        assertTrue("should be true if excerpt is entire string",
-                stringStartsWith.matches(EXCERPT));
+    public void testMatchesStringAtStart() {
+        assertMatches(stringStartsWith, EXCERPT + "END");
+        assertDoesNotMatch(stringStartsWith, "START" + EXCERPT);
+        assertDoesNotMatch(stringStartsWith, "START" + EXCERPT + "END");
+        assertMatches(stringStartsWith, EXCERPT);
+        assertMatches(stringStartsWith, EXCERPT + EXCERPT);
+        assertDoesNotMatch(stringStartsWith, "EXCER");
+
+        assertMismatchDescription("was \"Something else\"", stringStartsWith, "Something else");
     }
 
     public void testHasAReadableDescription() {