remove usages of deprecated org.junit.Assert.assertThat()

Author: cpoerschke

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

@@ -1,6 +1,5 @@
 package org.junit.rules;
 
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertThrows;
 
 import java.util.ArrayList;
@@ -10,6 +9,7 @@
 import org.junit.function.ThrowingRunnable;
 import org.junit.internal.AssumptionViolatedException;
 import org.hamcrest.Matcher;
+import org.hamcrest.MatcherAssert;
 import org.junit.runners.model.MultipleFailureException;
 
 /**
@@ -74,7 +74,7 @@ public <T> void checkThat(final T value, final Matcher<T> matcher) {
     public <T> void checkThat(final String reason, final T value, final Matcher<T> matcher) {
         checkSucceeds(new Callable<Object>() {
             public Object call() throws Exception {
-                assertThat(reason, value, matcher);
+                MatcherAssert.assertThat(reason, value, matcher);
                 return value;
             }
         });

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

@@ -3,11 +3,11 @@
 import static java.lang.String.format;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertThat;
 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.MatcherAssert;
 import org.hamcrest.StringDescription;
 import org.junit.AssumptionViolatedException;
 import org.junit.runners.model.Statement;
@@ -268,7 +268,7 @@ public void evaluate() throws Throwable {
 
     private void handleException(Throwable e) throws Throwable {
         if (isAnyExceptionExpected()) {
-            assertThat(e, matcherBuilder.build());
+            MatcherAssert.assertThat(e, matcherBuilder.build());
         } else {
             throw e;
         }