Skip to content

Commit 4e8adec

Browse files
committed
Add missin gheader, speed up the test
Signed-off-by: Christoph Läubrich <[email protected]>
1 parent de42d8e commit 4e8adec

File tree

1 file changed

+21
-7
lines changed

1 file changed

+21
-7
lines changed

tycho-its/src/test/java/org/eclipse/tycho/test/reactor/makeBehaviour/MavenReactorMakeOptionsTest.java

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2022 Joe Shannon and others.
3+
* This program and the accompanying materials
4+
* are made available under the terms of the Eclipse Public License 2.0
5+
* which accompanies this distribution, and is available at
6+
* https://www.eclipse.org/legal/epl-2.0/
7+
*
8+
* SPDX-License-Identifier: EPL-2.0
9+
*
10+
* Contributors:
11+
* Joe Shannon - initial API and implementation
12+
*******************************************************************************/
113
package org.eclipse.tycho.test.reactor.makeBehaviour;
214

315
import static org.junit.Assert.fail;
416

17+
import java.util.List;
18+
519
import org.apache.maven.it.VerificationException;
620
import org.apache.maven.it.Verifier;
721
import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
@@ -26,12 +40,12 @@ public class MavenReactorMakeOptionsTest extends AbstractTychoIntegrationTest {
2640
@Before
2741
public void setUp() throws Exception {
2842
verifier = getVerifier("reactor.makeBehaviour");
29-
verifier.executeGoal("clean");
43+
verifier.addCliOption("-T1C");
3044
}
3145

3246
@Test
3347
public void testCompleteBuild() throws Exception {
34-
verifier.executeGoal("verify");
48+
verifier.executeGoals(List.of("clean", "verify"));
3549
verifier.verifyErrorFreeLog();
3650
verifier.assertFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar");
3751
verifier.assertFilePresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar");
@@ -44,7 +58,7 @@ public void testAlsoMake() throws Exception {
4458
// REACTOR_MAKE_UPSTREAM
4559
verifier.addCliOption("-am");
4660
verifier.addCliOption("-pl feature1");
47-
verifier.executeGoal("verify");
61+
verifier.executeGoals(List.of("clean", "verify"));
4862
verifier.verifyErrorFreeLog();
4963
verifier.assertFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar");
5064
verifier.assertFileNotPresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar");
@@ -57,7 +71,7 @@ public void testAlsoMakeDependents() throws Exception {
5771
// REACTOR_MAKE_DOWNSTREAM
5872
verifier.addCliOption("-amd");
5973
verifier.addCliOption("-pl bundle1,bundle2");
60-
verifier.executeGoal("verify");
74+
verifier.executeGoals(List.of("clean", "verify"));
6175
verifier.verifyErrorFreeLog();
6276
verifier.assertFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar");
6377
verifier.assertFilePresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar");
@@ -71,7 +85,7 @@ public void testBoth() throws Exception {
7185
verifier.addCliOption("-am");
7286
verifier.addCliOption("-amd");
7387
verifier.addCliOption("-pl feature1,bundle2");
74-
verifier.executeGoal("verify");
88+
verifier.executeGoals(List.of("clean", "verify"));
7589
verifier.verifyErrorFreeLog();
7690
verifier.assertFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar");
7791
verifier.assertFilePresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar");
@@ -83,7 +97,7 @@ public void testBoth() throws Exception {
8397
public void testSingleProjectNoOptionFails() throws Exception {
8498
try {
8599
verifier.addCliOption("-pl feature1");
86-
verifier.executeGoal("verify");
100+
verifier.executeGoals(List.of("clean", "verify"));
87101
fail("Build should fail due to missing reactor dependency");
88102
} catch (VerificationException e) {
89103
verifier.verifyTextInLog(
@@ -98,7 +112,7 @@ public void testDownstreamFailsIfMissingDownstreamDependency() throws Exception
98112
try {
99113
verifier.addCliOption("-amd");
100114
verifier.addCliOption("-pl bundle1,feature1");
101-
verifier.executeGoal("verify");
115+
verifier.executeGoals(List.of("clean", "verify"));
102116
fail("Build should fail due to missing reactor dependency");
103117
} catch (VerificationException e) {
104118
verifier.verifyTextInLog(

0 commit comments

Comments
 (0)