Skip to content

Commit 6e5a464

Browse files
author
nat.pryce
committed
deleted introspection package
1 parent b70a4d1 commit 6e5a464

File tree

15 files changed

+41
-122
lines changed

15 files changed

+41
-122
lines changed

‎hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java

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

33
import java.util.Arrays;
44

5+
import org.hamcrest.Description;
56
import org.hamcrest.Factory;
67
import org.hamcrest.Matcher;
78

@@ -15,9 +16,15 @@ public AllOf(Iterable<Matcher<? super T>> matchers) {
1516
super(matchers);
1617
}
1718

19+
20+
@Override
21+
public boolean matches(Object o) {
22+
return matches(o, false);
23+
}
24+
1825
@Override
19-
protected boolean shortcut() {
20-
return false;
26+
public void describeTo(Description description) {
27+
describeTo(description, "and");
2128
}
2229

2330
/**

‎hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java

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

33
import java.util.Arrays;
44

5+
import org.hamcrest.Description;
56
import org.hamcrest.Factory;
67
import org.hamcrest.Matcher;
78

@@ -14,12 +15,19 @@ public class AnyOf<T> extends ShortcutCombination<T> {
1415
public AnyOf(Iterable<Matcher<? super T>> matchers) {
1516
super(matchers);
1617
}
17-
18+
1819
@Override
19-
protected boolean shortcut() {
20-
return true;
20+
public boolean matches(Object o) {
21+
return matches(o, true);
2122
}
2223

24+
@Override
25+
public void describeTo(Description description) {
26+
describeTo(description, "or");
27+
}
28+
29+
30+
2331
/**
2432
* Evaluates to true if ANY of the passed in matchers evaluate to true.
2533
*/

‎hamcrest-core/src/main/java/org/hamcrest/core/DescribedAs.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
import org.hamcrest.Description;
99
import org.hamcrest.Factory;
1010
import org.hamcrest.Matcher;
11-
import org.hamcrest.introspection.Modifier;
1211

1312
/**
1413
* Provides a custom description to another matcher.
1514
*/
16-
public class DescribedAs<T> extends BaseMatcher<T> implements Modifier {
15+
public class DescribedAs<T> extends BaseMatcher<T> {
1716
private final String descriptionTemplate;
1817
private final Matcher<T> matcher;
1918
private final Object[] values;
@@ -46,10 +45,6 @@ public void describeTo(Description description) {
4645
}
4746
}
4847

49-
public Matcher<?> modified() {
50-
return matcher;
51-
}
52-
5348
/**
5449
* Wraps an existing matcher and overrides the description when it fails.
5550
*/

‎hamcrest-core/src/main/java/org/hamcrest/core/IsEqual.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
import org.hamcrest.Description;
99
import org.hamcrest.Factory;
1010
import org.hamcrest.Matcher;
11-
import org.hamcrest.introspection.Comparison;
1211

1312

1413
/**
1514
* Is the value equal to another value, as tested by the
1615
* {@link java.lang.Object#equals} invokedMethod?
1716
*/
18-
public class IsEqual<T> extends BaseMatcher<T> implements Comparison {
17+
public class IsEqual<T> extends BaseMatcher<T> {
1918
private final Object object;
2019

2120
public IsEqual(T equalArg) {
@@ -30,10 +29,6 @@ public void describeTo(Description description) {
3029
description.appendValue(object);
3130
}
3231

33-
public Object operand() {
34-
return object;
35-
}
36-
3732
private static boolean areEqual(Object o1, Object o2) {
3833
if (o1 == null || o2 == null) {
3934
return o1 == null && o2 == null;

‎hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
import org.hamcrest.Description;
77
import org.hamcrest.Factory;
88
import org.hamcrest.Matcher;
9-
import org.hamcrest.introspection.Comparison;
109

1110

1211
/**
1312
* Tests whether the value is an instance of a class.
1413
*/
15-
public class IsInstanceOf extends BaseMatcher<Object> implements Comparison {
14+
public class IsInstanceOf extends BaseMatcher<Object> {
1615
private final Class<?> theClass;
1716

1817
/**
@@ -34,10 +33,6 @@ public void describeTo(Description description) {
3433
.appendText(theClass.getName());
3534
}
3635

37-
public Class<?> operand() {
38-
return theClass;
39-
}
40-
4136
/**
4237
* Is the value an instance of a particular type?
4338
*/

‎hamcrest-core/src/main/java/org/hamcrest/core/IsNot.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
import org.hamcrest.Description;
99
import org.hamcrest.Factory;
1010
import org.hamcrest.Matcher;
11-
import org.hamcrest.introspection.Modifier;
1211

1312

1413
/**
1514
* Calculates the logical negation of a matcher.
1615
*/
17-
public class IsNot<T> extends BaseMatcher<T> implements Modifier {
16+
public class IsNot<T> extends BaseMatcher<T> {
1817
private final Matcher<T> matcher;
1918

2019
public IsNot(Matcher<T> matcher) {
@@ -30,10 +29,6 @@ public void describeTo(Description description) {
3029
}
3130

3231

33-
public Matcher<?> modified() {
34-
return matcher;
35-
}
36-
3732
/**
3833
* Inverts the rule.
3934
*/

‎hamcrest-core/src/main/java/org/hamcrest/core/IsSame.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
*/
33
package org.hamcrest.core;
44

5+
import org.hamcrest.BaseMatcher;
56
import org.hamcrest.Description;
6-
import org.hamcrest.Matcher;
77
import org.hamcrest.Factory;
8-
import org.hamcrest.BaseMatcher;
9-
import org.hamcrest.introspection.Comparison;
8+
import org.hamcrest.Matcher;
109

1110

1211
/**
1312
* Is the value the same object as another value?
1413
*/
15-
public class IsSame<T> extends BaseMatcher<T> implements Comparison {
14+
public class IsSame<T> extends BaseMatcher<T> {
1615
private final T object;
1716

1817
public IsSame(T object) {
@@ -27,10 +26,6 @@ public void describeTo(Description description) {
2726
description.appendText("same(") .appendValue(object) .appendText(")");
2827
}
2928

30-
public Object operand() {
31-
return object;
32-
}
33-
3429
/**
3530
* Creates a new instance of IsSame
3631
*

‎hamcrest-core/src/main/java/org/hamcrest/core/ShortcutCombination.java

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,29 @@
33
import org.hamcrest.BaseMatcher;
44
import org.hamcrest.Description;
55
import org.hamcrest.Matcher;
6-
import org.hamcrest.introspection.Combination;
76

8-
abstract class ShortcutCombination<T> extends BaseMatcher<T> implements Combination {
7+
abstract class ShortcutCombination<T> extends BaseMatcher<T> {
98
private final Iterable<Matcher<? super T>> matchers;
109

1110
public ShortcutCombination(Iterable<Matcher<? super T>> matchers) {
1211
this.matchers = matchers;
1312
}
14-
15-
public boolean matches(Object o) {
13+
14+
public abstract boolean matches(Object o);
15+
16+
public abstract void describeTo(Description description);
17+
18+
19+
protected boolean matches(Object o, boolean shortcut) {
1620
for (Matcher<? super T> matcher : matchers) {
17-
if (matcher.matches(o) == shortcut()) {
18-
return shortcut();
21+
if (matcher.matches(o) == shortcut) {
22+
return shortcut;
1923
}
2024
}
21-
return !shortcut();
22-
}
23-
24-
protected abstract boolean shortcut();
25-
26-
public void describeTo(Description description) {
27-
description.appendList("(", " and ", ")", matchers);
25+
return !shortcut;
2826
}
2927

30-
public Iterable<? extends Matcher<? super T>> combined() {
31-
return matchers;
28+
public void describeTo(Description description, String operator) {
29+
description.appendList("(", " " + operator + " ", ")", matchers);
3230
}
3331
}

‎hamcrest-core/src/main/java/org/hamcrest/introspection/Combination.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎hamcrest-core/src/main/java/org/hamcrest/introspection/Comparison.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎hamcrest-core/src/main/java/org/hamcrest/introspection/Modifier.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎hamcrest-unit-test/src/main/java/org/hamcrest/core/AllOfTest.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
import static org.hamcrest.core.IsEqual.equalTo;
66
import static org.hamcrest.core.IsNot.not;
77

8-
import java.util.Iterator;
9-
108
import org.hamcrest.AbstractMatcherTest;
119
import org.hamcrest.Matcher;
12-
import org.hamcrest.introspection.Combination;
1310

1411
public class AllOfTest extends AbstractMatcherTest {
1512
public void testEvaluatesToTheTheLogicalConjunctionOfTwoOtherMatchers() {
@@ -35,20 +32,6 @@ public void testSupportsMixedTypes() {
3532
assertThat(new SampleSubClass("good"), negated);
3633
}
3734

38-
public void testCanIntrospectOnTheCombinedMatchers() {
39-
Matcher<String> m1 = equalTo("good");
40-
Matcher<String> m2 = equalTo("bad");
41-
Matcher<String> m3 = equalTo("ugly");
42-
43-
Matcher<String> all = allOf(m1, m2, m3);
44-
45-
Iterator<? extends Matcher<?>> iterator = ((Combination)all).combined().iterator();
46-
assertSame(m1, iterator.next());
47-
assertSame(m2, iterator.next());
48-
assertSame(m3, iterator.next());
49-
assertFalse(iterator.hasNext());
50-
}
51-
5235
protected Matcher<?> createMatcher() {
5336
return allOf(equalTo("irrelevant"), equalTo("irrelevant"));
5437
}

‎hamcrest-unit-test/src/main/java/org/hamcrest/core/AnyOfTest.java

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
import static org.hamcrest.core.IsEqual.equalTo;
66
import static org.hamcrest.core.IsNot.not;
77

8-
import java.util.Iterator;
9-
108
import org.hamcrest.AbstractMatcherTest;
119
import org.hamcrest.Matcher;
12-
import org.hamcrest.introspection.Combination;
1310

1411
public class AnyOfTest extends AbstractMatcherTest {
1512

@@ -38,19 +35,5 @@ public void testSupportsMixedTypes() {
3835
);
3936

4037
assertThat(new SampleSubClass("good"), combined);
41-
}
42-
43-
public void testCanIntrospectOnTheCombinedMatchers() {
44-
Matcher<String> m1 = equalTo("good");
45-
Matcher<String> m2 = equalTo("bad");
46-
Matcher<String> m3 = equalTo("ugly");
47-
48-
Matcher<String> any = anyOf(m1, m2, m3);
49-
50-
Iterator<? extends Matcher<?>> iterator = ((Combination)any).combined().iterator();
51-
assertSame(m1, iterator.next());
52-
assertSame(m2, iterator.next());
53-
assertSame(m3, iterator.next());
54-
assertFalse(iterator.hasNext());
55-
}
38+
}
5639
}

‎hamcrest-unit-test/src/main/java/org/hamcrest/core/DescribedAsTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import org.hamcrest.AbstractMatcherTest;
1010
import org.hamcrest.Matcher;
11-
import org.hamcrest.introspection.Modifier;
1211

1312
public class DescribedAsTest extends AbstractMatcherTest {
1413
protected Matcher<?> createMatcher() {
@@ -37,11 +36,4 @@ public void testDelegatesMatchingToAnotherMatcher() {
3736
assertTrue(m1.matches(new Object()));
3837
assertFalse(m2.matches("hi"));
3938
}
40-
41-
public void testCanBeIntrospected() {
42-
Matcher<String> described = anything();
43-
Matcher<String> descriptor = describedAs("something", described);
44-
45-
assertSame(described, ((Modifier)descriptor).modified());
46-
}
4739
}

‎hamcrest-unit-test/src/main/java/org/hamcrest/core/IsNotTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import org.hamcrest.AbstractMatcherTest;
99
import org.hamcrest.Matcher;
10-
import org.hamcrest.introspection.Modifier;
1110

1211
public class IsNotTest extends AbstractMatcherTest {
1312
protected Matcher<?> createMatcher() {
@@ -26,11 +25,4 @@ public void testProvidesConvenientShortcutForNotEqualTo() {
2625
assertDoesNotMatch("should not match", not("B"), "B");
2726
assertDescription("not \"A\"", not("A"));
2827
}
29-
30-
public void testCanBeIntrospected() {
31-
Matcher<String> complemented = equalTo("A");
32-
Matcher<String> complement = not(complemented);
33-
34-
assertSame(complemented, ((Modifier)complement).modified());
35-
}
3628
}

0 commit comments

Comments
 (0)