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 84c8fd53440b · 2014-12-24T14:38:32.000Z
diff --git a/hamcrest-library/src/main/java/org/hamcrest/comparator/ComparatorMatcherBuilder.java b/hamcrest-library/src/main/java/org/hamcrest/comparator/ComparatorMatcherBuilder.java
@@ -10,15 +10,15 @@
 
 public final class ComparatorMatcherBuilder<T> {
 
-    private final Comparator<T> comparator;
+    private final Comparator<? super T> comparator;
     private final boolean includeComparatorInDescription;
 
     /**
      * Creates a matcher factory for matchers of {@code Comparable}s.
      * For example:
      * <pre>assertThat(1, ComparatorMatcherBuilder.&lt;Integer&gt;usingNaturalOrdering().lessThanOrEqualTo(1))</pre>
      */
-    public static <T extends Comparable<T>> ComparatorMatcherBuilder<T> usingNaturalOrdering() {
+    public static <T extends Comparable<? super T>> ComparatorMatcherBuilder<T> usingNaturalOrdering() {
         return new ComparatorMatcherBuilder<>(new Comparator<T>() {
             @Override
             public int compare(T o1, T o2) {
@@ -36,11 +36,11 @@ public int compare(T o1, T o2) {
      * }
      * }).lessThan(4))</pre>
      */
-    public static <T> ComparatorMatcherBuilder<T> comparedBy(Comparator<T> comparator) {
+    public static <T> ComparatorMatcherBuilder<T> comparedBy(Comparator<? super T> comparator) {
         return new ComparatorMatcherBuilder<>(comparator, true);
     }
 
-    private ComparatorMatcherBuilder(Comparator<T> comparator, boolean includeComparatorInDescription) {
+    private ComparatorMatcherBuilder(Comparator<? super T> comparator, boolean includeComparatorInDescription) {
         this.comparator = comparator;
         this.includeComparatorInDescription = includeComparatorInDescription;
     }
@@ -50,7 +50,7 @@ private static final class ComparatorMatcher<T> extends TypeSafeMatcher<T> {
         private static final int GREATER_THAN = 1;
         private static final int EQUAL = 0;
 
-        private final Comparator<T> comparator;
+        private final Comparator<? super T> comparator;
         private final T expected;
         private final int minCompare;
         private final int maxCompare;
@@ -62,7 +62,7 @@ private static final class ComparatorMatcher<T> extends TypeSafeMatcher<T> {
                 "greater than"
         };
 
-        private ComparatorMatcher(Comparator<T> comparator, T expected, int minCompare, int maxCompare, boolean includeComparatorInDescription) {
+        private ComparatorMatcher(Comparator<? super T> comparator, T expected, int minCompare, int maxCompare, boolean includeComparatorInDescription) {
             this.comparator = comparator;
             this.expected = expected;
             this.minCompare = minCompare;
diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java b/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java
@@ -19,7 +19,7 @@ private OrderingComparison() {
      *
      * @param value the value which, when passed to the compareTo method of the examined object, should return zero
      */
-    public static <T extends Comparable<T>> Matcher<T> comparesEqualTo(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> comparesEqualTo(T value) {
         return ComparatorMatcherBuilder.<T>usingNaturalOrdering().comparesEqualTo(value);
     }
 
@@ -33,7 +33,7 @@ public static <T extends Comparable<T>> Matcher<T> comparesEqualTo(T value) {
      * @param value the value which, when passed to the compareTo method of the examined object, should return greater
      *              than zero
      */
-    public static <T extends Comparable<T>> Matcher<T> greaterThan(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> greaterThan(T value) {
         return ComparatorMatcherBuilder.<T>usingNaturalOrdering().greaterThan(value);
     }
 
@@ -47,7 +47,7 @@ public static <T extends Comparable<T>> Matcher<T> greaterThan(T value) {
      * @param value the value which, when passed to the compareTo method of the examined object, should return greater
      *              than or equal to zero
      */
-    public static <T extends Comparable<T>> Matcher<T> greaterThanOrEqualTo(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> greaterThanOrEqualTo(T value) {
         return ComparatorMatcherBuilder.<T>usingNaturalOrdering().greaterThanOrEqualTo(value);
     }
 
@@ -61,7 +61,7 @@ public static <T extends Comparable<T>> Matcher<T> greaterThanOrEqualTo(T value)
      * @param value the value which, when passed to the compareTo method of the examined object, should return less
      *              than zero
      */
-    public static <T extends Comparable<T>> Matcher<T> lessThan(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> lessThan(T value) {
         return ComparatorMatcherBuilder.<T>usingNaturalOrdering().lessThan(value);
     }
 
@@ -75,7 +75,7 @@ public static <T extends Comparable<T>> Matcher<T> lessThan(T value) {
      * @param value the value which, when passed to the compareTo method of the examined object, should return less
      *              than or equal to zero
      */
-    public static <T extends Comparable<T>> Matcher<T> lessThanOrEqualTo(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> lessThanOrEqualTo(T value) {
         return ComparatorMatcherBuilder.<T>usingNaturalOrdering().lessThanOrEqualTo(value);
     }
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/object/MatchObjects.java b/hamcrest-library/src/main/java/org/hamcrest/object/MatchObjects.java
@@ -195,7 +195,7 @@ public static <T> Matcher<T> oneOf(T... elements) {
      *
      * @param value the value which, when passed to the compareTo method of the examined object, should return zero
      */
-    public static <T extends Comparable<T>> Matcher<T> comparesEqualTo(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> comparesEqualTo(T value) {
         return OrderingComparison.comparesEqualTo(value);
     }
 
@@ -209,7 +209,7 @@ public static <T extends Comparable<T>> Matcher<T> comparesEqualTo(T value) {
      * @param value the value which, when passed to the compareTo method of the examined object, should return greater
      *              than zero
      */
-    public static <T extends Comparable<T>> Matcher<T> greaterThan(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> greaterThan(T value) {
         return OrderingComparison.greaterThan(value);
     }
 
@@ -223,7 +223,7 @@ public static <T extends Comparable<T>> Matcher<T> greaterThan(T value) {
      * @param value the value which, when passed to the compareTo method of the examined object, should return greater
      *              than or equal to zero
      */
-    public static <T extends Comparable<T>> Matcher<T> greaterThanOrEqualTo(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> greaterThanOrEqualTo(T value) {
         return ComparatorMatcherBuilder.<T>usingNaturalOrdering().greaterThanOrEqualTo(value);
     }
 
@@ -237,7 +237,7 @@ public static <T extends Comparable<T>> Matcher<T> greaterThanOrEqualTo(T value)
      * @param value the value which, when passed to the compareTo method of the examined object, should return less
      *              than zero
      */
-    public static <T extends Comparable<T>> Matcher<T> lessThan(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> lessThan(T value) {
         return OrderingComparison.lessThan(value);
     }
 
@@ -251,7 +251,7 @@ public static <T extends Comparable<T>> Matcher<T> lessThan(T value) {
      * @param value the value which, when passed to the compareTo method of the examined object, should return less
      *              than or equal to zero
      */
-    public static <T extends Comparable<T>> Matcher<T> lessThanOrEqualTo(T value) {
+    public static <T extends Comparable<? super T>> Matcher<T> lessThanOrEqualTo(T value) {
         return OrderingComparison.lessThanOrEqualTo(value);
     }
 
diff --git a/hamcrest-library/src/test/java/org/hamcrest/number/OrderingComparisonTest.java b/hamcrest-library/src/test/java/org/hamcrest/number/OrderingComparisonTest.java
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2000-2009 hamcrest.org
+/*  Copyright (c) 2000-2013 hamcrest.org
  */
 package org.hamcrest.number;
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ private OrderingComparison() {`
`19`	`19`	`*`
`20`	`20`	`* @param value the value which, when passed to the compareTo method of the examined object, should return zero`
`21`	`21`	`*/`
`22`		`- public static <T extends Comparable<T>> Matcher<T> comparesEqualTo(T value) {`
	`22`	`+ public static <T extends Comparable<? super T>> Matcher<T> comparesEqualTo(T value) {`
`23`	`23`	`return ComparatorMatcherBuilder.<T>usingNaturalOrdering().comparesEqualTo(value);`
`24`	`24`	`}`
`25`	`25`
`@@ -33,7 +33,7 @@ public static <T extends Comparable<T>> Matcher<T> comparesEqualTo(T value) {`
`33`	`33`	`* @param value the value which, when passed to the compareTo method of the examined object, should return greater`
`34`	`34`	`* than zero`
`35`	`35`	`*/`
`36`		`- public static <T extends Comparable<T>> Matcher<T> greaterThan(T value) {`
	`36`	`+ public static <T extends Comparable<? super T>> Matcher<T> greaterThan(T value) {`
`37`	`37`	`return ComparatorMatcherBuilder.<T>usingNaturalOrdering().greaterThan(value);`
`38`	`38`	`}`
`39`	`39`
`@@ -47,7 +47,7 @@ public static <T extends Comparable<T>> Matcher<T> greaterThan(T value) {`
`47`	`47`	`* @param value the value which, when passed to the compareTo method of the examined object, should return greater`
`48`	`48`	`* than or equal to zero`
`49`	`49`	`*/`
`50`		`- public static <T extends Comparable<T>> Matcher<T> greaterThanOrEqualTo(T value) {`
	`50`	`+ public static <T extends Comparable<? super T>> Matcher<T> greaterThanOrEqualTo(T value) {`
`51`	`51`	`return ComparatorMatcherBuilder.<T>usingNaturalOrdering().greaterThanOrEqualTo(value);`
`52`	`52`	`}`
`53`	`53`
`@@ -61,7 +61,7 @@ public static <T extends Comparable<T>> Matcher<T> greaterThanOrEqualTo(T value)`
`61`	`61`	`* @param value the value which, when passed to the compareTo method of the examined object, should return less`
`62`	`62`	`* than zero`
`63`	`63`	`*/`
`64`		`- public static <T extends Comparable<T>> Matcher<T> lessThan(T value) {`
	`64`	`+ public static <T extends Comparable<? super T>> Matcher<T> lessThan(T value) {`
`65`	`65`	`return ComparatorMatcherBuilder.<T>usingNaturalOrdering().lessThan(value);`
`66`	`66`	`}`
`67`	`67`
`@@ -75,7 +75,7 @@ public static <T extends Comparable<T>> Matcher<T> lessThan(T value) {`
`75`	`75`	`* @param value the value which, when passed to the compareTo method of the examined object, should return less`
`76`	`76`	`* than or equal to zero`
`77`	`77`	`*/`
`78`		`- public static <T extends Comparable<T>> Matcher<T> lessThanOrEqualTo(T value) {`
	`78`	`+ public static <T extends Comparable<? super T>> Matcher<T> lessThanOrEqualTo(T value) {`
`79`	`79`	`return ComparatorMatcherBuilder.<T>usingNaturalOrdering().lessThanOrEqualTo(value);`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Copyright (c) 2000-2009 hamcrest.org`
	`1`	`+/* Copyright (c) 2000-2013 hamcrest.org`
`2`	`2`	`*/`
`3`	`3`	`package org.hamcrest.number;`
`4`	`4`