Skip to content

Commit 853ac50

Browse files
author
smgfreeman
committed
reverted David's experiment with IsEqual<Object>
1 parent 7eb18f2 commit 853ac50

File tree

6 files changed

+19
-22
lines changed

6 files changed

+19
-22
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static <T> Matcher<T> is(Matcher<T> matcher) {
5555
* vs. assertThat(cheese, is(smelly))
5656
*/
5757
@Factory
58-
public static Matcher<Object> is(Object value) {
58+
public static <T> Matcher<? super T> is(T value) {
5959
return is(equalTo(value));
6060
}
6161

@@ -66,7 +66,7 @@ public static Matcher<Object> is(Object value) {
6666
* vs. assertThat(cheese, is(Cheddar.class))
6767
*/
6868
@Factory
69-
public static Matcher<Object> is(Class<?> type) {
69+
public static <T> Matcher<? super T> is(Class<T> type) {
7070
return is(instanceOf(type));
7171
}
7272
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* Is the value equal to another value, as tested by the
1515
* {@link java.lang.Object#equals} invokedMethod?
1616
*/
17-
public class IsEqual extends BaseMatcher<Object> {
17+
public class IsEqual<T> extends BaseMatcher<T> {
1818
private final Object object;
1919

20-
public IsEqual(Object equalArg) {
20+
public IsEqual(T equalArg) {
2121
object = equalArg;
2222
}
2323

@@ -64,7 +64,7 @@ private static boolean isArray(Object o) {
6464
* {@link java.lang.Object#equals} invokedMethod?
6565
*/
6666
@Factory
67-
public static Matcher<Object> equalTo(Object operand) {
68-
return new IsEqual(operand);
67+
public static <T> Matcher<? super T> equalTo(T operand) {
68+
return new IsEqual<T>(operand);
6969
}
7070
}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ protected Matcher<?> createMatcher() {
1616
return allOf(equalTo("irrelevant"));
1717
}
1818

19+
@SuppressWarnings("unchecked")
1920
public void testEvaluatesToTheTheLogicalConjunctionOfTwoOtherMatchers() {
2021
assertThat("good", allOf(equalTo("good"), equalTo("good")));
2122

@@ -24,26 +25,30 @@ public void testEvaluatesToTheTheLogicalConjunctionOfTwoOtherMatchers() {
2425
assertThat("good", not(allOf(equalTo("bad"), equalTo("bad"))));
2526
}
2627

28+
@SuppressWarnings("unchecked")
2729
public void testEvaluatesToTheTheLogicalConjunctionOfManyOtherMatchers() {
2830
assertThat("good", allOf(equalTo("good"), equalTo("good"), equalTo("good"), equalTo("good"), equalTo("good")));
2931
assertThat("good", not(allOf(equalTo("good"), equalTo("good"), equalTo("bad"), equalTo("good"), equalTo("good"))));
3032
}
3133

34+
@SuppressWarnings("unchecked")
3235
public void testSupportsMixedTypes() {
33-
final Matcher<Object> all = allOf(
36+
final Matcher<SampleSubClass> all = allOf(
3437
equalTo(new SampleBaseClass("bad")),
3538
equalTo(new SampleBaseClass("good")),
3639
equalTo(new SampleSubClass("ugly")));
37-
final Matcher<Object> negated = not(all);
40+
final Matcher<SampleSubClass> negated = not(all);
3841

3942
assertThat(new SampleSubClass("good"), negated);
4043
}
4144

45+
@SuppressWarnings("unchecked")
4246
public void testHasAReadableDescription() {
4347
assertDescription("(\"good\" and \"bad\" and \"ugly\")",
4448
allOf(equalTo("good"), equalTo("bad"), equalTo("ugly")));
4549
}
4650

51+
@SuppressWarnings("unchecked")
4752
public void testMismatchDescriptionDescribesFirstFailingMatch() {
4853
assertMismatchDescription("\"good\" was \"bad\"", allOf(equalTo("bad"), equalTo("good")), "bad");
4954
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ protected Matcher<?> createMatcher() {
1616
return anyOf(equalTo("irrelevant"));
1717
}
1818

19+
@SuppressWarnings("unchecked")
1920
public void testEvaluatesToTheTheLogicalDisjunctionOfTwoOtherMatchers() {
2021
assertThat("good", anyOf(equalTo("bad"), equalTo("good")));
2122
assertThat("good", anyOf(equalTo("good"), equalTo("good")));
@@ -24,13 +25,15 @@ public void testEvaluatesToTheTheLogicalDisjunctionOfTwoOtherMatchers() {
2425
assertThat("good", not(anyOf(equalTo("bad"), equalTo("bad"))));
2526
}
2627

28+
@SuppressWarnings("unchecked")
2729
public void testEvaluatesToTheTheLogicalDisjunctionOfManyOtherMatchers() {
2830
assertThat("good", anyOf(equalTo("bad"), equalTo("good"), equalTo("bad"), equalTo("bad"), equalTo("bad")));
2931
assertThat("good", not(anyOf(equalTo("bad"), equalTo("bad"), equalTo("bad"), equalTo("bad"), equalTo("bad"))));
3032
}
3133

34+
@SuppressWarnings("unchecked")
3235
public void testSupportsMixedTypes() {
33-
final Matcher<Object> combined = anyOf(
36+
final Matcher<SampleSubClass> combined = anyOf(
3437
equalTo(new SampleBaseClass("bad")),
3538
equalTo(new SampleBaseClass("good")),
3639
equalTo(new SampleSubClass("ugly"))
@@ -39,6 +42,7 @@ public void testSupportsMixedTypes() {
3942
assertThat(new SampleSubClass("good"), combined);
4043
}
4144

45+
@SuppressWarnings("unchecked")
4246
public void testHasAReadableDescription() {
4347
assertDescription("(\"good\" or \"bad\" or \"ugly\")",
4448
anyOf(equalTo("good"), equalTo("bad"), equalTo("ugly")));

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.hamcrest.core;
22

3-
import static org.hamcrest.CoreMatchers.is;
43
import static org.hamcrest.CoreMatchers.not;
54
import static org.hamcrest.MatcherAssert.assertThat;
65
import static org.hamcrest.Matchers.equalTo;
@@ -21,18 +20,7 @@ public void bothAcceptsAndRejects() {
2120
assertThat(2, NOT_3_AND_NOT_4);
2221
assertThat(3, not(NOT_3_AND_NOT_4));
2322
}
24-
25-
@Test
26-
public void bothCompilesWithEqualTo() {
27-
assertThat(2, CombinableMatcher.both(not(equalTo(3))).and(not(equalTo(4))));
28-
assertThat(3, not(CombinableMatcher.both(not(equalTo(3))).and(not(equalTo(4)))));
29-
}
3023

31-
@Test
32-
public void bothCompilesWithIs() {
33-
assertThat(3, CombinableMatcher.both(is(3)).and(is(Integer.class)));
34-
}
35-
3624
@Test
3725
public void acceptsAndRejectsThreeAnds() {
3826
final CombinableMatcher<? super Integer> tripleAnd = NOT_3_AND_NOT_4.and(equalTo(2));

‎upload_files.cm

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

33
VERSION=${1}${2}
44
echo "Version: $VERSION"
5-
CREDENTIALS="-u username -w password"
5+
CREDENTIALS="-u smgfreeman@gmail.com -w g3a9p4u3"
66
echo "Credentials: ${CREDENTIALS}"
77

88
# Hmmm. multiple labels don't seem to work properly.

0 commit comments

Comments
 (0)