CVS: junit/src/org/junit/experimental/theories/test/matchers CamelCaseNameTest.java, 1.1, 1.2 MatcherCharacterization.java, 1.1, 1.2 StackTraceTest.java, 1.1, 1.2 EachTest.java, 1.1, 1.2 ClassNamedMatcherTest.java, 1.1, 1.2 MethodNamedMatcherTest.java, 1.1, 1.2

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

Modified Files:
	CamelCaseNameTest.java MatcherCharacterization.java 
	StackTraceTest.java EachTest.java ClassNamedMatcherTest.java 
	MethodNamedMatcherTest.java 
Log Message:
No tests rely on hamcrest-all

Index: CamelCaseNameTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers/CamelCaseNameTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CamelCaseNameTest.java	2 Jul 2007 18:11:09 -0000	1.1
+++ CamelCaseNameTest.java	9 Jul 2007 18:49:21 -0000	1.2
@@ -1,6 +1,6 @@
 package org.junit.experimental.theories.test.matchers;
 
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import org.junit.Test;
 import org.junit.experimental.theories.matchers.api.CamelCaseName;

Index: MatcherCharacterization.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers/MatcherCharacterization.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MatcherCharacterization.java	2 Jul 2007 18:11:08 -0000	1.1
+++ MatcherCharacterization.java	9 Jul 2007 18:49:21 -0000	1.2
@@ -1,6 +1,6 @@
 package org.junit.experimental.theories.test.matchers;
 
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 import java.util.regex.Matcher;

Index: StackTraceTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers/StackTraceTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StackTraceTest.java	2 Jul 2007 18:11:09 -0000	1.1
+++ StackTraceTest.java	9 Jul 2007 18:49:21 -0000	1.2
@@ -1,9 +1,9 @@
 package org.junit.experimental.theories.test.matchers;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.hasToString;
-import static org.hamcrest.Matchers.is;
+
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
+import static org.junit.experimental.theories.matchers.api.StringContains.containsString;
 import org.junit.Test;
 import org.junit.experimental.theories.matchers.api.StackTrace;
 
@@ -32,6 +32,6 @@
 			methodNames += element.getMethodName() + ":";
 		}
 
-		assertThat(methodNames, hasToString(containsString(":<init>:")));
+		assertThat(methodNames.toString(), containsString(":<init>:"));
 	}
 }

Index: EachTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers/EachTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EachTest.java	2 Jul 2007 18:11:08 -0000	1.1
+++ EachTest.java	9 Jul 2007 18:49:21 -0000	1.2
@@ -1,14 +1,13 @@
 package org.junit.experimental.theories.test.matchers;
 
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.junit.experimental.theories.matchers.api.Each;
 
 public class EachTest {
 	@Test
 	public void eachDescription() {
-		assertThat(Each.each(Matchers.is("a")).toString(), is("each is \"a\""));
+		assertThat(Each.each(is("a")).toString(), is("each is \"a\""));
 	}
 }

Index: ClassNamedMatcherTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers/ClassNamedMatcherTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ClassNamedMatcherTest.java	2 Jul 2007 18:11:09 -0000	1.1
+++ ClassNamedMatcherTest.java	9 Jul 2007 18:49:21 -0000	1.2
@@ -3,7 +3,7 @@
  */
 package org.junit.experimental.theories.test.matchers;
 
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import org.junit.Test;
 import org.junit.experimental.theories.matchers.api.ClassNamedMatcher;

Index: MethodNamedMatcherTest.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/experimental/theories/test/matchers/MethodNamedMatcherTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MethodNamedMatcherTest.java	2 Jul 2007 18:11:09 -0000	1.1
+++ MethodNamedMatcherTest.java	9 Jul 2007 18:49:21 -0000	1.2
@@ -1,7 +1,7 @@
 package org.junit.experimental.theories.test.matchers;
 
-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.hamcrest.Matcher;
 import org.junit.Test;


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/