Add review changes requested by Tibor Digana
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/a561181a Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/a561181a Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/a561181a Branch: refs/heads/master Commit: a561181a0414f62244b63ab78ea7488bb1e9b2e7 Parents: cb97763 Author: Sean Flanigan <sflan...@redhat.com> Authored: Mon Apr 13 11:03:36 2015 +1000 Committer: Sean Flanigan <sflan...@redhat.com> Committed: Mon Apr 13 11:03:36 2015 +1000 ---------------------------------------------------------------------- .../pom.xml | 5 ++--- .../src/test/java/jiras/surefire1152/FlakyIT.java | 14 +++++++++----- .../test/java/jiras/surefire1152/FlakyITSuite.java | 7 ++++--- .../src/test/java/jiras/surefire1152/FlakyTest.java | 14 +++++++++----- .../test/java/jiras/surefire1152/FlakyTestSuite.java | 7 ++++--- .../apache/maven/surefire/junit4/JUnit4Provider.java | 5 +++-- 6 files changed, 31 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a561181a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml index b0206b7..5719efd 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml @@ -26,7 +26,6 @@ <groupId>org.apache.maven.surefire</groupId> <artifactId>it-parent</artifactId> <version>1.0</version> - <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.maven.plugins.surefire</groupId> <artifactId>jiras-surefire-1152</artifactId> @@ -53,7 +52,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <includes> - <include>**/FlakyTestSuite.java</include> + <include>FlakyTestSuite</include> </includes> <!--<skip>true</skip>--> </configuration> @@ -72,7 +71,7 @@ </executions> <configuration> <includes> - <include>**/FlakyITSuite.java</include> + <include>FlakyITSuite</include> </includes> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a561181a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java index 54888db..27d5b5f 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java +++ b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java @@ -21,14 +21,18 @@ package jiras.surefire1152; import org.junit.Test; -public class FlakyIT { +import static org.junit.Assert.fail; - static int n = 0; +public class FlakyIT +{ + private static int n; @Test - public void testFlaky() { - if (n++ == 0) { - throw new AssertionError("deliberately flaky test (should pass the next time)"); + public void testFlaky() + { + if ( n++ == 0 ) + { + fail( "deliberately flaky test (should pass the next time)" ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a561181a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java index 77d1c9f..0ebd03c 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java +++ b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java @@ -22,7 +22,8 @@ package jiras.surefire1152; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({FlakyIT.class}) -public class FlakyITSuite { +@RunWith( Suite.class ) +@Suite.SuiteClasses( { FlakyIT.class } ) +public class FlakyITSuite +{ } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a561181a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java index 613b7df..cab834c 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java +++ b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java @@ -21,14 +21,18 @@ package jiras.surefire1152; import org.junit.Test; -public class FlakyTest { +import static org.junit.Assert.fail; - static int n = 0; +public class FlakyTest +{ + private static int n; @Test - public void testFlaky() { - if (n++ == 0) { - throw new AssertionError("deliberately flaky test (should pass the next time)"); + public void testFlaky() + { + if ( n++ == 0 ) + { + fail( "deliberately flaky test (should pass the next time)" ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a561181a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java index 09e100b..85ec1b3 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java +++ b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java @@ -22,7 +22,8 @@ package jiras.surefire1152; import org.junit.runner.RunWith; import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({FlakyTest.class}) -public class FlakyTestSuite { +@RunWith( Suite.class ) +@Suite.SuiteClasses( { FlakyTest.class } ) +public class FlakyTestSuite +{ } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a561181a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java b/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java index b622aea..536da71 100644 --- a/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java +++ b/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java @@ -159,7 +159,7 @@ public class JUnit4Provider } } - private void executeWithRerun( Class<?> clazz, RunNotifier listeners ) + private void executeWithRerun( Class<?> clazz, RunNotifier listeners ) throws TestSetFailedException { JUnitTestFailureListener failureListener = new JUnitTestFailureListener(); listeners.addListener( failureListener ); @@ -275,6 +275,7 @@ public class JUnit4Provider } private void executeFailedMethod( RunNotifier notifier, Set<ClassMethod> failedMethods ) + throws TestSetFailedException { for ( ClassMethod failedMethod : failedMethods ) { @@ -286,7 +287,7 @@ public class JUnit4Provider } catch ( ClassNotFoundException e ) { - throw new RuntimeException( "Unable to create test class '" + failedMethod.getClazz() + "'", e ); + throw new TestSetFailedException( "Unable to create test class '" + failedMethod.getClazz() + "'", e ); } } }
