fixed Issue 88: OrderingComparison is still describing mismatches backwards

smgfreeman · smgfreeman · commit 5addb7ecf58b · 2009-06-11T07:05:27.000Z
diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java b/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java
@@ -28,9 +28,9 @@ public boolean matchesSafely(T actual) {
 
     @Override
     public void describeMismatchSafely(T actual, Description mismatchDescription) {
-      mismatchDescription.appendValue(expected) .appendText(" was ")
+      mismatchDescription.appendValue(actual) .appendText(" was ")
                          .appendText(comparison(actual.compareTo(expected)))
-                         .appendText(" ").appendValue(actual);
+                         .appendText(" ").appendValue(expected);
     };
     
     public void describeTo(Description description) {
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/number/OrderingComparisonTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/number/OrderingComparisonTest.java
@@ -31,9 +31,9 @@ public void testDescription() {
     }
 
     public void testMismatchDescriptions() {
-      assertMismatchDescription("<1> was less than <0>", greaterThan(1), 0);
+      assertMismatchDescription("<0> was less than <1>", greaterThan(1), 0);
       assertMismatchDescription("<1> was equal to <1>", greaterThan(1), 1);
-      assertMismatchDescription("<0> was greater than <1>", lessThan(0), 1);
+      assertMismatchDescription("<1> was greater than <0>", lessThan(0), 1);
     }
     
     public void testComparesObjectsForGreaterThan() {

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ public void testDescription() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public void testMismatchDescriptions() {`
`34`		`- assertMismatchDescription("<1> was less than <0>", greaterThan(1), 0);`
	`34`	`+ assertMismatchDescription("<0> was less than <1>", greaterThan(1), 0);`
`35`	`35`	`assertMismatchDescription("<1> was equal to <1>", greaterThan(1), 1);`
`36`		`- assertMismatchDescription("<0> was greater than <1>", lessThan(0), 1);`
	`36`	`+ assertMismatchDescription("<1> was greater than <0>", lessThan(0), 1);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public void testComparesObjectsForGreaterThan() {`