[Junit-devel] CVS: junit/src/org/junit/experimental/theories/test/imposterization PopperImposterizerTest.java, 1.1, 1.2 ThrownMatcherTest.java, 1.1, 1.2 AssumePassingTest.java, 1.1, 1.2

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

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

Modified Files:
	PopperImposterizerTest.java ThrownMatcherTest.java 
	AssumePassingTest.java 
Log Message:
No tests rely on hamcrest-all

Index: PopperImposterizerTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/imposterization/PopperImposterizerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PopperImposterizerTest.java	2 Jul 2007 18:11:03 -0000	1.1
+++ PopperImposterizerTest.java	9 Jul 2007 18:49:22 -0000	1.2
@@ -1,10 +1,10 @@
 package org.junit.experimental.theories.test.imposterization;
 
+import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
 import java.util.List;
 
-import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.junit.experimental.imposterization.PopperImposterizer;
 
@@ -13,6 +13,6 @@
 	public void canWrapImposterizedObjects() {
 		List<?> list= new PopperImposterizer(null).imposterize(List.class);
 		assertThat(new PopperImposterizer(null).imposterize(list.getClass()),
-				Matchers.notNullValue());
+				notNullValue());
 	}
 }

Index: ThrownMatcherTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/imposterization/ThrownMatcherTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ThrownMatcherTest.java	2 Jul 2007 18:11:03 -0000	1.1
+++ ThrownMatcherTest.java	9 Jul 2007 18:49:22 -0000	1.2
@@ -1,9 +1,9 @@
 package org.junit.experimental.theories.test.imposterization;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
+import static org.junit.experimental.theories.matchers.api.StringContains.containsString;
 
 import java.util.ArrayList;
 

Index: AssumePassingTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/imposterization/AssumePassingTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AssumePassingTest.java	2 Jul 2007 18:11:03 -0000	1.1
+++ AssumePassingTest.java	9 Jul 2007 18:49:22 -0000	1.2
@@ -7,7 +7,6 @@
 
 import java.util.List;
 
-import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.junit.Assume.AssumptionViolatedException;
 import org.junit.experimental.imposterization.AssumePassing;
@@ -41,8 +40,7 @@
 	@SuppressWarnings("unchecked")
 	@Test
 	public void removedParameterizedFailureWhenZeroParams() {
-		assertThat(onlyIfPassingFailures().get(0).getException(), Matchers
-				.is(AssertionError.class));
+		assertThat(onlyIfPassingFailures().get(0).getException(), is(AssertionError.class));
 	}
 
 	private List<Failure> onlyIfPassingFailures() {