Added optional description to assertThat to make error messages clearer when tests have more than one assertion

nat.pryce · nat.pryce · commit a5a909009fde · 2007-02-28T21:40:37.000Z
diff --git a/.classpath b/.classpath
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="hamcrest-api/src/main/java"/>
+	<classpathentry kind="src" path="build/generated-code"/>
 	<classpathentry kind="src" path="hamcrest-generator/src/main/java"/>
 	<classpathentry kind="src" path="hamcrest-examples/src/main/java"/>
 	<classpathentry kind="src" path="hamcrest-integration/src/main/java"/>
 	<classpathentry kind="src" path="hamcrest-library/src/main/java"/>
 	<classpathentry kind="src" path="hamcrest-unit-test/src/main/java"/>
 	<classpathentry kind="lib" path="lib/integration/easymock-2.2.jar"/>
 	<classpathentry kind="lib" path="lib/integration/jmock-1.10RC1.jar"/>
-	<classpathentry kind="lib" path="lib/integration/junit-3.8.1.jar"/>
 	<classpathentry kind="lib" path="lib/integration/junit-4.0.jar"/>
 	<classpathentry kind="lib" path="lib/integration/testng-4.6-jdk15.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
diff --git a/hamcrest-integration/src/main/java/org/hamcrest/MatcherAssert.java b/hamcrest-integration/src/main/java/org/hamcrest/MatcherAssert.java
@@ -4,15 +4,18 @@
 
 
 public class MatcherAssert {
-
     public static <T> void assertThat(T actual, Matcher<T> matcher) {
+        assertThat("", actual, matcher);
+    }
+    
+    public static <T> void assertThat(String name, T actual, Matcher<T> matcher) {
         if (!matcher.matches(actual)) {
             Description description = new StringDescription();
+            description.appendText(name);
             description.appendText("\nExpected: ");
             matcher.describeTo(description);
-            description.appendText("\n    got : ").appendValue(actual).appendText("\n");
+            description.appendText("\n     got: ").appendValue(actual).appendText("\n");
             throw new java.lang.AssertionError(description.toString());
         }
     }
-
 }
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/MatcherAssertTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/MatcherAssertTest.java
@@ -0,0 +1,36 @@
+package org.hamcrest;
+
+import junit.framework.TestCase;
+import static org.hamcrest.Matchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class MatcherAssertTest extends TestCase {
+    public void testIncludesDescriptionOfTestedValueInErrorMessage() {
+        String expected = "expected";
+        String actual = "actual";
+        
+        String expectedMessage = "identifier\nExpected: \"expected\"\n     got: \"actual\"\n";
+        
+        try {
+            assertThat("identifier", actual, equalTo(expected));
+        }
+        catch (AssertionError e) {
+            assertEquals(expectedMessage, e.getMessage());
+        }
+    }
+
+    public void testDescriptionCanBeElided() {
+        String expected = "expected";
+        String actual = "actual";
+        
+        String expectedMessage = "\nExpected: \"expected\"\n     got: \"actual\"\n";
+        
+        try {
+            assertThat(actual, equalTo(expected));
+        }
+        catch (AssertionError e) {
+            assertEquals(expectedMessage, e.getMessage());
+        }
+    }
+}
+
