diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index bb3cf81e8..c9986ebec 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -106,6 +106,7 @@ public static Test suite() // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng6720FailFastTest.class ); suite.addTestSuite( MavenITmng6506PackageAnnotationTest.class ); suite.addTestSuite( MavenITmng6256SpecialCharsAlternatePOMLocation.class ); suite.addTestSuite( MavenITmng6386BaseUriPropertyTest.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java new file mode 100644 index 000000000..6558afd0c --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java @@ -0,0 +1,74 @@ +package org.apache.maven.it; + +/* + * 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.util.ResourceExtractor; + +import java.io.File; +import java.util.Arrays; +import java.util.List; + +/** + * An integration test to check that concurrently running projects are finished + * in --fail-fast mode, while downstream projects are skipped. + * + * MNG-6720. + * + */ +public class MavenITmng6720FailFastTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng6720FailFastTest() + { + super( "[3.6.0-SNAPSHOT,)" ); + } + + public void testItShouldWaitForConcurrentModulesToFinish() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6720-fail-fast" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath(), false ); + verifier.setMavenDebug( false ); + verifier.setAutoclean( false ); + verifier.addCliOption( "-T" ); + verifier.addCliOption( "2" ); + verifier.addCliOption( "-Dmaven.test.redirectTestOutputToFile=true" ); + + try + { + verifier.executeGoals( Arrays.asList( "clean", "test" ) ); + } catch (VerificationException e) + { + //expected + } + verifier.resetStreams(); + + List module1Lines = verifier.loadFile(new File(testDir, "module-1/target/surefire-reports/Module1Test-output.txt"), false); + assertTrue(module1Lines.contains("Module1")); + List module2Lines = verifier.loadFile(new File(testDir, "module-2/target/surefire-reports/Module2Test-output.txt"), false); + assertTrue(module2Lines.contains("Module2")); + List module3Lines = verifier.loadFile(new File(testDir, "module-3/target/surefire-reports/Module3Test-output.txt"), false); + assertTrue(module3Lines.isEmpty()); + + + } +} diff --git a/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/pom.xml b/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/pom.xml new file mode 100644 index 000000000..20250689e --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/pom.xml @@ -0,0 +1,39 @@ + + + + + + 4.0.0 + + mng-6720-fail-fast + module-1 + 1.0 + + + + junit + junit + 4.12 + test + + + + diff --git a/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/src/test/java/Module1Test.java b/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/src/test/java/Module1Test.java new file mode 100644 index 000000000..7c38ed25c --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/src/test/java/Module1Test.java @@ -0,0 +1,10 @@ +import org.junit.Test; + +public class Module1Test { + @Test + public void test() throws Exception { + Thread.sleep(1000); + System.out.println("Module1"); + throw new RuntimeException(); + } +} diff --git a/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/pom.xml b/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/pom.xml new file mode 100644 index 000000000..9141b874d --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/pom.xml @@ -0,0 +1,38 @@ + + + + + + 4.0.0 + + mng-6720-fail-fast + module-2 + 1.0 + + + + junit + junit + 4.12 + test + + + diff --git a/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/src/test/java/Module2Test.java b/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/src/test/java/Module2Test.java new file mode 100644 index 000000000..8fffa31a6 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/src/test/java/Module2Test.java @@ -0,0 +1,9 @@ +import org.junit.Test; + +public class Module2Test { + @Test + public void test() throws Exception { + Thread.sleep(2000); + System.out.println("Module2"); + } +} diff --git a/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/pom.xml b/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/pom.xml new file mode 100644 index 000000000..75ca15cbe --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/pom.xml @@ -0,0 +1,44 @@ + + + + + + 4.0.0 + + mng-6720-fail-fast + module-3 + 1.0 + + + + junit + junit + 4.12 + test + + + mng-6720-fail-fast + module2 + ${project.version} + + + + diff --git a/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/src/test/java/Module3Test.java b/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/src/test/java/Module3Test.java new file mode 100644 index 000000000..db3ea9d01 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/src/test/java/Module3Test.java @@ -0,0 +1,8 @@ +import org.junit.Test; + +public class Module3Test { + @Test + public void test() { + System.out.println("Module3"); + } +} diff --git a/core-it-suite/src/test/resources/mng-6720-fail-fast/pom.xml b/core-it-suite/src/test/resources/mng-6720-fail-fast/pom.xml new file mode 100644 index 000000000..8d42f231c --- /dev/null +++ b/core-it-suite/src/test/resources/mng-6720-fail-fast/pom.xml @@ -0,0 +1,37 @@ + + + + + + 4.0.0 + + mng-6720-fail-fast + parent + 1.0 + + pom + + + module-1 + module-2 + module-3 + +