Removed alwaysFails()/alwaysPasses() matchers.

joeretro · joeretro · commit 54e0735743c7 · 2006-12-16T17:44:50.000Z
diff --git a/build.xml b/build.xml
@@ -45,6 +45,7 @@
         <mkdir dir="build/generated-code"/>
         <java classname="org.hamcrest.generator.config.XmlConfigurator"
               fork="yes"
+              failonerror="yes"
               classpath="
                 build/hamcrest-api-${version}.jar;
                 build/hamcrest-generator-${version}.jar;
diff --git a/matchers.xml b/matchers.xml
@@ -11,7 +11,6 @@
     <factory class="org.hamcrest.core.IsNull"/>
     <factory class="org.hamcrest.core.IsIn"/>
     <factory class="org.hamcrest.core.IsInstanceOf"/>
-    <factory class="org.hamcrest.core.Always"/>
     <factory class="org.hamcrest.core.DescribedAs"/>
 
     <!-- Collection -->
diff --git a/src/library/org/hamcrest/core/Always.java b/src/library/org/hamcrest/core/Always.java
diff --git a/src/unit-test/org/hamcrest/AbstractMatcherTest.java b/src/unit-test/org/hamcrest/AbstractMatcherTest.java
@@ -2,14 +2,10 @@
  */
 package org.hamcrest;
 
-import org.hamcrest.core.Always;
 import junit.framework.TestCase;
 
 public abstract class AbstractMatcherTest extends TestCase {
 
-    protected static final Matcher<Boolean> TRUE_MATCHER = Always.alwaysPasses();
-    protected static final Matcher<Boolean> FALSE_MATCHER = Always.alwaysFails();
-
     /**
      * Create an instance of the Matcher so some generic safety-net tests can be run on it.
      */
diff --git a/src/unit-test/org/hamcrest/core/AlwaysTest.java b/src/unit-test/org/hamcrest/core/AlwaysTest.java
diff --git a/src/unit-test/org/hamcrest/core/DescribedAsTest.java b/src/unit-test/org/hamcrest/core/DescribedAsTest.java
@@ -2,36 +2,36 @@
  */
 package org.hamcrest.core;
 
-import static org.hamcrest.core.Always.alwaysFails;
-import static org.hamcrest.core.Always.alwaysPasses;
+import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.core.IsAnything.anything;
 import static org.hamcrest.core.DescribedAs.describedAs;
 import org.hamcrest.AbstractMatcherTest;
 import org.hamcrest.Matcher;
 
 public class DescribedAsTest extends AbstractMatcherTest {
 
     protected Matcher<?> createMatcher() {
-        return describedAs("irrelevant", alwaysPasses());
+        return describedAs("irrelevant", anything());
     }
 
     public void testOverridesDescriptionOfOtherMatcherWithThatPassedToConstructor() {
-        Matcher m1 = describedAs("m1 description", alwaysPasses());
-        Matcher m2 = describedAs("m2 description", alwaysFails());
+        Matcher m1 = describedAs("m1 description", anything());
+        Matcher m2 = describedAs("m2 description", not(anything()));
 
         assertDescription("m1 description", m1);
         assertDescription("m2 description", m2);
     }
 
     public void testAppendsValuesToDescription() {
         Matcher m = describedAs("value 1 = %0, value 2 = %1",
-                                alwaysPasses(), 33, 97);
+                                anything(), 33, 97);
         
         assertDescription("value 1 = <33>, value 2 = <97>", m);
     }
     
     public void testDelegatesMatchingToAnotherMatcher() {
-        Matcher<Object> m1 = describedAs("irrelevant", alwaysPasses());
-        Matcher<Object> m2 = describedAs("irrelevant", alwaysFails());
+        Matcher<Object> m1 = describedAs("irrelevant", anything());
+        Matcher<Object> m2 = describedAs("irrelevant", not(anything()));
 
         assertTrue(m1.matches(new Object()));
         assertFalse(m2.matches("hi"));
diff --git a/src/unit-test/org/hamcrest/core/IsNotTest.java b/src/unit-test/org/hamcrest/core/IsNotTest.java
@@ -2,19 +2,20 @@
  */
 package org.hamcrest.core;
 
+import static org.hamcrest.core.IsEqual.equalTo;
 import org.hamcrest.AbstractMatcherTest;
 import org.hamcrest.Matcher;
 import static org.hamcrest.core.IsNot.not;
 
 public class IsNotTest extends AbstractMatcherTest {
 
     protected Matcher<?> createMatcher() {
-        return not(FALSE_MATCHER);
+        return not("something");
     }
 
     public void testEvaluatesToTheTheLogicalNegationOfAnotherMatcher() {
-        assertFalse(not(TRUE_MATCHER).matches(ARGUMENT_IGNORED));
-        assertTrue(not(FALSE_MATCHER).matches(ARGUMENT_IGNORED));
+        assertMatches("should match", not(equalTo("A")), "B");
+        assertDoesNotMatch("should not match", not(equalTo("B")), "B");
     }
 
     public void testProvidesConvenientShortcutForNotEqualTo() {
diff --git a/src/unit-test/org/hamcrest/core/IsTest.java b/src/unit-test/org/hamcrest/core/IsTest.java
@@ -8,7 +8,7 @@
 public class IsTest extends AbstractMatcherTest {
 
     protected Matcher<?> createMatcher() {
-        return is(FALSE_MATCHER);
+        return is("something");
     }
 
 	public void testJustMatchesTheSameWayTheUnderylingMatcherDoes() {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`public class IsTest extends AbstractMatcherTest {`
`9`	`9`
`10`	`10`	`protected Matcher<?> createMatcher() {`
`11`		`- return is(FALSE_MATCHER);`
	`11`	`+ return is("something");`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public void testJustMatchesTheSameWayTheUnderylingMatcherDoes() {`