From d09cc37d39895b8b8b0bffb1c70d0a9d06df69a1 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 6 Mar 2020 14:28:05 +0100 Subject: [PATCH 1/2] Port to hamcrest 2.2 --- .../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 --- .../org/junit/internal/matchers/ThrowableCauseMatcher.java | 2 -- .../org/junit/internal/matchers/ThrowableMessageMatcher.java | 2 -- src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- .../experimental/theories/runner/WithDataPointMethod.java | 2 +- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java index 93a68276..3ea4a813 100644 --- a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java +++ b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java @@ -1,7 +1,6 @@ package org.junit.internal.matchers; import org.hamcrest.Description; -import org.hamcrest.Factory; import org.hamcrest.Matcher; import org.junit.internal.Throwables; @@ -39,13 +38,11 @@ public class StacktracePrintingMatcher extends return Throwables.getStacktrace(throwable); } - @Factory public static Matcher isThrowable( Matcher throwableMatcher) { return new StacktracePrintingMatcher(throwableMatcher); } - @Factory public static Matcher isException( Matcher exceptionMatcher) { return new StacktracePrintingMatcher(exceptionMatcher); diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java index 6e2ff5e3..1f0a0a02 100644 --- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java +++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java @@ -1,7 +1,6 @@ package org.junit.internal.matchers; import org.hamcrest.Description; -import org.hamcrest.Factory; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; @@ -43,7 +42,6 @@ public class ThrowableCauseMatcher extends * @param matcher to apply to the cause of the outer exception * @param type of the outer exception */ - @Factory public static Matcher hasCause(final Matcher matcher) { return new ThrowableCauseMatcher(matcher); } diff --git a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java index 74386a86..7d16b11b 100644 --- a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java +++ b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java @@ -1,7 +1,6 @@ package org.junit.internal.matchers; import org.hamcrest.Description; -import org.hamcrest.Factory; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; @@ -30,7 +29,6 @@ public class ThrowableMessageMatcher extends matcher.describeMismatch(item.getMessage(), description); } - @Factory public static Matcher hasMessage(final Matcher matcher) { return new ThrowableMessageMatcher(matcher); } diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java index 13407cc0..8889266e 100644 --- a/src/main/java/org/junit/matchers/JUnitMatchers.java +++ b/src/main/java/org/junit/matchers/JUnitMatchers.java @@ -56,7 +56,7 @@ public class JUnitMatchers { * @deprecated Please use {@link CoreMatchers#everyItem(Matcher)} instead. */ @Deprecated - public static Matcher> everyItem(final Matcher elementMatcher) { + public static Matcher> everyItem(final Matcher elementMatcher) { return CoreMatchers.everyItem(elementMatcher); } diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java index f2b27531..e5759ed8 100644 --- a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java +++ b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java @@ -108,7 +108,7 @@ public class WithDataPointMethod { return JUnitCore.runClasses(type).getFailures(); } - private Matcher> empty() { + private Matcher> empty() { return everyItem(nullValue(Failure.class)); } } -- 2.44.0