improved variable name

nat.pryce · nat.pryce · commit 07621ff3f2ee · 2007-07-30T13:57:58.000Z
diff --git a/hamcrest-core/src/main/java/org/hamcrest/StringDescription.java b/hamcrest-core/src/main/java/org/hamcrest/StringDescription.java
@@ -24,8 +24,8 @@ public StringDescription(Appendable out) {
      * @return
      *   The description of the object.
      */
-    public static String toString(SelfDescribing value) {
-    	return new StringDescription().appendDescriptionOf(value).toString();
+    public static String toString(SelfDescribing selfDescribing) {
+    	return new StringDescription().appendDescriptionOf(selfDescribing).toString();
     }
 
     /**
diff --git a/hamcrest-integration/src/main/java/org/hamcrest/MatcherAssert.java b/hamcrest-integration/src/main/java/org/hamcrest/MatcherAssert.java
@@ -21,4 +21,10 @@ public static <T> void assertThat(String reason, T actual, Matcher<T> matcher) {
             throw new java.lang.AssertionError(description.toString());
         }
     }
+    
+    public static void assertThat(String reason, boolean assertion) {
+    	if (!assertion) {
+    		throw new java.lang.AssertionError(reason);
+    	}
+    }
 }
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/MatcherAssertTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/MatcherAssertTest.java
@@ -16,7 +16,10 @@ public void testIncludesDescriptionOfTestedValueInErrorMessage() {
         }
         catch (AssertionError e) {
             assertEquals(expectedMessage, e.getMessage());
+            return;
         }
+        
+        fail("should have failed");
     }
 
     public void testDescriptionCanBeElided() {
@@ -30,7 +33,23 @@ public void testDescriptionCanBeElided() {
         }
         catch (AssertionError e) {
             assertEquals(expectedMessage, e.getMessage());
+            return;
         }
+        
+        fail("should have failed");
+    }
+    
+    public void testCanTestBooleanDirectly() {
+    	assertThat("reason message", true);
+    	
+    	try {
+    		assertThat("failing reason message", false);
+    	}
+    	catch (AssertionError e) {
+    		assertEquals("failing reason message", e.getMessage());
+    		return;
+    	}
+    	
+    	fail("should have failed");
     }
 }
-

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,10 @@ public static <T> void assertThat(String reason, T actual, Matcher<T> matcher) {`
`21`	`21`	`throw new java.lang.AssertionError(description.toString());`
`22`	`22`	`}`
`23`	`23`	`}`
	`24`	`+`
	`25`	`+ public static void assertThat(String reason, boolean assertion) {`
	`26`	`+ if (!assertion) {`
	`27`	`+ throw new java.lang.AssertionError(reason);`
	`28`	`+ }`
	`29`	`+ }`
`24`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,10 @@ public void testIncludesDescriptionOfTestedValueInErrorMessage() {`
`16`	`16`	`}`
`17`	`17`	`catch (AssertionError e) {`
`18`	`18`	`assertEquals(expectedMessage, e.getMessage());`
	`19`	`+ return;`
`19`	`20`	`}`
	`21`	`+`
	`22`	`+ fail("should have failed");`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`public void testDescriptionCanBeElided() {`
`@@ -30,7 +33,23 @@ public void testDescriptionCanBeElided() {`
`30`	`33`	`}`
`31`	`34`	`catch (AssertionError e) {`
`32`	`35`	`assertEquals(expectedMessage, e.getMessage());`
	`36`	`+ return;`
`33`	`37`	`}`
	`38`	`+`
	`39`	`+ fail("should have failed");`
	`40`	`+ }`
	`41`	`+`
	`42`	`+ public void testCanTestBooleanDirectly() {`
	`43`	`+ assertThat("reason message", true);`
	`44`	`+`
	`45`	`+ try {`
	`46`	`+ assertThat("failing reason message", false);`
	`47`	`+ }`
	`48`	`+ catch (AssertionError e) {`
	`49`	`+ assertEquals("failing reason message", e.getMessage());`
	`50`	`+ return;`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ fail("should have failed");`
`34`	`54`	`}`
`35`	`55`	`}`
`36`		`-`