Changed class names (EasyMock -> EasyMock2, JMock -> JMock1) for clarity.

joeretro · joeretro · commit 685e7e13debb · 2006-12-14T17:53:59.000Z
diff --git a/src/examples/org/hamcrest/examples/junit3/ExampleWithAssertThat.java b/src/examples/org/hamcrest/examples/junit3/ExampleWithAssertThat.java
@@ -2,7 +2,7 @@
 
 import junit.framework.TestCase;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isTwoXs;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.core.IsNot.not;
 import static org.hamcrest.text.StringContains.containsString;
 
@@ -15,8 +15,8 @@
 public class ExampleWithAssertThat extends TestCase {
 
     public void testUsingAssertThat() {
-        assertThat("xx", isTwoXs());
-        assertThat("yy", not(isTwoXs()));
+        assertThat("xx", equalTo("xx"));
+        assertThat("yy", not(equalTo("xx")));
         assertThat("i like cheese", containsString("cheese"));
     }
 
diff --git a/src/examples/org/hamcrest/examples/junit3/ExampleWithEasyMock2.java b/src/examples/org/hamcrest/examples/junit3/ExampleWithEasyMock2.java
@@ -1,7 +1,7 @@
 package org.hamcrest.examples.junit3;
 
 import static org.easymock.EasyMock.*;
-import static org.hamcrest.EasyMockMatchers.*;
+import static org.hamcrest.EasyMock2Matchers.*;
 import junit.framework.TestCase;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @author Joe Walnes
  */
-public class ExampleWithEasyMock extends TestCase {
+public class ExampleWithEasyMock2 extends TestCase {
 
     /* EasyMock (2) specific notes:
      *
@@ -43,8 +43,8 @@ public static interface AnInterface {
      * This examples shows using a mock with a standard EasyMock2 matcher.
      * Hamcrest is not used here.
      */
-    public void testUsingAJMockConstraint() {
-        mock.doStuff(startsWith("i like"));
+    public void testUsingAnEasyMockMatcher() {
+        mock.doStuff(eq("i like cheese and stuff"));
         replay(mock);
         mock.doStuff("i like cheese and stuff");
         verify(mock);
@@ -55,7 +55,7 @@ public void testUsingAJMockConstraint() {
      * to jMock.
      */
     public void testUsingAHamcrestMatcher() {
-        mock.doStuff(isTwoXs());
+        mock.doStuff(equalTo("xx"));
         replay(mock);
         mock.doStuff("xx");
         verify(mock);
@@ -67,8 +67,8 @@ public void testUsingAHamcrestMatcher() {
      */
     public void testUsingAssertThat() {
         // TODO(joe): This is a bit tricker with EasyMock.
-        //assertThat("xx", isTwoXs());
-        //assertThat("yy", not(isTwoXs()));
+        //assertThat("xx", equal("xx"));
+        //assertThat("yy", not(equal("xx")));
         //assertThat("i like cheese", startsWith("i like"));
     }
 
diff --git a/src/examples/org/hamcrest/examples/junit3/ExampleWithJMock1.java b/src/examples/org/hamcrest/examples/junit3/ExampleWithJMock1.java
@@ -1,6 +1,6 @@
 package org.hamcrest.examples.junit3;
 
-import static org.hamcrest.JMockMatchers.isTwoXs;
+import static org.hamcrest.JMock1Matchers.equalTo;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 
@@ -9,13 +9,16 @@
  *
  * @author Joe Walnes
  */
-public class ExampleWithJMock extends MockObjectTestCase {
+public class ExampleWithJMock1 extends MockObjectTestCase {
 
     /* jMock specific notes:
      *
      * Important terminology:
      *   What jMock calls 'Constraints', Hamcrest calls 'Matchers'.
      *
+     * Note: This is only valid for jMock1. jMock2 supports Hamcrest out
+     * of the box.
+     * 
      * The class extends org.jmock.MockObjectTestCase as usual.
      * This provides:
      *  - The mock() methods and syntactic sugar for setting up mocks.
@@ -57,7 +60,7 @@ public void testUsingAJMockConstraint() {
      */
     public void testUsingAHamcrestMatcher() {
         mock.expects(atLeastOnce()).method("doStuff")
-                .with(isTwoXs());
+                .with(equalTo("xx"));
 
         anInterface.doStuff("xx");
     }
@@ -68,8 +71,8 @@ public void testUsingAHamcrestMatcher() {
      */
     public void testUsingAssertThat() {
         assertThat("i like cheese", stringContains("cheese")); // jMock Constraint.
-        assertThat("xx", isTwoXs()); // Hamcrest Matcher.
-        assertThat("yy", not(isTwoXs())); // Mixture of both.
+        assertThat("xx", equalTo("xx")); // Hamcrest Matcher.
+        assertThat("yy", not(equalTo("xx"))); // Mixture of both.
     }
 
 }
diff --git a/src/examples/org/hamcrest/examples/junit4/ExampleWithAssertThat.java b/src/examples/org/hamcrest/examples/junit4/ExampleWithAssertThat.java
@@ -1,7 +1,7 @@
 package org.hamcrest.examples.junit4;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isTwoXs;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.core.IsNot.not;
 import static org.hamcrest.text.StringContains.containsString;
 import org.junit.Test;
@@ -16,8 +16,8 @@ public class ExampleWithAssertThat {
 
     @Test
     public void usingAssertThat() {
-        assertThat("xx", isTwoXs());
-        assertThat("yy", not(isTwoXs()));
+        assertThat("xx", equalTo("xx"));
+        assertThat("yy", not(equalTo("xx")));
         assertThat("i like cheese", containsString("cheese"));
     }
 
diff --git a/src/examples/org/hamcrest/examples/junit4/ExampleWithEasyMock2.java b/src/examples/org/hamcrest/examples/junit4/ExampleWithEasyMock2.java
@@ -1,7 +1,7 @@
 package org.hamcrest.examples.junit4;
 
 import static org.easymock.EasyMock.*;
-import static org.hamcrest.EasyMockMatchers.*;
+import static org.hamcrest.EasyMock2Matchers.*;
 import org.junit.Test;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @author Joe Walnes
  */
-public class ExampleWithEasyMock {
+public class ExampleWithEasyMock2 {
 
     /* EasyMock (2) specific notes:
      *
@@ -44,8 +44,8 @@ public static interface AnInterface {
      * Hamcrest is not used here.
      */
     @Test
-    public void usingAJMockConstraint() {
-        mock.doStuff(startsWith("i like"));
+    public void usingAnEasyMockMatcher() {
+        mock.doStuff(eq("i like cheese and stuff"));
         replay(mock);
         mock.doStuff("i like cheese and stuff");
         verify(mock);
@@ -57,7 +57,7 @@ public void usingAJMockConstraint() {
      */
     @Test
     public void usingAHamcrestMatcher() {
-        mock.doStuff(isTwoXs());
+        mock.doStuff(equalTo("xx"));
         replay(mock);
         mock.doStuff("xx");
         verify(mock);
@@ -79,6 +79,6 @@ public void usingAssertThat() {
      * Allow JUnit 4 test to be run under JUnit 3.
      */
     public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ExampleWithEasyMock.class);
+        return new junit.framework.JUnit4TestAdapter(ExampleWithEasyMock2.class);
     }
 }
diff --git a/src/examples/org/hamcrest/examples/testng/ExampleWithAssertThat.java b/src/examples/org/hamcrest/examples/testng/ExampleWithAssertThat.java
@@ -1,7 +1,7 @@
 package org.hamcrest.examples.testng;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isTwoXs;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.core.IsNot.not;
 import static org.hamcrest.text.StringContains.containsString;
 import org.testng.annotations.Test;
@@ -17,8 +17,8 @@ public class ExampleWithAssertThat {
 
     @Test
     public void usingAssertThat() {
-        assertThat("xx", isTwoXs());
-        assertThat("yy", not(isTwoXs()));
+        assertThat("xx", equalTo("xx"));
+        assertThat("yy", not(equalTo("xx")));
         assertThat("i like cheese", containsString("cheese"));
     }
 
diff --git a/src/examples/org/hamcrest/examples/testng/ExampleWithEasyMock2.java b/src/examples/org/hamcrest/examples/testng/ExampleWithEasyMock2.java
@@ -1,6 +1,6 @@
 package org.hamcrest.examples.testng;
 
-import static org.hamcrest.EasyMockMatchers.*;
+import static org.hamcrest.EasyMock2Matchers.*;
 import static org.easymock.EasyMock.*;
 import org.testng.annotations.Test;
 import org.testng.annotations.Configuration;
@@ -12,7 +12,7 @@
  * @author Joe Walnes
  */
 @Test
-public class ExampleWithEasyMock {
+public class ExampleWithEasyMock2 {
 
     /* EasyMock (2) specific notes:
      *
@@ -51,8 +51,8 @@ public void setUpMock() {
      * Hamcrest is not used here.
      */
     @Test
-    public void usingAJMockConstraint() {
-        mock.doStuff(startsWith("i like"));
+    public void usingAnEasyMockMatcher() {
+        mock.doStuff(eq("i like cheese and stuff"));
         replay(mock);
         mock.doStuff("i like cheese and stuff");
         verify(mock);
@@ -64,7 +64,7 @@ public void usingAJMockConstraint() {
      */
     @Test
     public void usingAHamcrestMatcher() {
-        mock.doStuff(isTwoXs());
+        mock.doStuff(equalTo("xx"));
         replay(mock);
         mock.doStuff("xx");
         verify(mock);
diff --git a/src/integration/org/hamcrest/EasyMock2Matchers.java b/src/integration/org/hamcrest/EasyMock2Matchers.java
@@ -0,0 +1,16 @@
+package org.hamcrest;
+
+import org.hamcrest.integration.EasyMock2Adapter;
+
+/**
+ *
+ * @author Joe Walnes
+ */
+public class EasyMock2Matchers {
+
+    public static String equalTo(String string) {
+        EasyMock2Adapter.adapt(Matchers.equalTo(string));
+        return null;
+    }
+
+}
diff --git a/src/integration/org/hamcrest/EasyMockMatchers.java b/src/integration/org/hamcrest/EasyMockMatchers.java
diff --git a/src/integration/org/hamcrest/JMock1Matchers.java b/src/integration/org/hamcrest/JMock1Matchers.java
@@ -0,0 +1,11 @@
+package org.hamcrest;
+
+import org.hamcrest.integration.JMock1Adapter;
+import org.jmock.core.Constraint;
+
+public class JMock1Matchers {
+
+    public static Constraint equalTo(String string) {
+        return JMock1Adapter.adapt(Matchers.equalTo(string));
+    }
+}
diff --git a/src/integration/org/hamcrest/JMockMatchers.java b/src/integration/org/hamcrest/JMockMatchers.java
diff --git a/src/integration/org/hamcrest/integration/EasyMock2Adapter.java b/src/integration/org/hamcrest/integration/EasyMock2Adapter.java
@@ -11,7 +11,7 @@
  *
  * @author Joe Walnes
  */
-public class EasyMockAdapter implements IArgumentMatcher {
+public class EasyMock2Adapter implements IArgumentMatcher {
 
     /**
      * Convenience factory method that will adapt a
@@ -20,14 +20,14 @@ public class EasyMockAdapter implements IArgumentMatcher {
      * report it to EasyMock so it can be kept track of.
      */
     public static IArgumentMatcher adapt(Matcher matcher) {
-        EasyMockAdapter easyMockMatcher = new EasyMockAdapter(matcher);
-        EasyMock.reportMatcher(easyMockMatcher);
-        return easyMockMatcher;
+        EasyMock2Adapter easyMock2Matcher = new EasyMock2Adapter(matcher);
+        EasyMock.reportMatcher(easyMock2Matcher);
+        return easyMock2Matcher;
     }
 
     private final Matcher hamcrestMatcher;
 
-    public EasyMockAdapter(Matcher matcher) {
+    public EasyMock2Adapter(Matcher matcher) {
         this.hamcrestMatcher = matcher;
     }
 
diff --git a/src/integration/org/hamcrest/integration/JMock1Adapter.java b/src/integration/org/hamcrest/integration/JMock1Adapter.java
@@ -6,24 +6,26 @@
 
 /**
  * An adapter to allowing a Hamcrest {@link org.hamcrest.Matcher}
- * to act as an jMock {@link org.jmock.core.Constraint}.
+ * to act as an jMock1 {@link org.jmock.core.Constraint}.
+ * Note, this is not necessary for jMock2 as it supports Hamcrest
+ * out of the box.
  *
  * @author Joe Walnes
  */
-public class JMockAdapter implements Constraint {
+public class JMock1Adapter implements Constraint {
 
     /**
      * Convenience factory method that will adapt a
      * Hamcrest {@link org.hamcrest.Matcher} to act as an
      * jMock {@link org.jmock.core.Constraint}.
      */
     public static Constraint adapt(Matcher matcher) {
-        return new JMockAdapter(matcher);
+        return new JMock1Adapter(matcher);
     }
 
     private final Matcher hamcrestMatcher;
 
-    public JMockAdapter(Matcher matcher) {
+    public JMock1Adapter(Matcher matcher) {
         this.hamcrestMatcher = matcher;
     }
 
diff --git a/src/unit-test/org/hamcrest/integration/EasyMock2AdapterTest.java b/src/unit-test/org/hamcrest/integration/EasyMock2AdapterTest.java
@@ -6,20 +6,20 @@
 import org.hamcrest.Description;
 import static org.hamcrest.core.IsEqual.equalTo;
 
-public class EasyMockAdapterTest extends TestCase {
+public class EasyMock2AdapterTest extends TestCase {
 
     public static interface InterfaceToMock {
         void doStuff(String name, int number);
     }
 
     public void testAdaptsHamcrestMatcherToEasyMockArgumentsMatcher() {
-        IArgumentMatcher easyMockMatcher = new EasyMockAdapter(equalTo("expected"));
+        IArgumentMatcher easyMockMatcher = new EasyMock2Adapter(equalTo("expected"));
         assertTrue("Should have matched", easyMockMatcher.matches("expected"));
         assertFalse("Should not have matched", easyMockMatcher.matches("unexpected"));
     }
 
     public void testDelegatesDescriptionToUnderlyingMatcher() {
-        IArgumentMatcher easyMockMatcher = new EasyMockAdapter(new BaseMatcher() {
+        IArgumentMatcher easyMockMatcher = new EasyMock2Adapter(new BaseMatcher() {
             public boolean matches(Object o) {
                 return false;
             }
diff --git a/src/unit-test/org/hamcrest/integration/JMock1AdapterTest.java b/src/unit-test/org/hamcrest/integration/JMock1AdapterTest.java
