avoid depending on hamcrest-library

also improve unit tests

Author: alb-i986

pom.xml

@@ -110,7 +110,7 @@
     <dependencies>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest-core</artifactId>
             <version>1.3</version>
         </dependency>
     </dependencies>

src/main/java/org/junit/experimental/results/ResultMatchers.java

@@ -5,8 +5,7 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.CoreMatchers.equalTo;
 
 /**
  * Matchers on a PrintableResult, to enable JUnit self-tests.
@@ -76,9 +75,9 @@ public void describeTo(Description description) {
      * contains {@code string}
      */
     public static Matcher<PrintableResult> hasFailureContaining(final String string) {
-        return new BaseMatcher<PrintableResult>() {
-            public boolean matches(Object item) {
-                return failureCount(greaterThan(0)).matches(item) && item.toString().contains(string);
+        return new TypeSafeMatcher<PrintableResult>() {
+            public boolean matchesSafely(PrintableResult item) {
+                return item.failureCount() > 0 && item.toString().contains(string);
             }
 
             public void describeTo(Description description) {

src/test/java/org/junit/tests/experimental/results/ResultMatchersTest.java

@@ -4,11 +4,15 @@
 import org.junit.experimental.results.PrintableResult;
 import org.junit.experimental.results.ResultMatchers;
 import org.junit.experimental.theories.Theory;
+import org.junit.runner.Description;
 import org.junit.runner.notification.Failure;
 
 import java.util.ArrayList;
+import java.util.Collections;
 
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 public class ResultMatchersTest {
@@ -26,14 +30,18 @@ public void hasFailuresDescriptionReflectsInput(int i) {
     }
 
     @Test
-    public void hasFailureContaining_givenNonMatchingScenario() {
+    public void hasFailureContaining_givenResultWithNoFailures() {
         PrintableResult resultWithNoFailures = new PrintableResult(new ArrayList<Failure>());
+
         assertThat(ResultMatchers.hasFailureContaining("").matches(resultWithNoFailures), is(false));
     }
 
     @Test
-    public void failureCount_nonMatchingScenario() {
-        PrintableResult resultWithNoFailures = new PrintableResult(new ArrayList<Failure>());
-        assertThat(ResultMatchers.failureCount(greaterThanOrEqualTo(3)).matches(resultWithNoFailures), is(false));
+    public void testFailureCount() {
+        PrintableResult resultWithOneFailure = new PrintableResult(Collections.singletonList(
+                new Failure(Description.EMPTY, new RuntimeException("failure 1"))));
+
+        assertThat(ResultMatchers.failureCount(equalTo(3)).matches(resultWithOneFailure), is(false));
+        assertThat(ResultMatchers.failureCount(equalTo(1)).matches(resultWithOneFailure), is(true));
     }
 }