Merging changes from v7.0 branch to the new v2.x branch.

npryce · npryce · commit b27ea1fa0b57 · 2014-12-27T22:04:34.000Z
Deprecating OrderingComparison in favour of MatchingObjects.
diff --git a/hamcrest-library/src/main/java/org/hamcrest/beans/HasProperty.java b/hamcrest-library/src/main/java/org/hamcrest/beans/HasProperty.java
@@ -3,6 +3,7 @@
 package org.hamcrest.beans;
 
 import org.hamcrest.Description;
+import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
 /**
@@ -41,4 +42,12 @@ public void describeTo(Description description) {
         description.appendText("hasProperty(").appendValue(propertyName).appendText(")");
     }
 
+    /**
+     * @deprecated use {@link org.hamcrest.beans.MatchingBeans#hasProperty(String)}
+     */
+    @Deprecated
+    public static <T> Matcher<T> hasProperty(String propertyName) {
+        return new HasProperty<>(propertyName);
+    }
+
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java b/hamcrest-library/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java
@@ -133,4 +133,11 @@ public Condition<Method> apply(PropertyDescriptor property, Description mismatch
         };
     }
 
+    /**
+     * @deprecated use {@link org.hamcrest.beans.MatchingBeans#hasProperty(String, org.hamcrest.Matcher)}
+     */
+    @Deprecated
+    public static <T> Matcher<T> hasProperty(String propertyName, Matcher<?> valueMatcher) {
+        return new HasPropertyWithValue<>(propertyName, valueMatcher);
+    }
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/beans/SamePropertyValuesAs.java b/hamcrest-library/src/main/java/org/hamcrest/beans/SamePropertyValuesAs.java
@@ -123,4 +123,12 @@ private static Object readProperty(Method method, Object target) {
         }
     }
 
+    /**
+     * @deprecated use {@link org.hamcrest.beans.MatchingBeans#samePropertyValuesAs(Object)}
+     */
+    @Deprecated
+    public static <T> Matcher<T> samePropertyValuesAs(T expectedBean) {
+        return new SamePropertyValuesAs<>(expectedBean);
+    }
+
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/IsCloseTo.java b/hamcrest-library/src/main/java/org/hamcrest/number/IsCloseTo.java
@@ -3,6 +3,7 @@
 package org.hamcrest.number;
 
 import org.hamcrest.Description;
+import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
 import static java.lang.Math.abs;
@@ -46,4 +47,12 @@ public void describeTo(Description description) {
     private double actualDelta(Double item) {
       return abs(item - value) - delta;
     }
+
+    /**
+     * @deprecated use {@link org.hamcrest.number.MatchingNumbers#closeTo(double, double)}
+     */
+    @Deprecated
+    public static Matcher<Double> closeTo(double operand, double error) {
+        return new IsCloseTo(operand, error);
+    }
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java b/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparison.java
@@ -5,6 +5,9 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.comparator.ComparatorMatcherBuilder;
 
+/**
+ * @deprecated use {@link org.hamcrest.object.MatchingObjects}
+ */
 public class OrderingComparison {
 
     private OrderingComparison() {
diff --git a/hamcrest-library/src/main/java/org/hamcrest/object/MatchingObjects.java b/hamcrest-library/src/main/java/org/hamcrest/object/MatchingObjects.java
@@ -5,7 +5,6 @@
 import org.hamcrest.collection.IsIn;
 import org.hamcrest.comparator.ComparatorMatcherBuilder;
 import org.hamcrest.core.*;
-import org.hamcrest.number.OrderingComparison;
 
 import java.util.EventObject;
 
@@ -198,7 +197,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<? super T>> Matcher<T> comparesEqualTo(T value) {
-        return OrderingComparison.comparesEqualTo(value);
+        return ComparatorMatcherBuilder.<T>usingNaturalOrdering().comparesEqualTo(value);
     }
 
     /**
@@ -212,7 +211,7 @@ public static <T extends Comparable<? super T>> Matcher<T> comparesEqualTo(T val
      *              than zero
      */
     public static <T extends Comparable<? super T>> Matcher<T> greaterThan(T value) {
-        return OrderingComparison.greaterThan(value);
+        return ComparatorMatcherBuilder.<T>usingNaturalOrdering().greaterThan(value);
     }
 
     /**
@@ -240,7 +239,7 @@ public static <T extends Comparable<? super T>> Matcher<T> greaterThanOrEqualTo(
      *              than zero
      */
     public static <T extends Comparable<? super T>> Matcher<T> lessThan(T value) {
-        return OrderingComparison.lessThan(value);
+        return ComparatorMatcherBuilder.<T>usingNaturalOrdering().lessThan(value);
     }
 
     /**
@@ -254,7 +253,7 @@ public static <T extends Comparable<? super T>> Matcher<T> lessThan(T value) {
      *              than or equal to zero
      */
     public static <T extends Comparable<? super T>> Matcher<T> lessThanOrEqualTo(T value) {
-        return OrderingComparison.lessThanOrEqualTo(value);
+        return ComparatorMatcherBuilder.<T>usingNaturalOrdering().lessThanOrEqualTo(value);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -133,4 +133,11 @@ public Condition<Method> apply(PropertyDescriptor property, Description mismatch`
`133`	`133`	`};`
`134`	`134`	`}`
`135`	`135`
	`136`	`+ /**`
	`137`	`+ * @deprecated use {@link org.hamcrest.beans.MatchingBeans#hasProperty(String, org.hamcrest.Matcher)}`
	`138`	`+ */`
	`139`	`+ @Deprecated`
	`140`	`+ public static <T> Matcher<T> hasProperty(String propertyName, Matcher<?> valueMatcher) {`
	`141`	`+ return new HasPropertyWithValue<>(propertyName, valueMatcher);`
	`142`	`+ }`
`136`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,4 +123,12 @@ private static Object readProperty(Method method, Object target) {`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
	`126`	`+ /**`
	`127`	`+ * @deprecated use {@link org.hamcrest.beans.MatchingBeans#samePropertyValuesAs(Object)}`
	`128`	`+ */`
	`129`	`+ @Deprecated`
	`130`	`+ public static <T> Matcher<T> samePropertyValuesAs(T expectedBean) {`
	`131`	`+ return new SamePropertyValuesAs<>(expectedBean);`
	`132`	`+ }`
	`133`	`+`
`126`	`134`	`}`