Factory methods. Bean has same property values

sf105 · sf105 · commit c39a88132dc0 · 2014-12-26T19:10:32.000+01:00
diff --git a/hamcrest-library/src/main/java/org/hamcrest/Matchers.java b/hamcrest-library/src/main/java/org/hamcrest/Matchers.java
@@ -1451,7 +1451,7 @@ public static <T> Matcher<T> hasProperty(java.lang.String propertyName, org.hamc
      * @param expectedBean the bean against which examined beans are compared
      */
     public static <T> Matcher<T> samePropertyValuesAs(T expectedBean) {
-        return org.hamcrest.beans.SamePropertyValuesAs.samePropertyValuesAs(expectedBean);
+        return MatchingBeans.samePropertyValuesAs(expectedBean);
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/beans/MatchingBeans.java b/hamcrest-library/src/main/java/org/hamcrest/beans/MatchingBeans.java
@@ -36,7 +36,7 @@ public static <T> org.hamcrest.Matcher<T> hasProperty(java.lang.String propertyN
      * @param expectedBean the bean against which examined beans are compared
      */
     public static <T> org.hamcrest.Matcher<T> samePropertyValuesAs(T expectedBean) {
-        return org.hamcrest.beans.SamePropertyValuesAs.samePropertyValuesAs(expectedBean);
+        return new SamePropertyValuesAs<>(expectedBean);
     }
 
 }
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,18 +123,4 @@ private static Object readProperty(Method method, Object target) {
         }
     }
 
-    /**
-     * Creates a matcher that matches when the examined object has values for all of
-     * its JavaBean properties that are equal to the corresponding values of the
-     * specified bean.
-     * For example:
-     * <pre>assertThat(myBean, samePropertyValuesAs(myExpectedBean))</pre>
-     * 
-     * @param expectedBean
-     *     the bean against which examined beans are compared
-     */
-    public static <T> Matcher<T> samePropertyValuesAs(T expectedBean) {
-        return new SamePropertyValuesAs<>(expectedBean);
-    }
-
 }
diff --git a/hamcrest-library/src/test/java/org/hamcrest/beans/SamePropertyValuesAsTest.java b/hamcrest-library/src/test/java/org/hamcrest/beans/SamePropertyValuesAsTest.java
@@ -5,7 +5,7 @@
 import org.hamcrest.AbstractMatcherTest;
 import org.hamcrest.Matcher;
 
-import static org.hamcrest.beans.SamePropertyValuesAs.samePropertyValuesAs;
+import static org.hamcrest.beans.MatchingBeans.samePropertyValuesAs;
 
 @SuppressWarnings("UnusedDeclaration")
 public class SamePropertyValuesAsTest extends AbstractMatcherTest {

Original file line number	Diff line number	Diff line change
`@@ -1451,7 +1451,7 @@ public static <T> Matcher<T> hasProperty(java.lang.String propertyName, org.hamc`
`1451`	`1451`	`* @param expectedBean the bean against which examined beans are compared`
`1452`	`1452`	`*/`
`1453`	`1453`	`public static <T> Matcher<T> samePropertyValuesAs(T expectedBean) {`
`1454`		`- return org.hamcrest.beans.SamePropertyValuesAs.samePropertyValuesAs(expectedBean);`
	`1454`	`+ return MatchingBeans.samePropertyValuesAs(expectedBean);`
`1455`	`1455`	`}`
`1456`	`1456`
`1457`	`1457`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static <T> org.hamcrest.Matcher<T> hasProperty(java.lang.String propertyN`
`36`	`36`	`* @param expectedBean the bean against which examined beans are compared`
`37`	`37`	`*/`
`38`	`38`	`public static <T> org.hamcrest.Matcher<T> samePropertyValuesAs(T expectedBean) {`
`39`		`- return org.hamcrest.beans.SamePropertyValuesAs.samePropertyValuesAs(expectedBean);`
	`39`	`+ return new SamePropertyValuesAs<>(expectedBean);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,18 +123,4 @@ private static Object readProperty(Method method, Object target) {`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`		`- /**`
`127`		`- * Creates a matcher that matches when the examined object has values for all of`
`128`		`- * its JavaBean properties that are equal to the corresponding values of the`
`129`		`- * specified bean.`
`130`		`- * For example:`
`131`		`- * <pre>assertThat(myBean, samePropertyValuesAs(myExpectedBean))</pre>`
`132`		`- *`
`133`		`- * @param expectedBean`
`134`		`- * the bean against which examined beans are compared`
`135`		`- */`
`136`		`- public static <T> Matcher<T> samePropertyValuesAs(T expectedBean) {`
`137`		`- return new SamePropertyValuesAs<>(expectedBean);`
`138`		`- }`
`139`		`-`
`140`	`126`	`}`