Deprecate APIs that use Hamcrest classes. Users should use the java-h…

…amcrest library instead.

src/main/java/org/junit/Assert.java

@@ -918,7 +918,9 @@ public static void assertEquals(Object[] expecteds, Object[] actuals) {
      * values
      * @see org.hamcrest.CoreMatchers
      * @see org.hamcrest.MatcherAssert
+     * @deprecated use {@code org.hamcrest.junit.MatcherAssert.assertThat()}
      */
+    @Deprecated
     public static <T> void assertThat(T actual, Matcher<? super T> matcher) {
         assertThat("", actual, matcher);
     }
@@ -950,7 +952,9 @@ public static <T> void assertThat(T actual, Matcher<? super T> matcher) {
      * values
      * @see org.hamcrest.CoreMatchers
      * @see org.hamcrest.MatcherAssert
+     * @deprecated use {@code org.hamcrest.junit.MatcherAssert.assertThat()}
      */
+    @Deprecated
     public static <T> void assertThat(String reason, T actual,
             Matcher<? super T> matcher) {
         MatcherAssert.assertThat(reason, actual, matcher);

src/main/java/org/junit/Assume.java

@@ -89,7 +89,9 @@ public static void assumeNotNull(Object... objects) {
      * @param matcher an expression, built of {@link Matcher}s, specifying allowed values
      * @see org.hamcrest.CoreMatchers
      * @see org.junit.matchers.JUnitMatchers
+     * @deprecated use {@code org.hamcrest.junit.MatcherAssume.assumeThat()}
      */
+    @Deprecated
     public static <T> void assumeThat(T actual, Matcher<T> matcher) {
         if (!matcher.matches(actual)) {
             throw new AssumptionViolatedException(actual, matcher);
@@ -112,7 +114,9 @@ public static <T> void assumeThat(T actual, Matcher<T> matcher) {
      * @param matcher an expression, built of {@link Matcher}s, specifying allowed values
      * @see org.hamcrest.CoreMatchers
      * @see org.junit.matchers.JUnitMatchers
+     * @deprecated use {@code org.hamcrest.junit.MatcherAssume.assumeThat()}
      */
+    @Deprecated
     public static <T> void assumeThat(String message, T actual, Matcher<T> matcher) {
         if (!matcher.matches(actual)) {
             throw new AssumptionViolatedException(message, actual, matcher);

src/main/java/org/junit/AssumptionViolatedException.java

@@ -18,6 +18,7 @@ public class AssumptionViolatedException extends org.junit.internal.AssumptionVi
      * An assumption exception with the given <i>actual</i> value and a <i>matcher</i> describing 
      * the expectation that failed.
      */
+    @Deprecated
     public <T> AssumptionViolatedException(T actual, Matcher<T> matcher) {
         super(actual, matcher);
     }
@@ -26,6 +27,7 @@ public <T> AssumptionViolatedException(T actual, Matcher<T> matcher) {
      * An assumption exception with a message with the given <i>actual</i> value and a
      * <i>matcher</i> describing the expectation that failed.
      */
+    @Deprecated
     public <T> AssumptionViolatedException(String message, T expected, Matcher<T> matcher) {
         super(message, expected, matcher);
     }

src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java

@@ -10,7 +10,11 @@
 /**
  * A matcher that delegates to throwableMatcher and in addition appends the
  * stacktrace of the actual Throwable in case of a mismatch.
+ *
+ * @deprecated use {@code org.hamcrest.junit.JunitMatchers.isThrowable()}
+ * or {@code org.hamcrest.junit.JunitMatchers.isException()}
  */
+@Deprecated
 public class StacktracePrintingMatcher<T extends Throwable> extends
         org.hamcrest.TypeSafeMatcher<T> {
 

src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java

@@ -10,7 +10,9 @@
  * match.
  *
  * @param <T> the type of the throwable being matched
+ * @deprecated use {@code org.hamcrest.junit.ExpectedException}
  */
+@Deprecated
 public class ThrowableCauseMatcher<T extends Throwable> extends
         TypeSafeMatcher<T> {
 

src/main/java/org/junit/matchers/JUnitMatchers.java

@@ -11,7 +11,9 @@
  * not currently included in the basic CoreMatchers class from hamcrest.
  *
  * @since 4.4
+ * @deprecated use {@code org.hamcrest.junit.JUnitMatchers}
  */
+@Deprecated
 public class JUnitMatchers {
     /**
      * @return A matcher matching any collection containing element

src/main/java/org/junit/rules/ErrorCollector.java

@@ -49,7 +49,10 @@ public void addError(Throwable error) {
     /**
      * Adds a failure to the table if {@code matcher} does not match {@code value}.
      * Execution continues, but the test will fail at the end if the match fails.
+     *
+     * @deprecated use {@code org.hamcrest.junit.ErrorCollector.checkThat()}
      */
+    @Deprecated
     public <T> void checkThat(final T value, final Matcher<T> matcher) {
         checkThat("", value, matcher);
     }
@@ -58,7 +61,10 @@ public <T> void checkThat(final T value, final Matcher<T> matcher) {
      * Adds a failure with the given {@code reason}
      * to the table if {@code matcher} does not match {@code value}.
      * Execution continues, but the test will fail at the end if the match fails.
+     *
+     * @deprecated use {@code org.hamcrest.junit.ErrorCollector.checkThat()}
      */
+    @Deprecated
     public <T> void checkThat(final String reason, final T value, final Matcher<T> matcher) {
         checkSucceeds(new Callable<Object>() {
             public Object call() throws Exception {

src/main/java/org/junit/rules/ExpectedException.java

@@ -7,7 +7,6 @@
 import static org.junit.Assert.fail;
 import static org.junit.internal.matchers.ThrowableCauseMatcher.hasCause;
 import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
-
 import org.hamcrest.Matcher;
 import org.hamcrest.StringDescription;
 import org.junit.AssumptionViolatedException;
@@ -168,7 +167,10 @@ public Statement apply(Statement base,
      *     thrown.expect(is(e));
      *     throw e;
      * }</pre>
+     *
+     * @deprecated use {@code org.hamcrest.junit.ExpectedException.expect()}
      */
+    @Deprecated
     public void expect(Matcher<?> matcher) {
         matcherBuilder.add(matcher);
     }
@@ -207,7 +209,10 @@ public void expectMessage(String substring) {
      *     thrown.expectMessage(startsWith(&quot;What&quot;));
      *     throw new NullPointerException(&quot;What happened?&quot;);
      * }</pre>
+     *
+     * @deprecated use {@code org.hamcrest.junit.ExpectedException.expectMessage()}
      */
+    @Deprecated
     public void expectMessage(Matcher<String> matcher) {
         expect(hasMessage(matcher));
     }
@@ -221,7 +226,10 @@ public void expectMessage(Matcher<String> matcher) {
      *     thrown.expectCause(is(expectedCause));
      *     throw new IllegalArgumentException(&quot;What happened?&quot;, cause);
      * }</pre>
+     *
+     * @deprecated use {@code org.hamcrest.junit.ExpectedException.expectCause()}
      */
+    @Deprecated
     public void expectCause(Matcher<? extends Throwable> expectedCause) {
         expect(hasCause(expectedCause));
     }