Added a pending mehtod with reason parameter

Author: lefou

src/main/java/de/tobiasroeser/lambdatest/LambdaTest.java

@@ -10,6 +10,12 @@ public interface LambdaTest {
 	 */
 	void pending();
 
+	/**
+	 * Marks the test as pending and uses the given <code>reason</code> as
+	 * message. Instructions after <code>pending()</code> will not be executed.
+	 */
+	void pending(String reason);
+
 	/**
 	 * Intercept exceptions of type <code>exceptionType</code> and fail if no
 	 * such exception or an exception with an incompatible type was thrown.

src/main/java/de/tobiasroeser/lambdatest/junit/FreeSpec.java

@@ -38,6 +38,8 @@
 @RunWith(FreeSpecRunner.class)
 public class FreeSpec implements LambdaTest {
 
+	static final String PENDING_DEFAULT_MSG = "Pending";
+
 	private final List<LambdaTestCase> testCases = new LinkedList<>();
 	private boolean expectFailFast;
 
@@ -75,11 +77,20 @@ public void test(final String name, final RunnableWithException testCase) {
 
 	/**
 	 * Marks the test as pending. Instructions after <code>pending()</code> will
-	 * not be executed and TestNG marks the test as skipped.
+	 * not be executed.
 	 */
 	@Override
 	public void pending() {
-		throw new AssumptionViolatedException("Pending");
+		throw new AssumptionViolatedException(PENDING_DEFAULT_MSG);
+	}
+
+	/**
+	 * Marks the test as pending and uses the given <code>reason</code> as
+	 * message. Instructions after <code>pending()</code> will not be executed.
+	 */
+	@Override
+	public void pending(final String reason) {
+		throw new AssumptionViolatedException("Pending: " + reason);
 	}
 
 	/**
@@ -122,7 +133,7 @@ public <T extends Throwable> T intercept(final Class<T> exceptionType,
 	@Override
 	public <T extends Throwable> T intercept(final Class<T> exceptionType,
 			final String messageRegex, final RunnableWithException throwing)
-					throws Exception {
+			throws Exception {
 		return Intercept.intercept(exceptionType, messageRegex, throwing);
 	}
 

src/main/java/de/tobiasroeser/lambdatest/junit/FreeSpecRunner.java

@@ -101,7 +101,11 @@ protected void runChild(final LambdaTestCase testCase, final RunNotifier runNoti
 			}
 			out.println(ansi.fg(Color.GREEN) + "-- SUCCESS " + testName + ansi.reset());
 		} catch (final AssumptionViolatedException e) {
-			out.println(ansi.fg(Color.YELLOW) + "-- SKIPPED " + testName + " (pending)" + ansi.reset());
+			if (FreeSpec.PENDING_DEFAULT_MSG.equals(e.getMessage())) {
+				out.println(ansi.fg(Color.YELLOW) + "-- SKIPPED " + testName + " (pending)" + ansi.reset());
+			} else {
+				out.println(ansi.fg(Color.YELLOW) + "-- SKIPPED " + testName + ": " + e.getMessage() + ansi.reset());
+			}
 			runNotifier.fireTestAssumptionFailed(new Failure(description, e));
 		} catch (final Throwable e) {
 			try {

src/main/java/de/tobiasroeser/lambdatest/testng/FreeSpec.java

@@ -45,6 +45,8 @@
  */
 public class FreeSpec implements LambdaTest {
 
+	private static final String PENDING_DEFAULT_MSG = "Pending";
+
 	private final List<LambdaTestCase> testCases = new LinkedList<>();
 	private volatile boolean testNeverRun = true;
 	private boolean runInParallel = false;
@@ -96,7 +98,17 @@ public void test(final String name, final RunnableWithException testCase) {
 	 */
 	@Override
 	public void pending() {
-		throw new SkipException("Pending");
+		throw new SkipException(PENDING_DEFAULT_MSG);
+	}
+
+	/**
+	 * Marks the test as pending and uses the given <code>reason</code> as
+	 * message. Instructions after <code>pending()</code> will not be executed
+	 * and TestNG marks the test as skipped.
+	 */
+	@Override
+	public void pending(final String reason) {
+		throw new SkipException("Pending: " + reason);
 	}
 
 	/**
@@ -176,7 +188,8 @@ private void runTestCase(final LambdaTestCase testCase) throws Throwable {
 			if (uncatchedTestError != null && delayedTestError != null) {
 				throw new AssertionError(
 						"An error occured (see root cause) after some expectations failed. Failed Expectations:\n"
-								+ delayedTestError.getMessage(), uncatchedTestError);
+								+ delayedTestError.getMessage(),
+						uncatchedTestError);
 			} else if (uncatchedTestError != null) {
 				// if this was a SkipException, we still detect it, else some
 				// other errors occurred before
@@ -186,7 +199,11 @@ private void runTestCase(final LambdaTestCase testCase) throws Throwable {
 			}
 			out.println(ansi.fg(Color.GREEN) + "-- SUCCESS " + testName + ansi.reset());
 		} catch (final SkipException e) {
-			out.println(ansi.fg(Color.YELLOW) + "-- SKIPPED " + testName + " (pending)" + ansi.reset());
+			if (PENDING_DEFAULT_MSG.equals(e.getMessage())) {
+				out.println(ansi.fg(Color.YELLOW) + "-- SKIPPED " + testName + " (pending)" + ansi.reset());
+			} else {
+				out.println(ansi.fg(Color.YELLOW) + "-- SKIPPED " + testName + ": " + e.getMessage() + ansi.reset());
+			}
 			throw e;
 		} catch (final Throwable e) {
 			try {

src/test/java/de/tobiasroeser/lambdatest/junit/RuntimeTest.java

@@ -34,6 +34,15 @@ public SimplePendingTest() {
 		}
 	}
 
+	public static class SimplePendingWithReasonTest extends FreeSpec {
+		public SimplePendingWithReasonTest() {
+			test("should be pending with reason", () -> {
+				pending("With Reason");
+				Assert.fail("should not be reached");
+			});
+		}
+	}
+
 	@Test(groups = { "junit" })
 	public void testSuccess() {
 		final Result result = JUnitCore.runClasses(SimpleSuccessTest.class);
@@ -58,4 +67,12 @@ public void testPending() {
 		assertEquals(result.getIgnoreCount(), 0);
 	}
 
+	@Test(groups = { "junit" })
+	public void testPendingWithReason() {
+		final Result result = JUnitCore.runClasses(SimplePendingWithReasonTest.class);
+		assertEquals(result.getRunCount(), 1);
+		assertEquals(result.getFailureCount(), 0);
+		assertEquals(result.getIgnoreCount(), 0);
+	}
+
 }

src/test/java/de/tobiasroeser/lambdatest/testng/RuntimeTest.java

@@ -47,6 +47,17 @@ public SimplePendingTest() {
 		}
 	}
 
+	public static class SimplePendingWithReasonTest extends FreeSpec {
+		public SimplePendingWithReasonTest() {
+			if (runInnerTests) {
+				test("should be pending with reason", () -> {
+					pending("The Reason");
+					Assert.fail("should not be reached");
+				});
+			}
+		}
+	}
+
 	public static class SimpleSuccessTest extends FreeSpec {
 		public SimpleSuccessTest() {
 			if (runInnerTests) {
@@ -140,4 +151,14 @@ public void testPendingInSubProcess() throws Exception {
 		});
 	}
 
+	@Test(groups = { "testng" }, dependsOnGroups = { "tempfile" })
+	public void testPendingWithReasonInSubProcess() throws Exception {
+		testInJvm(SimplePendingWithReasonTest.class.getName(), result -> {
+			assertNotEquals(result.exitCode, 0);
+			final Optional<String> line = Util.find(result.output, l -> l.startsWith("Total tests run"));
+			assertTrue(line.isDefined());
+			assertEquals(line.get(), "Total tests run: 1, Failures: 0, Skips: 1");
+		});
+	}
+
 }