Create AssumptionViolatedException in org.junit and deprecate the one…

… in org.junit.internal

Allows developers to write code that handles assumption violations without depending on internal classes

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

@@ -7,7 +7,6 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 
 import org.hamcrest.Matcher;
-import org.junit.internal.AssumptionViolatedException;
 
 /**
  * A set of methods useful for stating assumptions about the conditions in which a test is meaningful.

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

@@ -0,0 +1,48 @@
+package org.junit;
+
+import org.hamcrest.Matcher;
+
+/**
+ * An exception class used to implement <i>assumptions</i> (state in which a given test
+ * is meaningful and should or should not be executed). A test for which an assumption
+ * fails should not generate a test case failure.
+ *
+ * @see org.junit.Assume
+ */
+public class AssumptionViolatedException extends org.junit.internal.AssumptionViolatedException {
+ private static final long serialVersionUID = 1L;
+
+ public AssumptionViolatedException(String assumption, boolean valueMatcher, Object value, Matcher<?> matcher) {
+ super(assumption, valueMatcher, value, matcher);
+ }
+
+ /**
+ * An assumption exception with the given <i>value</i> (String or
+ * Throwable) and an additional failing {@link Matcher}.
+ */
+ public AssumptionViolatedException(Object value, Matcher<?> matcher) {
+ super(value, matcher);
+ }
+
+ /**
+ * An assumption exception with the given <i>value</i> (String or
+ * Throwable) and an additional failing {@link Matcher}.
+ */
+ public AssumptionViolatedException(String assumption, Object value, Matcher<?> matcher) {
+ super(assumption, value, matcher);
+ }
+
+ /**
+ * An assumption exception with the given message only.
+ */
+ public AssumptionViolatedException(String assumption) {
+ super(assumption);
+ }
+
+ /**
+ * An assumption exception with the given message and a cause.
+ */
+ public AssumptionViolatedException(String assumption, Throwable t) {
+ super(assumption, t);
+ }
+}

src/main/java/org/junit/experimental/theories/Theories.java

@@ -10,9 +10,9 @@
 
 import org.junit.Assert;
 import org.junit.Assume;
+import org.junit.AssumptionViolatedException;
 import org.junit.experimental.theories.internal.Assignments;
 import org.junit.experimental.theories.internal.ParameterizedAssertionError;
-import org.junit.internal.AssumptionViolatedException;
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;

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

@@ -10,8 +10,11 @@
  * is meaningful and should or should not be executed). A test for which an assumption
  * fails should not generate a test case failure.
  *
- * @see Assume
+ * @see org.junit.Assume
+ *
+ * @deprecated Please use {@link org.junit.AssumptionViolatedException} instead.
  */
