1 files changed, 1 insertions, 37 deletions

diff --git a/src/main/java/org/junit/rules/ErrorCollector.java b/src/main/java/org/junit/rules/ErrorCollector.java
index 9711e50..8c6600e 100644
--- a/src/main/java/org/junit/rules/ErrorCollector.java
+++ b/src/main/java/org/junit/rules/ErrorCollector.java
@@ -1,14 +1,11 @@
 package org.junit.rules;
 
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertThrows;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
 
-import org.junit.function.ThrowingRunnable;
-import org.junit.internal.AssumptionViolatedException;
 import org.hamcrest.Matcher;
 import org.junit.runners.model.MultipleFailureException;
 
@@ -46,16 +43,7 @@ public class ErrorCollector extends Verifier {
      * Adds a Throwable to the table.  Execution continues, but the test will fail at the end.
      */
     public void addError(Throwable error) {
-        if (error == null) {
-            throw new NullPointerException("Error cannot be null");
-        }
-        if (error instanceof AssumptionViolatedException) {
-            AssertionError e = new AssertionError(error.getMessage());
-            e.initCause(error);
-            errors.add(e);
-        } else {
-            errors.add(error);
-        }
+        errors.add(error);
     }
 
     /**
@@ -88,33 +76,9 @@ public class ErrorCollector extends Verifier {
     public <T> T checkSucceeds(Callable<T> callable) {
         try {
             return callable.call();
-        } catch (AssumptionViolatedException e) {
-            AssertionError error = new AssertionError("Callable threw AssumptionViolatedException");
-            error.initCause(e);
-            addError(error);
-            return null;
         } catch (Throwable e) {
             addError(e);
             return null;
         }
     }
-
-    /**
-     * Adds a failure to the table if {@code runnable} does not throw an
-     * exception of type {@code expectedThrowable} when executed.
-     * Execution continues, but the test will fail at the end if the runnable
-     * does not throw an exception, or if it throws a different exception.
-     *
-     * @param expectedThrowable the expected type of the exception
-     * @param runnable       a function that is expected to throw an exception when executed
-     * @since 4.13
-     */
-    public void checkThrows(Class<? extends Throwable> expectedThrowable, ThrowingRunnable runnable) {
-        try {
-            assertThrows(expectedThrowable, runnable);
-        } catch (AssertionError e) {
-            addError(e);
-        }
-    }
-
 }