address issue 144 (google code issue tracker) -- OrderingComparison doesn't describe mismatch of comparables that return values other than (-1,0,1)

scarytom · scarytom · commit 40b435e94ed6 · 2012-05-19T22:37:52.000+01:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -8,6 +8,8 @@
 
 * Fix issue 152 - Factory classes missing from matchers.xml
 
+* Fix issue 144 - OrderingComparison doesn't describe mismatch of comparables that return values other than (-1,0,1)
+
 * Fix issue 134 - DescribedAs does not delegate describeMismatch
 
 * Fix issue 106 - deprecation warning when writing custom matchers
diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java b/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java
@@ -51,7 +51,7 @@ public void describeTo(Description description) {
     }
 
     private static String asText(int comparison) {
-        return comparisonDescriptions[comparison + 1];
+        return comparisonDescriptions[signum(comparison) + 1];
     }
 
     /**
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
@@ -64,4 +64,19 @@ public void testComparesBigDecimalsWithDifferentScalesCorrectlyForIssue20() {
       assertThat(new BigDecimal(10), greaterThanOrEqualTo(new BigDecimal("10.0")));
       assertThat(new BigDecimal("2"), comparesEqualTo(new BigDecimal("2.000")));
     }
+    
+    public void testComparesCustomTypesWhoseCompareToReturnsValuesGreaterThatOne() {
+        assertThat(new CustomInt(5), lessThan(new CustomInt(10)));
+    }
+
+    private static final class CustomInt implements Comparable<CustomInt> {
+        private final int value;
+        public CustomInt(int value) {
+            this.value = value;
+        }
+
+        public int compareTo(CustomInt other) {
+            return value - other.value;
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public void describeTo(Description description) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private static String asText(int comparison) {`
`54`		`- return comparisonDescriptions[comparison + 1];`
	`54`	`+ return comparisonDescriptions[signum(comparison) + 1];`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`