67 lines
3.4 KiB
Diff
67 lines
3.4 KiB
Diff
--- JavaHamcrest-hamcrest-java-1.3/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java 2022-03-18 20:35:38.293788586 +0100
|
|
+++ JavaHamcrest-hamcrest-java-1.3/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java 2022-03-18 20:46:34.534452749 +0100
|
|
@@ -57,7 +57,7 @@
|
|
*/
|
|
@Factory
|
|
public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
|
|
- return allOf(Arrays.asList(matchers));
|
|
+ return new AllOf<T>(Arrays.asList(matchers));
|
|
}
|
|
|
|
/**
|
|
--- JavaHamcrest-hamcrest-java-1.3/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java 2022-03-18 20:35:38.293788586 +0100
|
|
+++ JavaHamcrest-hamcrest-java-1.3/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java 2022-03-18 20:39:13.031315993 +0100
|
|
@@ -47,7 +47,7 @@
|
|
*/
|
|
@Factory
|
|
public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
|
|
- return anyOf(Arrays.asList(matchers));
|
|
+ return new AnyOf<T>(Arrays.asList(matchers));
|
|
}
|
|
|
|
/**
|
|
--- JavaHamcrest-hamcrest-java-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java 2022-03-18 20:35:38.297788614 +0100
|
|
+++ JavaHamcrest-hamcrest-java-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java 2022-03-18 20:49:03.047502492 +0100
|
|
@@ -55,7 +55,7 @@
|
|
*/
|
|
@Factory
|
|
public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
|
|
- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
|
|
+ return new IsArrayContainingInAnyOrder<E>(Arrays.asList(itemMatchers));
|
|
}
|
|
|
|
/**
|
|
--- JavaHamcrest-hamcrest-java-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java 2022-03-18 20:35:38.297788614 +0100
|
|
+++ JavaHamcrest-hamcrest-java-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java 2022-03-18 20:49:57.623888266 +0100
|
|
@@ -69,7 +69,7 @@
|
|
*/
|
|
@Factory
|
|
public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
|
|
- return arrayContaining(asList(itemMatchers));
|
|
+ return new IsArrayContainingInOrder<E>(asList(itemMatchers));
|
|
}
|
|
|
|
/**
|
|
--- JavaHamcrest-hamcrest-java-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java 2022-03-18 20:35:38.297788614 +0100
|
|
+++ JavaHamcrest-hamcrest-java-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java 2022-03-18 20:56:50.738808383 +0100
|
|
@@ -122,7 +122,7 @@
|
|
*/
|
|
@Factory
|
|
public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
|
|
- return containsInAnyOrder(Arrays.asList(itemMatchers));
|
|
+ return new IsIterableContainingInAnyOrder<T>(Arrays.asList(itemMatchers));
|
|
}
|
|
|
|
/**
|
|
--- JavaHamcrest-hamcrest-java-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java 2022-03-18 20:35:38.297788614 +0100
|
|
+++ JavaHamcrest-hamcrest-java-1.3/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java 2022-03-18 21:21:22.189211465 +0100
|
|
@@ -138,7 +138,7 @@
|
|
*/
|
|
@Factory
|
|
public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>... itemMatchers) {
|
|
- return contains(asList(itemMatchers));
|
|
+ return new IsIterableContainingInOrder<E>(asList(itemMatchers));
|
|
}
|
|
|
|
/**
|