Failed assumptions in @before and @BeforeClass cause the test to pass

Author: dsaff

README.html

@@ -168,6 +168,9 @@ <h3>assumeThat</h3>
 those functionalities are subsumed in assumeThat, with the appropriate
 matcher.</p>
 
+<p>A failing assumption in a <code>@Before</code> or <code>@BeforeClass</code> method will have the same effect
+as a failing assumption in each <code>@Test</code> method of the class.</p>
+
 <h3>Theories</h3>
 
 <p><a name="theories" />
@@ -239,7 +242,7 @@ <h3>Other changes</h3>
 <code>JUnit3ClassRunner</code>.  The new design allows variations in running
 individual test classes to be expressed with fewer custom classes.
 For a good example, see the source to
-<code>org.junit.experimental.theories.runner.api.Theories</code>.</p></li>
+<code>org.junit.experimental.theories.Theories</code>.</p></li>
 <li><p>The rules for determining which runner is applied by default to a
 test class have been simplified:</p>
 

doc/ReleaseNotes4.4.html

@@ -123,6 +123,9 @@ <h3>Assumptions</h3>
 those functionalities are subsumed in <code>assumeThat</code>, with the appropriate
 matcher.</p>
 
+<p>A failing assumption in a <code>@Before</code> or <code>@BeforeClass</code> method will have the same effect
+as a failing assumption in each <code>@Test</code> method of the class.</p>
+
 <p><a name="theories" /></p>
 
 <h3>Theories</h3>
@@ -197,7 +200,7 @@ <h3>Other changes</h3>
 <code>JUnit3ClassRunner</code>.  The new design allows variations in running
 individual test classes to be expressed with fewer custom classes.
 For a good example, see the source to
-<code>org.junit.experimental.theories.runner.api.Theories</code>.</p></li>
+<code>org.junit.experimental.theories.Theories</code>.</p></li>
 <li><p>The rules for determining which runner is applied by default to a
 test class have been simplified:</p>
 

doc/ReleaseNotes4.4.txt

@@ -131,6 +131,9 @@ inclusion of Hamcrest, we do not need to create `assumeEquals`,
 those functionalities are subsumed in `assumeThat`, with the appropriate
 matcher.
 
+A failing assumption in a `@Before` or `@BeforeClass` method will have the same effect
+as a failing assumption in each `@Test` method of the class.
+
 <a name="theories" />
 ### Theories ###
 
@@ -209,7 +212,7 @@ This release contains other bug fixes and new features.  Among them:
   `JUnit3ClassRunner`.  The new design allows variations in running
   individual test classes to be expressed with fewer custom classes.
   For a good example, see the source to
-  `org.junit.experimental.theories.runner.api.Theories`.
+  `org.junit.experimental.theories.Theories`.
 
 - The rules for determining which runner is applied by default to a
   test class have been simplified:

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

@@ -4,6 +4,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
+import org.junit.Assume.AssumptionViolatedException;
 import org.junit.runner.Description;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunNotifier;
@@ -42,11 +43,14 @@ public void runProtected() {
 
 	private void runBefores() throws FailedBefore {
 		try {
-			List<Method> befores= fTestClass.getBefores();
-			for (Method before : befores)
-				before.invoke(null);
-		} catch (InvocationTargetException e) {
-			addFailure(e.getTargetException());
+			try {
+				List<Method> befores= fTestClass.getBefores();
+				for (Method before : befores)
+					before.invoke(null);
+			} catch (InvocationTargetException e) {
+				throw e.getTargetException();
+			}
+		} catch (AssumptionViolatedException e) {
 			throw new FailedBefore();
 		} catch (Throwable e) {
 			addFailure(e);

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

@@ -116,11 +116,14 @@ else if (fTestMethod.isUnexpected(actual)) {
 
 	private void runBefores() throws FailedBefore {
 		try {
-			List<Method> befores= fTestMethod.getBefores();
-			for (Method before : befores)
-				before.invoke(fTest);
-		} catch (InvocationTargetException e) {
-			addFailure(e.getTargetException());
+			try {
+				List<Method> befores= fTestMethod.getBefores();
+				for (Method before : befores)
+					before.invoke(fTest);
+			} catch (InvocationTargetException e) {
+				throw e.getTargetException();
+			}
+		} catch (AssumptionViolatedException e) {
 			throw new FailedBefore();
 		} catch (Throwable e) {
 			addFailure(e);

src/org/junit/tests/AssumptionTest.java

@@ -5,9 +5,14 @@
 import static org.junit.Assume.assumeNoException;
 import static org.junit.Assume.assumeNotNull;
 import static org.junit.Assume.assumeThat;
+import static org.junit.Assume.assumeTrue;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
 import static org.junit.matchers.StringContains.containsString;
 
 import org.junit.Assume;
+import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.Assume.AssumptionViolatedException;
 import org.junit.runner.JUnitCore;
@@ -106,4 +111,32 @@ private void assertCompletesNormally() {
 	@Test(expected=AssumptionViolatedException.class) public void assumeTrueWorks() {
 		Assume.assumeTrue(false);
 	}
+	
+	public static class HasFailingAssumeInBefore {
+		@Before public void checkForSomethingThatIsntThere() {
+			assumeTrue(false);
+		}
+		
+		@Test public void failing() {
+			fail();
+		}
+	}
+	
+	@Test public void failingAssumptionInBeforePreventsTestRun() {
+		assertThat(testResult(HasFailingAssumeInBefore.class), isSuccessful());
+	}
+	
+	public static class HasFailingAssumeInBeforeClass {
+		@BeforeClass public static void checkForSomethingThatIsntThere() {
+			assumeTrue(false);
+		}
+		
+		@Test public void failing() {
+			fail();
+		}
+	}
+	
+	@Test public void failingAssumptionInBeforeClassPreventsTestRun() {
+		assertThat(testResult(HasFailingAssumeInBeforeClass.class), isSuccessful());
+	}
 }