[Junit-devel] CVS: junit/src/org/junit/experimental/theories/test/javamodel ConcreteFunctionTest.java, 1.1, 1.2 FunctionTest.java, 1.1, 1.2

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

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

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

Index: ConcreteFunctionTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/javamodel/ConcreteFunctionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ConcreteFunctionTest.java	2 Jul 2007 18:10:58 -0000	1.1
+++ ConcreteFunctionTest.java	9 Jul 2007 18:49:21 -0000	1.2
@@ -1,11 +1,10 @@
 package org.junit.experimental.theories.test.javamodel;
 
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.hasToString;
-import static org.hamcrest.Matchers.not;
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeThat;
+import static org.junit.experimental.theories.matchers.api.StringContains.containsString;
 
 import java.lang.reflect.Method;
 
@@ -71,8 +70,8 @@
 		try {
 			new ConcreteFunction(this, TO_STRING).invoke(string);
 		} catch (Exception e) {
-			assertThat(e, allOf(hasToString(containsString(string)),
-					hasToString(containsString(TO_STRING.toString()))));
+			assertThat(e.toString(), allOf(containsString(string),
+					containsString(TO_STRING.toString())));
 		}
 	}
 }

Index: FunctionTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/javamodel/FunctionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FunctionTest.java	2 Jul 2007 18:10:58 -0000	1.1
+++ FunctionTest.java	9 Jul 2007 18:49:21 -0000	1.2
@@ -1,7 +1,7 @@
 package org.junit.experimental.theories.test.javamodel;
 
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
 import org.junit.Before;
 import org.junit.Test;