[Junit-devel] CVS: junit/src/org/junit/experimental/results ResultMatchers.java, 1.1, 1.2

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/src/org/junit/experimental/results
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28163/src/org/junit/experimental/results

Modified Files:
	ResultMatchers.java 
Log Message:
No tests rely on hamcrest-all

Index: ResultMatchers.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/experimental/results/ResultMatchers.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ResultMatchers.java	2 Jul 2007 18:10:58 -0000	1.1
+++ ResultMatchers.java	9 Jul 2007 18:49:22 -0000	1.2
@@ -1,8 +1,5 @@
 package org.junit.experimental.results;
 
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.hasToString;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -25,7 +22,15 @@
 	}
 	
 	@SuppressWarnings("unchecked")
-	public static Matcher<Object> hasSingleFailureContaining(String string) {
-		return allOf(hasToString(containsString(string)), failureCountIs(1));
+	public static Matcher<Object> hasSingleFailureContaining(final String string) {
+		return new BaseMatcher<Object>() {
+			public boolean matches(Object item) {
+				return item.toString().contains(string) && failureCountIs(1).matches(item);
+			}
+
+			public void describeTo(Description description) {
+				description.appendText("has single failure containing " + string);
+			}
+		};
 	}
 }