Merge PR hamcrest#43 (Change generic signature of OrderingComparison to accept Comparable<? super T>) and re-implement for new OrderingComparison/ComparatorMatcherBuilder mechanism.

npryce · npryce · commit 9e3875c19b40 · 2014-12-24T14:38:09.000Z
diff --git a/hamcrest-library/src/test/java/org/hamcrest/number/OrderingComparisonTest.java b/hamcrest-library/src/test/java/org/hamcrest/number/OrderingComparisonTest.java
@@ -68,8 +68,12 @@ public void testComparesBigDecimalsWithDifferentScalesCorrectlyForIssue20() {
     public void testComparesCustomTypesWhoseCompareToReturnsValuesGreaterThatOne() {
         assertThat(new CustomInt(5), lessThan(new CustomInt(10)));
     }
+    
+    public void testComparesCustomTypesWhichExtendComparableClasses() {
+        assertThat(new CustomExtendedInt(5), lessThan(new CustomExtendedInt(10)));
+    }
 
-    private static final class CustomInt implements Comparable<CustomInt> {
+    private static class CustomInt implements Comparable<CustomInt> {
         private final int value;
         public CustomInt(int value) {
             this.value = value;
@@ -79,4 +83,10 @@ public int compareTo(CustomInt other) {
             return value - other.value;
         }
     }
+
+    private static class CustomExtendedInt extends CustomInt {
+        public CustomExtendedInt(int value) {
+            super(value);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,12 @@ public void testComparesBigDecimalsWithDifferentScalesCorrectlyForIssue20() {`
`68`	`68`	`public void testComparesCustomTypesWhoseCompareToReturnsValuesGreaterThatOne() {`
`69`	`69`	`assertThat(new CustomInt(5), lessThan(new CustomInt(10)));`
`70`	`70`	`}`
	`71`	`+`
	`72`	`+ public void testComparesCustomTypesWhichExtendComparableClasses() {`
	`73`	`+ assertThat(new CustomExtendedInt(5), lessThan(new CustomExtendedInt(10)));`
	`74`	`+ }`
`71`	`75`
`72`		`- private static final class CustomInt implements Comparable<CustomInt> {`
	`76`	`+ private static class CustomInt implements Comparable<CustomInt> {`
`73`	`77`	`private final int value;`
`74`	`78`	`public CustomInt(int value) {`
`75`	`79`	`this.value = value;`
`@@ -79,4 +83,10 @@ public int compareTo(CustomInt other) {`
`79`	`83`	`return value - other.value;`
`80`	`84`	`}`
`81`	`85`	`}`
	`86`	`+`
	`87`	`+ private static class CustomExtendedInt extends CustomInt {`
	`88`	`+ public CustomExtendedInt(int value) {`
	`89`	`+ super(value);`
	`90`	`+ }`
	`91`	`+ }`
`82`	`92`	`}`