Repository: maven-surefire Updated Branches: refs/heads/master 3fd14a9bf -> 40b4b48a3
[SUREFIRE-817] JUnit 4.7+ Provider and System Exit proved by ITs Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/40b4b48a Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/40b4b48a Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/40b4b48a Branch: refs/heads/master Commit: 40b4b48a323c46e1b2ace3d5acb4add183b12d02 Parents: 3fd14a9 Author: tibordigana <tibo...@lycos.com> Authored: Thu Oct 16 23:18:51 2014 +0200 Committer: tibordigana <tibo...@lycos.com> Committed: Thu Oct 16 23:18:51 2014 +0200 ---------------------------------------------------------------------- .../maven/surefire/its/JUnit47ParallelIT.java | 2 +- .../Surefire1028UnableToRunSingleTest.java | 2 +- .../Surefire1080ParallelForkDoubleTestIT.java | 2 +- ...urefire1082ParallelJUnitParameterizedIT.java | 2 +- .../its/jiras/Surefire1095NpeInRunListener.java | 2 +- .../jiras/Surefire1098BalancedRunOrderIT.java | 2 +- .../its/jiras/Surefire817SystemExitIT.java | 47 ++++++++++++ .../src/test/resources/junit47-parallel/pom.xml | 19 ++--- .../test/java/surefireparallel/TestClass.java | 2 +- .../pom.xml | 19 ++--- .../pom.xml | 11 +-- .../pom.xml | 19 ++--- .../surefire-1095-npe-in-runlistener/pom.xml | 19 ++--- .../surefire-1098-balanced-runorder/pom.xml | 19 ++--- .../resources/surefire-817-system-exit/pom.xml | 76 ++++++++++++++++++++ .../src/test/java/jiras/surefire817/Test.java | 29 ++++++++ .../surefire/junitcore/pc/Destroyable.java | 2 +- .../surefire/junitcore/pc/ExecutionStatus.java | 2 +- .../surefire/junitcore/pc/ShutdownStatus.java | 2 +- .../junitcore/pc/SingleThreadScheduler.java | 2 +- 20 files changed, 225 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java index 03c0628..921ba73 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java @@ -26,7 +26,7 @@ import org.junit.Test; /** * Testing JUnitCoreWrapper with ParallelComputerBuilder. * - * @author <a href="mailto:tibor.dig...@gmail.com">Tibor Digana (tibor17)</a> + * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> * @since 2.16 */ public class JUnit47ParallelIT http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleTest.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleTest.java index 03492b3..ac40212 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleTest.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleTest.java @@ -37,7 +37,7 @@ import org.junit.Test; * Results : * Tests run: 0, Failures: 0, Errors: 0, Skipped: 0 * - * @author <a href="mailto:tibor.dig...@gmail.com">Tibor Digana (tibor17)</a> + * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1028} * @since 2.18 */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java index cefd523..27d8cfd 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java @@ -34,7 +34,7 @@ import org.junit.Test; * Surefire 2.18-SNAPSHOT * JUnit 4.11 * - * @author <a href="mailto:tibor.dig...@gmail.com">Tibor Digana (tibor17)</a> + * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1080} * @since 2.18 */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java index 7699f4b..c50d4e4 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java @@ -37,7 +37,7 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; /** - * @author <a href="mailto:tibor.dig...@gmail.com">Tibor Digana (tibor17)</a> + * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1082} * @since 2.18 */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java index 71a6ced..509f3d0 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java @@ -40,7 +40,7 @@ import org.junit.Test; * of a Description instance that "describes the tests to be run " * Note: other methods in the RunListener I tested seems fine (i.e., they get a valid Description object as input) * - * @author <a href="mailto:tibor.dig...@gmail.com">Tibor Digana (tibor17)</a> + * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1095} * @since 2.18 */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java index e93921b..fc559ec 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java @@ -44,7 +44,7 @@ import static org.hamcrest.core.AnyOf.anyOf; * <p/> * The list of tests should be reordered to (DTest, CTest, BTest, ATest) in the second run. * - * @author <a href="mailto:tibor.dig...@gmail.com">Tibor Digana (tibor17)</a> + * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1098} * @since 2.18 */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java new file mode 100644 index 0000000..7ab1568 --- /dev/null +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java @@ -0,0 +1,47 @@ +package org.apache.maven.surefire.its.jiras; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.it.VerificationException; +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.apache.maven.surefire.its.fixture.SurefireLauncher; +import org.junit.Test; + +/** + * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> + * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-817} + * @since 2.18 + */ +public class Surefire817SystemExitIT + extends SurefireJUnit4IntegrationTestCase +{ + + @Test + public void systemExit1() + throws VerificationException + { + unpack().maven().withFailure().executeTest().verifyTextInLog( "class jiras.surefire817.Test main" ); + } + + private SurefireLauncher unpack() + { + return unpack( "surefire-817-system-exit" ); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml b/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml index 4f697de..b4b0723 100644 --- a/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml @@ -31,13 +31,17 @@ <version>1.0-SNAPSHOT</version> <name>junit47-parallel</name> <url>http://maven.apache.org</url> - <contributors> - <contributor> - <name>Tibor Digana (tibor17)</name> - <email>tibor.dig...@gmail.com</email> - <timezone>+1</timezone> - </contributor> - </contributors> + <developers> + <developer> + <id>tibordigana</id> + <name>Tibor DigaÅa (tibor17)</name> + <email>tibordig...@apache.org</email> + <roles> + <role>Committer</role> + </roles> + <timezone>Europe/Bratislava</timezone> + </developer> + </developers> <dependencies> <dependency> <groupId>junit</groupId> @@ -49,7 +53,6 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> <configuration> <source>1.5</source> <target>1.5</target> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java index e3906fd..3648443 100644 --- a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java +++ b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java @@ -22,7 +22,7 @@ package surefireparallel; import org.junit.Test; /** - * @author <a href="mailto:tibor.dig...@gmail.com">Tibor Digana (tibor17)</a> + * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> * @since 2.16 */ public class TestClass http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml index e07ac6b..edbfeb3 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml @@ -31,13 +31,17 @@ <version>1.0</version> <name>jiras-surefire-1028</name> <url>http://maven.apache.org</url> - <contributors> - <contributor> - <name>Tibor Digana (tibor17)</name> - <email>tibor.dig...@gmail.com</email> - <timezone>+1</timezone> - </contributor> - </contributors> + <developers> + <developer> + <id>tibordigana</id> + <name>Tibor DigaÅa (tibor17)</name> + <email>tibordig...@apache.org</email> + <roles> + <role>Committer</role> + </roles> + <timezone>Europe/Bratislava</timezone> + </developer> + </developers> <dependencies> <dependency> <groupId>junit</groupId> @@ -50,7 +54,6 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> <configuration> <source>1.5</source> <target>1.5</target> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml index 35d4144..fb553a8 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml @@ -32,9 +32,13 @@ <url>http://maven.apache.org</url> <developers> <developer> - <name>Tibor Digana (tibor17)</name> - <email>tibor.dig...@gmail.com</email> - <timezone>+1</timezone> + <id>tibordigana</id> + <name>Tibor DigaÅa (tibor17)</name> + <email>tibordig...@apache.org</email> + <roles> + <role>Committer</role> + </roles> + <timezone>Europe/Bratislava</timezone> </developer> </developers> <contributors> @@ -54,7 +58,6 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> <configuration> <source>1.5</source> <target>1.5</target> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml index 3c475c7..caba806 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml @@ -30,13 +30,17 @@ <artifactId>jiras-surefire-1082</artifactId> <version>1.0</version> <url>http://maven.apache.org</url> - <contributors> - <contributor> - <name>Tibor Digana (tibor17)</name> - <email>tibor.dig...@gmail.com</email> - <timezone>+1</timezone> - </contributor> - </contributors> + <developers> + <developer> + <id>tibordigana</id> + <name>Tibor DigaÅa (tibor17)</name> + <email>tibordig...@apache.org</email> + <roles> + <role>Committer</role> + </roles> + <timezone>Europe/Bratislava</timezone> + </developer> + </developers> <dependencies> <dependency> <groupId>junit</groupId> @@ -49,7 +53,6 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> <configuration> <source>1.5</source> <target>1.5</target> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml index 4bcd000..b0f79b1 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml @@ -30,13 +30,17 @@ <artifactId>jiras-surefire-1095</artifactId> <version>1.0</version> <url>http://maven.apache.org</url> - <contributors> - <contributor> - <name>Tibor Digana (tibor17)</name> - <email>tibor.dig...@gmail.com</email> - <timezone>+1</timezone> - </contributor> - </contributors> + <developers> + <developer> + <id>tibordigana</id> + <name>Tibor DigaÅa (tibor17)</name> + <email>tibordig...@apache.org</email> + <roles> + <role>Committer</role> + </roles> + <timezone>Europe/Bratislava</timezone> + </developer> + </developers> <dependencies> <dependency> <groupId>junit</groupId> @@ -49,7 +53,6 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> <configuration> <source>1.5</source> <target>1.5</target> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml index db4d4a7..e7c4b6f 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml @@ -30,13 +30,17 @@ <artifactId>jiras-surefire-1098</artifactId> <version>1.0</version> <url>http://maven.apache.org</url> - <contributors> - <contributor> - <name>Tibor Digana (tibor17)</name> - <email>tibor.dig...@gmail.com</email> - <timezone>+1</timezone> - </contributor> - </contributors> + <developers> + <developer> + <id>tibordigana</id> + <name>Tibor DigaÅa (tibor17)</name> + <email>tibordig...@apache.org</email> + <roles> + <role>Committer</role> + </roles> + <timezone>Europe/Bratislava</timezone> + </developer> + </developers> <dependencies> <dependency> <groupId>junit</groupId> @@ -49,7 +53,6 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> <configuration> <source>1.5</source> <target>1.5</target> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml new file mode 100644 index 0000000..4809487 --- /dev/null +++ b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <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-817</artifactId> + <version>1.0</version> + <url>http://maven.apache.org</url> + <developers> + <developer> + <id>tibordigana</id> + <name>Tibor DigaÅa (tibor17)</name> + <email>tibordig...@apache.org</email> + <roles> + <role>Committer</role> + </roles> + <timezone>Europe/Bratislava</timezone> + </developer> + </developers> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>always</forkMode> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-junit47</artifactId> + <version>${surefire.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/src/test/java/jiras/surefire817/Test.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/src/test/java/jiras/surefire817/Test.java b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/src/test/java/jiras/surefire817/Test.java new file mode 100644 index 0000000..f56fd31 --- /dev/null +++ b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/src/test/java/jiras/surefire817/Test.java @@ -0,0 +1,29 @@ +package jiras.surefire817; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +public class Test { + @org.junit.Test + public void test() + { + System.out.println( getClass() + " " + Thread.currentThread().getName() ); + System.exit( 1 ); + } +} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Destroyable.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Destroyable.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Destroyable.java index 284ce5a..af30831 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Destroyable.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Destroyable.java @@ -22,7 +22,7 @@ package org.apache.maven.surefire.junitcore.pc; /** * Destroys the embedded thread-pool. * - * @author <a href="mailto:tibor.dig...@gmail.com">Tibor Digana (tibor17)</a> + * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> * @see ParallelComputerBuilder * @since 2.18 */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java index fbc05f0..2afc012 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java @@ -23,7 +23,7 @@ package org.apache.maven.surefire.junitcore.pc; * Status of {@link ParallelComputer ParallelComputer runtime}.<p/> * Used together with shutdown hook. * - * @author <a href="mailto:tibor.dig...@gmail.com">Tibor Digana (tibor17)</a> + * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> * @see ParallelComputer * @since 2.18 */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java index 1bed62d..cf76166 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ShutdownStatus.java @@ -31,7 +31,7 @@ import static org.apache.maven.surefire.junitcore.pc.ExecutionStatus.*; * Wrapper of {@link ParallelComputer ParallelComputer status information} and tests been populated before * a shutdown hook has been triggered. * - * @author <a href="mailto:tibor.dig...@gmail.com">Tibor Digana (tibor17)</a> + * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> * @see ParallelComputer * @since 2.18 */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40b4b48a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java index 42a5c59..52dba73 100644 --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java @@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit; * Used to execute tests annotated with {@link net.jcip.annotations.NotThreadSafe}. * <p/> * - * @author <a href="mailto:tibor.dig...@gmail.com">Tibor Digana (tibor17)</a> + * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> * @see ParallelComputerBuilder * @since 2.18 */