Skip to content

Commit ed60476

Browse files
sf105sf105
committed
Renamed factory classes from MatchX to MatchingX
1 parent f006632 commit ed60476

39 files changed

+117
-117
lines changed

‎hamcrest-core/src/test/java/org/hamcrest/core/IsEqualTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import org.junit.Test;
77

88
import static org.hamcrest.AbstractMatcherTest.*;
9-
import static org.hamcrest.object.MatchObjects.equalTo;
10-
import static org.hamcrest.object.MatchObjects.equalToObject;
9+
import static org.hamcrest.object.MatchingObjects.equalTo;
10+
import static org.hamcrest.object.MatchingObjects.equalToObject;
1111

1212
public final class IsEqualTest {
1313

‎hamcrest-library/src/main/java/org/hamcrest/Matchers.java

Lines changed: 56 additions & 56 deletions
Large diffs are not rendered by default.

‎hamcrest-library/src/main/java/org/hamcrest/beans/MatchBeans.java renamed to ‎hamcrest-library/src/main/java/org/hamcrest/beans/MatchingBeans.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.hamcrest.beans;
22

3-
public class MatchBeans {
3+
public class MatchingBeans {
44
/**
55
* Creates a matcher that matches when the examined object has a JavaBean property
66
* with the specified name.

‎hamcrest-library/src/main/java/org/hamcrest/collection/MatchArrays.java renamed to ‎hamcrest-library/src/main/java/org/hamcrest/collection/MatchingArrays.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import static org.hamcrest.core.DescribedAs.describedAs;
1212
import static org.hamcrest.core.IsEqual.equalTo;
1313

14-
public class MatchArrays {
14+
public class MatchingArrays {
1515
/**
1616
* Creates a matcher that matches arrays whose elements are satisfied by the specified matchers. Matches
1717
* positively only if the number of matchers specified is equal to the length of the examined array and
@@ -196,7 +196,7 @@ public static <E> Matcher<E[]> arrayWithSize(int size) {
196196
* <pre>assertThat(new String[0], emptyArray())</pre>
197197
*/
198198
public static <E> Matcher<E[]> emptyArray() {
199-
return describedAs("an empty array", MatchArrays.<E>arrayWithSize(0));
199+
return describedAs("an empty array", MatchingArrays.<E>arrayWithSize(0));
200200
}
201201

202202
}

‎hamcrest-library/src/main/java/org/hamcrest/collection/MatchCollections.java renamed to ‎hamcrest-library/src/main/java/org/hamcrest/collection/MatchingCollections.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
import java.util.Collection;
66

7-
import static org.hamcrest.object.MatchObjects.equalTo;
7+
import static org.hamcrest.object.MatchingObjects.equalTo;
88

99
/**
1010
* @since 2.0
1111
*/
12-
public class MatchCollections {
12+
public class MatchingCollections {
1313
/**
1414
* Creates a matcher for {@link java.util.Collection}s that matches when the <code>size()</code> method returns
1515
* a value that satisfies the specified matcher.

‎hamcrest-library/src/main/java/org/hamcrest/collection/MatchIterables.java renamed to ‎hamcrest-library/src/main/java/org/hamcrest/collection/MatchingIterables.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.hamcrest.Matchers;
55
import org.hamcrest.core.Every;
66
import org.hamcrest.core.IsCollectionContaining;
7-
import org.hamcrest.object.MatchObjects;
7+
import org.hamcrest.object.MatchingObjects;
88

99
import java.util.ArrayList;
1010
import java.util.Collection;
@@ -14,9 +14,9 @@
1414
import static java.util.Arrays.asList;
1515
import static org.hamcrest.internal.Wrapping.asEqualToMatchers;
1616
import static org.hamcrest.internal.Wrapping.nullSafe;
17-
import static org.hamcrest.object.MatchObjects.equalTo;
17+
import static org.hamcrest.object.MatchingObjects.equalTo;
1818

19-
public class MatchIterables {
19+
public class MatchingIterables {
2020
/**
2121
* Creates a matcher for {@link Iterable}s that only matches when a single pass over the
2222
* examined {@link Iterable} yields items that are all matched by the specified
@@ -328,7 +328,7 @@ public static <T> Matcher<Iterable<? extends T>> hasSubsequence(Matcher<? super
328328
public static <T> Matcher<Iterable<? extends T>> hasSubsequence(Iterable<? extends T> items) {
329329
List<Matcher<? super T>> matchers = new ArrayList<>();
330330
for (Object item : items) {
331-
matchers.add(MatchObjects.equalTo(item));
331+
matchers.add(MatchingObjects.equalTo(item));
332332
}
333333
return new HasSubsequence<>(matchers);
334334
}

‎hamcrest-library/src/main/java/org/hamcrest/collection/MatchMaps.java renamed to ‎hamcrest-library/src/main/java/org/hamcrest/collection/MatchingMaps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.hamcrest.collection;
22

3-
public class MatchMaps {
3+
public class MatchingMaps {
44
/**
55
* Creates a matcher for {@link java.util.Map}s that matches when the <code>size()</code> method returns
66
* a value that satisfies the specified matcher.

‎hamcrest-library/src/main/java/org/hamcrest/number/MatchNumbers.java renamed to ‎hamcrest-library/src/main/java/org/hamcrest/number/MatchingNumbers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import java.math.BigDecimal;
66

7-
public class MatchNumbers {
7+
public class MatchingNumbers {
88
/**
99
* Creates a matcher of {@link Double}s that matches when an examined double is equal
1010
* to the specified <code>operand</code>, within a range of +/- <code>error</code>.

‎hamcrest-library/src/main/java/org/hamcrest/object/MatchObjects.java renamed to ‎hamcrest-library/src/main/java/org/hamcrest/object/MatchingObjects.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import static org.hamcrest.core.IsNot.not;
1313

14-
public class MatchObjects {
14+
public class MatchingObjects {
1515
/**
1616
* Creates a matcher that always matches, regardless of the examined object.
1717
*/

‎hamcrest-library/src/main/java/org/hamcrest/text/MatchStrings.java renamed to ‎hamcrest-library/src/main/java/org/hamcrest/text/MatchingStrings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import static org.hamcrest.core.AnyOf.anyOf;
1111
import static org.hamcrest.core.IsNull.nullValue;
1212

13-
public class MatchStrings {
13+
public class MatchingStrings {
1414
public static final Matcher<String> IS_EMPTY_STRING = new TypeSafeMatcher<String>() {
1515
@Override public void describeTo(Description description) { description.appendText("an empty string"); }
1616
@Override protected boolean matchesSafely(String item) { return item.isEmpty(); }

‎hamcrest-library/src/main/java/org/hamcrest/xml/MatchXml.java renamed to ‎hamcrest-library/src/main/java/org/hamcrest/xml/MatchingXml.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import static javax.xml.xpath.XPathConstants.STRING;
66
import static org.hamcrest.xml.HasXPath.NO_NAMESPACE_CONTEXT;
77

8-
public class MatchXml {
8+
public class MatchingXml {
99
/**
1010
* Creates a matcher of {@link org.w3c.dom.Node}s that matches when the examined node has a value at the
1111
* specified <code>xPath</code> that satisfies the specified <code>valueMatcher</code>.

‎hamcrest-library/src/main/java/org/junit/matchers/JUnitMatchers.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.hamcrest.CoreMatchers;
44
import org.hamcrest.Matcher;
5-
import org.hamcrest.collection.MatchIterables;
5+
import org.hamcrest.collection.MatchingIterables;
66
import org.hamcrest.core.CombinableMatcher.CombinableBothMatcher;
77
import org.hamcrest.core.CombinableMatcher.CombinableEitherMatcher;
88

@@ -16,49 +16,49 @@
1616
public class JUnitMatchers {
1717
/**
1818
* @return A matcher matching any collection containing element
19-
* @deprecated Please use {@link MatchIterables#hasItem(Object)} instead.
19+
* @deprecated Please use {@link org.hamcrest.collection.MatchingIterables#hasItem(Object)} instead.
2020
*/
2121
@Deprecated
2222
public static <T> Matcher<Iterable<? super T>> hasItem(T element) {
23-
return MatchIterables.hasItem(element);
23+
return MatchingIterables.hasItem(element);
2424
}
2525

2626
/**
2727
* @return A matcher matching any collection containing an element matching elementMatcher
28-
* @deprecated Please use {@link MatchIterables#hasItem(Matcher)} instead.
28+
* @deprecated Please use {@link org.hamcrest.collection.MatchingIterables#hasItem(Matcher)} instead.
2929
*/
3030
@Deprecated
3131
public static <T> Matcher<Iterable<? super T>> hasItem(Matcher<? super T> elementMatcher) {
32-
return MatchIterables.hasItem(elementMatcher);
32+
return MatchingIterables.hasItem(elementMatcher);
3333
}
3434

3535
/**
3636
* @return A matcher matching any collection containing every element in elements
37-
* @deprecated Please use {@link MatchIterables#hasItems(Object...)} instead.
37+
* @deprecated Please use {@link org.hamcrest.collection.MatchingIterables#hasItems(Object...)} instead.
3838
*/
3939
@Deprecated
4040
public static <T> Matcher<Iterable<T>> hasItems(T... elements) {
41-
return MatchIterables.hasItems(elements);
41+
return MatchingIterables.hasItems(elements);
4242
}
4343

4444
/**
4545
* @return A matcher matching any collection containing at least one element that matches
4646
* each matcher in elementMatcher (this may be one element matching all matchers,
4747
* or different elements matching each matcher)
48-
* @deprecated Please use {@link MatchIterables#hasItems(Matcher...)} instead.
48+
* @deprecated Please use {@link org.hamcrest.collection.MatchingIterables#hasItems(Matcher...)} instead.
4949
*/
5050
@Deprecated
5151
public static <T> Matcher<Iterable<T>> hasItems(Matcher<? super T>... elementMatchers) {
52-
return MatchIterables.hasItems(elementMatchers);
52+
return MatchingIterables.hasItems(elementMatchers);
5353
}
5454

5555
/**
5656
* @return A matcher matching any collection in which every element matches elementMatcher
57-
* @deprecated Please use {@link MatchIterables#everyItem(Matcher)} instead.
57+
* @deprecated Please use {@link org.hamcrest.collection.MatchingIterables#everyItem(Matcher)} instead.
5858
*/
5959
@Deprecated
6060
public static <T> Matcher<Iterable<? extends T>> everyItem(final Matcher<T> elementMatcher) {
61-
return MatchIterables.everyItem(elementMatcher);
61+
return MatchingIterables.everyItem(elementMatcher);
6262
}
6363

6464
/**

‎hamcrest-library/src/test/java/org/hamcrest/collection/HasSubsequenceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.ArrayList;
88

99
import static java.util.Arrays.asList;
10-
import static org.hamcrest.collection.MatchIterables.hasSubsequence;
10+
import static org.hamcrest.collection.MatchingIterables.hasSubsequence;
1111
import static org.hamcrest.core.IsEqual.equalTo;
1212

1313
public class HasSubsequenceTest extends AbstractMatcherTest {

‎hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayContainingInAnyOrderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import org.hamcrest.AbstractMatcherTest;
44
import org.hamcrest.Matcher;
55

6-
import static org.hamcrest.collection.MatchArrays.arrayContainingInAnyOrder;
7-
import static org.hamcrest.object.MatchObjects.equalTo;
6+
import static org.hamcrest.collection.MatchingArrays.arrayContainingInAnyOrder;
7+
import static org.hamcrest.object.MatchingObjects.equalTo;
88

99
public class IsArrayContainingInAnyOrderTest extends AbstractMatcherTest {
1010

‎hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayContainingInOrderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.hamcrest.AbstractMatcherTest;
44
import org.hamcrest.Matcher;
55

6-
import static org.hamcrest.collection.MatchArrays.arrayContaining;
6+
import static org.hamcrest.collection.MatchingArrays.arrayContaining;
77
import static org.hamcrest.core.IsEqual.equalTo;
88

99
public class IsArrayContainingInOrderTest extends AbstractMatcherTest {

‎hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayContainingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.hamcrest.AbstractMatcherTest;
44
import org.hamcrest.Matcher;
55

6-
import static org.hamcrest.collection.MatchArrays.hasItemInArray;
6+
import static org.hamcrest.collection.MatchingArrays.hasItemInArray;
77

88

99
public class IsArrayContainingTest extends AbstractMatcherTest {

‎hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.hamcrest.Description;
66
import org.hamcrest.Matcher;
77

8-
import static org.hamcrest.collection.MatchArrays.array;
9-
import static org.hamcrest.object.MatchObjects.equalTo;
8+
import static org.hamcrest.collection.MatchingArrays.array;
9+
import static org.hamcrest.object.MatchingObjects.equalTo;
1010

1111
@SuppressWarnings("unchecked")
1212
public class IsArrayTest extends AbstractMatcherTest {

‎hamcrest-library/src/test/java/org/hamcrest/collection/IsArrayWithSizeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import org.hamcrest.AbstractMatcherTest;
44
import org.hamcrest.Matcher;
55

6-
import static org.hamcrest.collection.MatchArrays.arrayWithSize;
7-
import static org.hamcrest.collection.MatchArrays.emptyArray;
6+
import static org.hamcrest.collection.MatchingArrays.arrayWithSize;
7+
import static org.hamcrest.collection.MatchingArrays.emptyArray;
88
import static org.hamcrest.core.IsEqual.equalTo;
99

1010
public class IsArrayWithSizeTest extends AbstractMatcherTest {

‎hamcrest-library/src/test/java/org/hamcrest/collection/IsEmptyCollectionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.Collection;
88

99
import static java.util.Arrays.asList;
10-
import static org.hamcrest.collection.MatchCollections.empty;
10+
import static org.hamcrest.collection.MatchingCollections.empty;
1111
import static org.hamcrest.core.Is.is;
1212

1313
public class IsEmptyCollectionTest extends AbstractMatcherTest {
@@ -30,7 +30,7 @@ public void testHasAReadableDescription() {
3030
}
3131

3232
public void testCompiles() {
33-
needs(MatchCollections.emptyCollectionOf(String.class));
33+
needs(MatchingCollections.emptyCollectionOf(String.class));
3434
}
3535

3636
private void needs(@SuppressWarnings("unused") Matcher<Collection<String>> bar) { }

‎hamcrest-library/src/test/java/org/hamcrest/collection/IsEmptyIterableTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.Collection;
88

99
import static java.util.Arrays.asList;
10-
import static org.hamcrest.collection.MatchIterables.emptyIterable;
10+
import static org.hamcrest.collection.MatchingIterables.emptyIterable;
1111

1212
public class IsEmptyIterableTest extends AbstractMatcherTest {
1313

@@ -29,7 +29,7 @@ public void testHasAReadableDescription() {
2929
}
3030

3131
public void testCompiles() {
32-
needs(MatchIterables.emptyIterableOf(String.class));
32+
needs(MatchingIterables.emptyIterableOf(String.class));
3333
}
3434

3535
private void needs(@SuppressWarnings("unused") Matcher<Iterable<String>> bar) { }

‎hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInAnyOrderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import static java.util.Arrays.asList;
1010
import static org.hamcrest.collection.IsIterableContainingInOrderTest.make;
1111
import static org.hamcrest.collection.IsIterableContainingInOrderTest.value;
12-
import static org.hamcrest.collection.MatchIterables.containsInAnyOrder;
12+
import static org.hamcrest.collection.MatchingIterables.containsInAnyOrder;
1313

1414
public class IsIterableContainingInAnyOrderTest extends AbstractMatcherTest {
1515

‎hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInOrderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.List;
99

1010
import static java.util.Arrays.asList;
11-
import static org.hamcrest.collection.MatchIterables.contains;
11+
import static org.hamcrest.collection.MatchingIterables.contains;
1212
import static org.hamcrest.core.IsEqual.equalTo;
1313

1414
@SuppressWarnings("unchecked")

‎hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableContainingInRelativeOrderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.List;
99

1010
import static java.util.Arrays.asList;
11-
import static org.hamcrest.collection.MatchIterables.containsInRelativeOrder;
11+
import static org.hamcrest.collection.MatchingIterables.containsInRelativeOrder;
1212
import static org.hamcrest.core.IsEqual.equalTo;
1313

1414
@SuppressWarnings("unchecked")

‎hamcrest-library/src/test/java/org/hamcrest/collection/IsIterableWithSizeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.util.Arrays;
77
import java.util.Collections;
88

9-
import static org.hamcrest.collection.MatchIterables.iterableWithSize;
9+
import static org.hamcrest.collection.MatchingIterables.iterableWithSize;
1010

1111

1212
public class IsIterableWithSizeTest extends AbstractMatcherTest {

‎hamcrest-library/src/test/java/org/hamcrest/number/BigDecimalCloseToTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import java.math.BigDecimal;
77

8-
import static org.hamcrest.number.MatchNumbers.closeTo;
8+
import static org.hamcrest.number.MatchingNumbers.closeTo;
99

1010
public class BigDecimalCloseToTest extends AbstractMatcherTest {
1111
private final Matcher<BigDecimal> matcher = closeTo(new BigDecimal("1.0"), new BigDecimal("0.5"));

‎hamcrest-library/src/test/java/org/hamcrest/number/IsCloseToTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.hamcrest.AbstractMatcherTest;
66
import org.hamcrest.Matcher;
77

8-
import static org.hamcrest.number.MatchNumbers.closeTo;
8+
import static org.hamcrest.number.MatchingNumbers.closeTo;
99

1010
public class IsCloseToTest extends AbstractMatcherTest {
1111
private final Matcher<Double> matcher = closeTo(1.0d, 0.5d);

‎hamcrest-library/src/test/java/org/hamcrest/number/IsNanTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.junit.Test;
55

66
import static org.hamcrest.AbstractMatcherTest.*;
7-
import static org.hamcrest.number.MatchNumbers.notANumber;
7+
import static org.hamcrest.number.MatchingNumbers.notANumber;
88

99
public final class IsNanTest {
1010

‎hamcrest-library/src/test/java/org/hamcrest/number/OrderingComparisonTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import static org.hamcrest.MatcherAssert.assertThat;
1111
import static org.hamcrest.Matchers.not;
12-
import static org.hamcrest.object.MatchObjects.*;
12+
import static org.hamcrest.object.MatchingObjects.*;
1313

1414
public class OrderingComparisonTest extends AbstractMatcherTest {
1515

‎hamcrest-library/src/test/java/org/hamcrest/object/HasToStringTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import static org.hamcrest.AbstractMatcherTest.*;
77
import static org.hamcrest.core.IsEqual.equalTo;
8-
import static org.hamcrest.object.MatchObjects.hasToString;
8+
import static org.hamcrest.object.MatchingObjects.hasToString;
99

1010
public final class HasToStringTest {
1111
private static final String TO_STRING_RESULT = "toString result";

‎hamcrest-library/src/test/java/org/hamcrest/object/IsCompatibleTypeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static class ClassImplementingBaseInterface implements BaseInterface {
2424

2525
@Override
2626
protected Matcher<?> createMatcher() {
27-
return MatchObjects.typeCompatibleWith(BaseClass.class);
27+
return MatchingObjects.typeCompatibleWith(BaseClass.class);
2828
}
2929

3030
public void testMatchesSameClass() {

‎hamcrest-library/src/test/java/org/hamcrest/object/IsEventFromTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class IsEventFromTest extends AbstractMatcherTest {
1515

1616
@Override
1717
protected Matcher<?> createMatcher() {
18-
return MatchObjects.eventFrom(EventObject.class, null);
18+
return MatchingObjects.eventFrom(EventObject.class, null);
1919
}
2020

2121
public void testEvaluatesToTrueIfArgumentIsAnEventObjectFiredByASpecifiedSource() {

0 commit comments

Comments
 (0)