Renamed isNull() -> nullValue(), isNotNull() -> notNullValue(). Could not use null() because it's a keyword.

joeretro · joeretro · commit 9a76267fcf8b · 2006-12-16T18:33:46.000Z
diff --git a/src/library/org/hamcrest/core/IsNull.java b/src/library/org/hamcrest/core/IsNull.java
@@ -20,14 +20,20 @@ public void describeTo(Description description) {
         description.appendText("null");
     }
 
+    /**
+     * Matches if value is null.
+     */
     @Factory
-    public static <T> Matcher<T> isNull() {
+    public static <T> Matcher<T> nullValue() {
         return new IsNull<T>();
     }
 
+    /**
+     * Matches if value is not null.
+     */
     @Factory
-    public static <T> Matcher<T> isNotNull() {
-        return not(IsNull.<T>isNull());
+    public static <T> Matcher<T> notNullValue() {
+        return not(IsNull.<T>nullValue());
     }
 }
 
diff --git a/src/unit-test/org/hamcrest/core/IsNullTest.java b/src/unit-test/org/hamcrest/core/IsNullTest.java
@@ -6,20 +6,20 @@
 import org.hamcrest.AbstractMatcherTest;
 import org.hamcrest.Matcher;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsNull.isNull;
-import static org.hamcrest.core.IsNull.isNotNull;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.hamcrest.core.IsNull.notNullValue;
 
 public class IsNullTest extends AbstractMatcherTest {
 
     protected Matcher<?> createMatcher() {
-        return isNull();
+        return nullValue();
     }
 
     public void testEvaluatesToTrueIfArgumentIsNull() {
-        assertThat(null, isNull());
-        assertThat(ANY_NON_NULL_ARGUMENT, not(isNull()));
+        assertThat(null, nullValue());
+        assertThat(ANY_NON_NULL_ARGUMENT, not(nullValue()));
 
-        assertThat(ANY_NON_NULL_ARGUMENT, isNotNull());
-        assertThat(null, not(isNotNull()));
+        assertThat(ANY_NON_NULL_ARGUMENT, notNullValue());
+        assertThat(null, not(notNullValue()));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,20 @@ public void describeTo(Description description) {`
`20`	`20`	`description.appendText("null");`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ /**`
	`24`	`+ * Matches if value is null.`
	`25`	`+ */`
`23`	`26`	`@Factory`
`24`		`- public static <T> Matcher<T> isNull() {`
	`27`	`+ public static <T> Matcher<T> nullValue() {`
`25`	`28`	`return new IsNull<T>();`
`26`	`29`	`}`
`27`	`30`
	`31`	`+ /**`
	`32`	`+ * Matches if value is not null.`
	`33`	`+ */`
`28`	`34`	`@Factory`
`29`		`- public static <T> Matcher<T> isNotNull() {`
`30`		`- return not(IsNull.<T>isNull());`
	`35`	`+ public static <T> Matcher<T> notNullValue() {`
	`36`	`+ return not(IsNull.<T>nullValue());`
`31`	`37`	`}`
`32`	`38`	`}`
`33`	`39`