Change generic signature of OrderingComparison to accept Comparable<? super T>

nhinds · nhinds · commit fbaa7c843c08 · 2013-12-09T20:35:31.000+13:00
diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java b/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java
@@ -9,7 +9,7 @@
 
 import static java.lang.Integer.signum;
 
-public class OrderingComparison<T extends Comparable<T>> extends TypeSafeMatcher<T> {
+public class OrderingComparison<T extends Comparable<? super T>> extends TypeSafeMatcher<T> {
     private static final int LESS_THAN = -1;
     private static final int GREATER_THAN = 1;
     private static final int EQUAL = 0;
@@ -67,7 +67,7 @@ private static String asText(int comparison) {
      * 
      */
     @Factory
-    public static <T extends Comparable<T>> Matcher<T> comparesEqualTo(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> comparesEqualTo(T value) {
         return new OrderingComparison<T>(value, EQUAL, EQUAL);
     }
 
@@ -85,7 +85,7 @@ public static <T extends Comparable<T>> Matcher<T> comparesEqualTo(T value) {
      * 
      */
     @Factory
-    public static <T extends Comparable<T>> Matcher<T> greaterThan(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> greaterThan(T value) {
         return new OrderingComparison<T>(value, GREATER_THAN, GREATER_THAN);
     }
 
@@ -103,7 +103,7 @@ public static <T extends Comparable<T>> Matcher<T> greaterThan(T value) {
      * 
      */
     @Factory
-    public static <T extends Comparable<T>> Matcher<T> greaterThanOrEqualTo(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> greaterThanOrEqualTo(T value) {
         return new OrderingComparison<T>(value, EQUAL, GREATER_THAN);
     }
 
@@ -121,7 +121,7 @@ public static <T extends Comparable<T>> Matcher<T> greaterThanOrEqualTo(T value)
      * 
      */
     @Factory
-    public static <T extends Comparable<T>> Matcher<T> lessThan(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> lessThan(T value) {
         return new OrderingComparison<T>(value, LESS_THAN, LESS_THAN);
     }
 
@@ -139,7 +139,7 @@ public static <T extends Comparable<T>> Matcher<T> lessThan(T value) {
      * 
      */
     @Factory
-    public static <T extends Comparable<T>> Matcher<T> lessThanOrEqualTo(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> lessThanOrEqualTo(T value) {
         return new OrderingComparison<T>(value, LESS_THAN, EQUAL);
     }
 }
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
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`import static java.lang.Integer.signum;`
`11`	`11`
`12`		`-public class OrderingComparison<T extends Comparable<T>> extends TypeSafeMatcher<T> {`
	`12`	`+public class OrderingComparison<T extends Comparable<? super T>> extends TypeSafeMatcher<T> {`
`13`	`13`	`private static final int LESS_THAN = -1;`
`14`	`14`	`private static final int GREATER_THAN = 1;`
`15`	`15`	`private static final int EQUAL = 0;`
`@@ -67,7 +67,7 @@ private static String asText(int comparison) {`
`67`	`67`	`*`
`68`	`68`	`*/`
`69`	`69`	`@Factory`
`70`		`- public static <T extends Comparable<T>> Matcher<T> comparesEqualTo(T value) {`
	`70`	`+ public static <T extends Comparable<? super T>> Matcher<T> comparesEqualTo(T value) {`
`71`	`71`	`return new OrderingComparison<T>(value, EQUAL, EQUAL);`
`72`	`72`	`}`
`73`	`73`
`@@ -85,7 +85,7 @@ public static <T extends Comparable<T>> Matcher<T> comparesEqualTo(T value) {`
`85`	`85`	`*`
`86`	`86`	`*/`
`87`	`87`	`@Factory`
`88`		`- public static <T extends Comparable<T>> Matcher<T> greaterThan(T value) {`
	`88`	`+ public static <T extends Comparable<? super T>> Matcher<T> greaterThan(T value) {`
`89`	`89`	`return new OrderingComparison<T>(value, GREATER_THAN, GREATER_THAN);`
`90`	`90`	`}`
`91`	`91`
`@@ -103,7 +103,7 @@ public static <T extends Comparable<T>> Matcher<T> greaterThan(T value) {`
`103`	`103`	`*`
`104`	`104`	`*/`
`105`	`105`	`@Factory`
`106`		`- public static <T extends Comparable<T>> Matcher<T> greaterThanOrEqualTo(T value) {`
	`106`	`+ public static <T extends Comparable<? super T>> Matcher<T> greaterThanOrEqualTo(T value) {`
`107`	`107`	`return new OrderingComparison<T>(value, EQUAL, GREATER_THAN);`
`108`	`108`	`}`
`109`	`109`
`@@ -121,7 +121,7 @@ public static <T extends Comparable<T>> Matcher<T> greaterThanOrEqualTo(T value)`
`121`	`121`	`*`
`122`	`122`	`*/`
`123`	`123`	`@Factory`
`124`		`- public static <T extends Comparable<T>> Matcher<T> lessThan(T value) {`
	`124`	`+ public static <T extends Comparable<? super T>> Matcher<T> lessThan(T value) {`
`125`	`125`	`return new OrderingComparison<T>(value, LESS_THAN, LESS_THAN);`
`126`	`126`	`}`
`127`	`127`
`@@ -139,7 +139,7 @@ public static <T extends Comparable<T>> Matcher<T> lessThan(T value) {`
`139`	`139`	`*`
`140`	`140`	`*/`
`141`	`141`	`@Factory`
`142`		`- public static <T extends Comparable<T>> Matcher<T> lessThanOrEqualTo(T value) {`
	`142`	`+ public static <T extends Comparable<? super T>> Matcher<T> lessThanOrEqualTo(T value) {`
`143`	`143`	`return new OrderingComparison<T>(value, LESS_THAN, EQUAL);`
`144`	`144`	`}`
`145`	`145`	`}`
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`	`}`