From b0c0d5bde7ca4b0a5c1112ea339308c4a3f6e8b4 Mon Sep 17 00:00:00 2001 From: Jose Juarez Date: Thu, 31 May 2018 12:52:50 -0500 Subject: [PATCH 1/2] Now tests with assumption violations are flagged with 'I' --- src/main/java/org/junit/internal/TextListener.java | 5 +++++ src/main/java/org/junit/runner/Result.java | 2 +- .../java/org/junit/tests/experimental/AssumptionTest.java | 2 +- .../junit/tests/running/classes/ParameterizedTestTest.java | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/junit/internal/TextListener.java b/src/main/java/org/junit/internal/TextListener.java index d548aeb26e99..9eed264b4400 100644 --- a/src/main/java/org/junit/internal/TextListener.java +++ b/src/main/java/org/junit/internal/TextListener.java @@ -42,6 +42,11 @@ public void testFailure(Failure failure) { public void testIgnored(Description description) { writer.append('I'); } + + @Override + public void testAssumptionFailure(Failure failure) { + writer.append('I'); + } /* * Internal methods diff --git a/src/main/java/org/junit/runner/Result.java b/src/main/java/org/junit/runner/Result.java index 73ad059caefb..97abe7fea1eb 100644 --- a/src/main/java/org/junit/runner/Result.java +++ b/src/main/java/org/junit/runner/Result.java @@ -137,7 +137,7 @@ public void testIgnored(Description description) throws Exception { @Override public void testAssumptionFailure(Failure failure) { - // do nothing: same as passing (for 4.5; may change in 4.6) + ignoreCount.getAndIncrement(); } } diff --git a/src/test/java/org/junit/tests/experimental/AssumptionTest.java b/src/test/java/org/junit/tests/experimental/AssumptionTest.java index 4b9f69a545a0..659880618d68 100644 --- a/src/test/java/org/junit/tests/experimental/AssumptionTest.java +++ b/src/test/java/org/junit/tests/experimental/AssumptionTest.java @@ -40,7 +40,7 @@ public void assumptionsFail() { public void failedAssumptionsMeanPassing() { Result result = JUnitCore.runClasses(HasFailingAssumption.class); assertThat(result.getRunCount(), is(1)); - assertThat(result.getIgnoreCount(), is(0)); + assertThat(result.getIgnoreCount(), is(1)); assertThat(result.getFailureCount(), is(0)); } diff --git a/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java b/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java index 6f610e4fa8ac..af54167d0e9d 100644 --- a/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java +++ b/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java @@ -808,7 +808,7 @@ public void testAssumptionFailure(Failure failure) { Result failureResult = core.run(ParameterizedAssumtionViolation.class); assertTrue(failureResult.wasSuccessful()); assertEquals(0, failureResult.getRunCount()); - assertEquals(0, failureResult.getIgnoreCount()); + assertEquals(1, failureResult.getIgnoreCount()); assertEquals(1, assumptionFailures.size()); } } From 38a4f7e9fb26d65861ae7fa5d6d1f1ed4065da4c Mon Sep 17 00:00:00 2001 From: Jose Juarez Date: Fri, 1 Jun 2018 11:55:01 -0500 Subject: [PATCH 2/2] Removed the line to increment the ignored tests when a test has an AssumptionFailure --- src/main/java/org/junit/runner/Result.java | 2 +- src/test/java/org/junit/tests/experimental/AssumptionTest.java | 2 +- .../org/junit/tests/running/classes/ParameterizedTestTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/junit/runner/Result.java b/src/main/java/org/junit/runner/Result.java index 97abe7fea1eb..73ad059caefb 100644 --- a/src/main/java/org/junit/runner/Result.java +++ b/src/main/java/org/junit/runner/Result.java @@ -137,7 +137,7 @@ public void testIgnored(Description description) throws Exception { @Override public void testAssumptionFailure(Failure failure) { - ignoreCount.getAndIncrement(); + // do nothing: same as passing (for 4.5; may change in 4.6) } } diff --git a/src/test/java/org/junit/tests/experimental/AssumptionTest.java b/src/test/java/org/junit/tests/experimental/AssumptionTest.java index 659880618d68..4b9f69a545a0 100644 --- a/src/test/java/org/junit/tests/experimental/AssumptionTest.java +++ b/src/test/java/org/junit/tests/experimental/AssumptionTest.java @@ -40,7 +40,7 @@ public void assumptionsFail() { public void failedAssumptionsMeanPassing() { Result result = JUnitCore.runClasses(HasFailingAssumption.class); assertThat(result.getRunCount(), is(1)); - assertThat(result.getIgnoreCount(), is(1)); + assertThat(result.getIgnoreCount(), is(0)); assertThat(result.getFailureCount(), is(0)); } diff --git a/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java b/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java index af54167d0e9d..6f610e4fa8ac 100644 --- a/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java +++ b/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java @@ -808,7 +808,7 @@ public void testAssumptionFailure(Failure failure) { Result failureResult = core.run(ParameterizedAssumtionViolation.class); assertTrue(failureResult.wasSuccessful()); assertEquals(0, failureResult.getRunCount()); - assertEquals(1, failureResult.getIgnoreCount()); + assertEquals(0, failureResult.getIgnoreCount()); assertEquals(1, assumptionFailures.size()); } }