+@Deprecated
 public class AssumptionViolatedException extends RuntimeException implements SelfDescribing {
  private static final long serialVersionUID = 2L;
 

src/main/java/org/junit/internal/runners/ClassRoadie.java

@@ -59,7 +59,7 @@ private void runBefores() throws FailedBefore {
  } catch (InvocationTargetException e) {
  throw e.getTargetException();
  }
- } catch (org.junit.internal.AssumptionViolatedException e) {
+ } catch (org.junit.AssumptionViolatedException e) {
  throw new FailedBefore();
  } catch (Throwable e) {
  addFailure(e);

src/main/java/org/junit/internal/runners/MethodRoadie.java

@@ -10,7 +10,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 import org.junit.runner.Description;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunNotifier;

src/main/java/org/junit/internal/runners/model/EachTestNotifier.java

@@ -1,6 +1,6 @@
 package org.junit.internal.runners.model;
 
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 import org.junit.runner.Description;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunNotifier;

src/main/java/org/junit/internal/runners/statements/ExpectException.java

@@ -1,6 +1,6 @@
 package org.junit.internal.runners.statements;
 
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 import org.junit.runners.model.Statement;
 
 public class ExpectException extends Statement {

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

@@ -9,7 +9,7 @@
 import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
 import org.hamcrest.Matcher;
 import org.hamcrest.StringDescription;
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 import org.junit.runners.model.Statement;
 
 /**

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

@@ -1,6 +1,6 @@
 package org.junit.rules;
 
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 import org.junit.runner.Description;
 
 import java.util.concurrent.TimeUnit;

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

@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 import org.junit.runner.Description;
 import org.junit.runners.model.MultipleFailureException;
 import org.junit.runners.model.Statement;

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

@@ -1,6 +1,6 @@
 package org.junit.rules;
 
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.Statement;
 

src/main/java/org/junit/runner/notification/RunListener.java

@@ -6,7 +6,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 import org.junit.runner.Description;
 import org.junit.runner.Result;
 

src/main/java/org/junit/runner/notification/RunNotifier.java

@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 import org.junit.runner.Description;
 import org.junit.runner.Result;
 

src/main/java/org/junit/runners/ParentRunner.java

@@ -13,11 +13,11 @@
 import java.util.List;
 
 import org.junit.AfterClass;
+import org.junit.AssumptionViolatedException;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Rule;
-import org.junit.internal.AssumptionViolatedException;
 import org.junit.internal.runners.model.EachTestNotifier;
 import org.junit.internal.runners.statements.RunAfters;
 import org.junit.internal.runners.statements.RunBefores;

src/test/java/org/junit/tests/experimental/AssumptionTest.java

@@ -18,10 +18,10 @@
 import java.util.List;
 
 import org.junit.Assume;
+import org.junit.AssumptionViolatedException;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.internal.AssumptionViolatedException;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;

src/test/java/org/junit/tests/experimental/AssumptionViolatedExceptionTest.java

@@ -8,11 +8,11 @@
 
 import org.hamcrest.Matcher;
 import org.hamcrest.StringDescription;
+import org.junit.AssumptionViolatedException;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoint;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.Theory;
-import org.junit.internal.AssumptionViolatedException;
 import org.junit.runner.RunWith;
 
 @RunWith(Theories.class)

src/test/java/org/junit/tests/experimental/rules/StopwatchTest.java

@@ -1,9 +1,9 @@
 package org.junit.tests.experimental.rules;
 
+import org.junit.AssumptionViolatedException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.internal.AssumptionViolatedException;
 import org.junit.rules.Stopwatch;
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;

src/test/java/org/junit/tests/experimental/rules/TestRuleTest.java

@@ -15,10 +15,10 @@
 
 import org.junit.After;
 import org.junit.Assume;
+import org.junit.AssumptionViolatedException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.internal.AssumptionViolatedException;
 import org.junit.rules.TestName;
 import org.junit.rules.TestRule;
 import org.junit.rules.TestWatcher;

src/test/java/org/junit/tests/experimental/rules/TestWatcherTest.java

@@ -9,10 +9,10 @@
 import static org.junit.experimental.results.ResultMatchers.hasFailureContaining;
 import static org.junit.runner.JUnitCore.runClasses;
 
+import org.junit.AssumptionViolatedException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.results.PrintableResult;
-import org.junit.internal.AssumptionViolatedException;
 import org.junit.rules.TestRule;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;

src/test/java/org/junit/tests/experimental/theories/extendingwithstubs/Guesser.java

@@ -11,7 +11,7 @@
 
 import org.hamcrest.BaseDescription;
 import org.hamcrest.Description;
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 
 public class Guesser<T> extends ReguessableValue {
  static class GuessMap extends HashMap<MethodCall, Object> implements

src/test/java/org/junit/tests/experimental/theories/extendingwithstubs/GuesserQueue.java

@@ -4,8 +4,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.junit.AssumptionViolatedException;
 import org.junit.experimental.theories.PotentialAssignment;
-import org.junit.internal.AssumptionViolatedException;
 
 public class GuesserQueue extends ArrayList<ReguessableValue> {
  static class ReguessableDecorator extends ReguessableValue {

src/test/java/org/junit/tests/experimental/theories/extendingwithstubs/ReguessableValue.java

@@ -2,8 +2,8 @@
 
 import java.util.List;
 
+import org.junit.AssumptionViolatedException;
 import org.junit.experimental.theories.PotentialAssignment;
-import org.junit.internal.AssumptionViolatedException;
 
 public abstract class ReguessableValue extends PotentialAssignment {
 

src/test/java/org/junit/tests/experimental/theories/extendingwithstubs/StubbedTheories.java

@@ -4,10 +4,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.AssumptionViolatedException;
 import org.junit.experimental.theories.ParameterSignature;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.internal.Assignments;
-import org.junit.internal.AssumptionViolatedException;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.Statement;