Skip to content

Commit 38b982a

Browse files
HannesWellHannesWell
committed
[FIXUP] Implement sub-module execution based on -pl option
1 parent 92ae2c8 commit 38b982a

File tree

5 files changed

+33
-51
lines changed

5 files changed

+33
-51
lines changed

‎tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/its/AbstractTychoExtrasIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
public class AbstractTychoExtrasIntegrationTest extends AbstractTychoIntegrationTest {
2121

2222
@Override
23-
protected File getBasedir(String root, String test) throws IOException {
24-
return new File("target/test-classes", root).getAbsoluteFile();
23+
protected File getBasedir(String test) throws IOException {
24+
return new File("target/test-classes", test).getAbsoluteFile();
2525
}
2626

2727
}

‎tycho-its/projects/TYCHO253extraClassPathEntries/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<packaging>pom</packaging>
1010

1111
<modules>
12+
<module>org.eclipse.tycho.testExtraClasspathTest1</module>
1213
<module>org.eclipse.tycho.testExtraClasspathTest2</module>
1314
<module>org.eclipse.tycho.testExtraClasspathTest3</module>
1415
</modules>

‎tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO253extraClassPathEntries/ExtraClassPathEntriesTest.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
*******************************************************************************/
1313
package org.eclipse.tycho.test.TYCHO253extraClassPathEntries;
1414

15-
import java.util.Arrays;
16-
import java.util.List;
17-
1815
import org.apache.maven.it.Verifier;
1916
import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
2017
import org.junit.Test;
@@ -23,22 +20,24 @@ public class ExtraClassPathEntriesTest extends AbstractTychoIntegrationTest {
2320

2421
@Test
2522
public void testJarsExtraClasspath() throws Exception {
26-
Verifier verifier = getVerifier("/TYCHO253extraClassPathEntries", "org.eclipse.tycho.testExtraClasspathTest1");
27-
verifier.executeGoals(List.of("install"));
23+
Verifier verifier = getVerifier("/TYCHO253extraClassPathEntries");
24+
executeOnlyProject(verifier, "org.eclipse.tycho.testExtraClasspathTest1");
25+
verifier.executeGoal("verify");
2826
verifier.verifyErrorFreeLog();
2927
}
3028

3129
@Test
3230
public void testExtraClasspath() throws Exception {
33-
Verifier verifier = getVerifier("/TYCHO253extraClassPathEntries", "org.eclipse.tycho.testExtraClasspathTest2");
34-
verifier.executeGoals(List.of("install"));
31+
Verifier verifier = getVerifier("/TYCHO253extraClassPathEntries");
32+
executeOnlyProject(verifier, "org.eclipse.tycho.testExtraClasspathTest2");
33+
verifier.executeGoal("verify");
3534
verifier.verifyErrorFreeLog();
3635
}
3736

3837
@Test
3938
public void testReferenceToInnerJar() throws Exception {
4039
Verifier verifier = getVerifier("/TYCHO253extraClassPathEntries");
41-
verifier.executeGoals(Arrays.asList("install"));
40+
verifier.executeGoal("verify");
4241
verifier.verifyErrorFreeLog();
4342
}
4443
}

‎tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryFtpHandlerTest.java

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
package org.eclipse.tycho.test.p2Repository;
22

3-
import static org.mockftpserver.core.command.ReplyCodes.STAT_FILE_OK;
4-
import static org.mockftpserver.core.command.ReplyCodes.STAT_SYSTEM_OK;
5-
6-
import java.io.File;
7-
import java.io.IOException;
8-
import java.text.DateFormat;
9-
import java.text.SimpleDateFormat;
10-
import java.util.Objects;
11-
123
import org.apache.commons.io.FileUtils;
134
import org.apache.maven.it.Verifier;
145
import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
@@ -21,11 +12,16 @@
2112
import org.mockftpserver.fake.FakeFtpServer;
2213
import org.mockftpserver.fake.UserAccount;
2314
import org.mockftpserver.fake.command.AbstractFakeCommandHandler;
24-
import org.mockftpserver.fake.filesystem.DirectoryEntry;
25-
import org.mockftpserver.fake.filesystem.FileEntry;
26-
import org.mockftpserver.fake.filesystem.FileSystem;
27-
import org.mockftpserver.fake.filesystem.FileSystemEntry;
28-
import org.mockftpserver.fake.filesystem.UnixFakeFileSystem;
15+
import org.mockftpserver.fake.filesystem.*;
16+
17+
import java.io.File;
18+
import java.io.IOException;
19+
import java.text.DateFormat;
20+
import java.text.SimpleDateFormat;
21+
import java.util.Objects;
22+
23+
import static org.mockftpserver.core.command.ReplyCodes.STAT_FILE_OK;
24+
import static org.mockftpserver.core.command.ReplyCodes.STAT_SYSTEM_OK;
2925

3026
/**
3127
* @author Edoardo Luppi
@@ -39,7 +35,7 @@ public class P2RepositoryFtpHandlerTest extends AbstractTychoIntegrationTest {
3935

4036
@Before
4137
public void setup() throws Exception {
42-
repoDir = new File(getBasedir(TEST_BASEDIR, null), "repository");
38+
repoDir = new File(getBasedir(TEST_BASEDIR), "repository");
4339
startFtpServer();
4440
}
4541

‎tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public abstract class AbstractTychoIntegrationTest {
3838
@Rule
3939
public TestName name = new TestName();
4040

41-
protected File getBasedir(String root, String test) throws IOException {
42-
File src = new File("projects", root).getAbsoluteFile();
41+
protected File getBasedir(String test) throws IOException {
42+
File src = new File("projects", test).getAbsoluteFile();
4343
File dst = new File("target/projects",
44-
getClass().getSimpleName() + "/" + name.getMethodName() + "/" + root.replace("../", "./"))
44+
getClass().getSimpleName() + "/" + name.getMethodName() + "/" + test.replace("../", "./"))
4545
.getAbsoluteFile();
4646

4747
if (dst.isDirectory()) {
@@ -54,37 +54,23 @@ protected File getBasedir(String root, String test) throws IOException {
5454

5555
FileUtils.copyDirectoryStructure(src, dst);
5656

57-
return test != null ? new File(dst, test) : dst;
57+
return dst;
5858
}
5959

6060
protected Verifier getVerifier(String test, boolean setTargetPlatform) throws Exception {
61-
return getVerifier(test, null, setTargetPlatform);
62-
}
63-
64-
protected Verifier getVerifier(String root, String test, boolean setTargetPlatform) throws Exception {
65-
return getVerifier(root, test, setTargetPlatform, getSettings());
61+
return getVerifier(test, setTargetPlatform, getSettings());
6662
}
6763

6864
protected Verifier getVerifier(String test, boolean setTargetPlatform, boolean ignoreLocalArtifacts)
6965
throws Exception {
70-
return getVerifier(test, null, setTargetPlatform, ignoreLocalArtifacts);
71-
}
72-
73-
protected Verifier getVerifier(String root, String test, boolean setTargetPlatform, boolean ignoreLocalArtifacts)
74-
throws Exception {
75-
return getVerifier(root, test, setTargetPlatform, getSettings(), ignoreLocalArtifacts);
66+
return getVerifier(test, setTargetPlatform, getSettings(), ignoreLocalArtifacts);
7667
}
7768

7869
protected Verifier getVerifier(String test, boolean setTargetPlatform, File userSettings) throws Exception {
79-
return getVerifier(test, null, setTargetPlatform, userSettings);
80-
}
81-
82-
protected Verifier getVerifier(String root, String test, boolean setTargetPlatform, File userSettings)
83-
throws Exception {
84-
return getVerifier(root, test, setTargetPlatform, userSettings, true);
70+
return getVerifier(test, setTargetPlatform, userSettings, true);
8571
}
8672

87-
protected Verifier getVerifier(String root, String test, boolean setTargetPlatform, File userSettings,
73+
protected Verifier getVerifier(String test, boolean setTargetPlatform, File userSettings,
8874
boolean ignoreLocalArtifacts) throws Exception {
8975
//Test JVM can be started in debug mode by passing the following property to the maven run:
9076
//-Dtycho.mvnDebug -> will start with port 8000
@@ -94,7 +80,7 @@ protected Verifier getVerifier(String root, String test, boolean setTargetPlatfo
9480
// oddly enough, Verifier uses this system property to locate maven install
9581
System.setProperty("maven.home", getMavenHome());
9682

97-
File testDir = getBasedir(root, test);
83+
File testDir = getBasedir(test);
9884

9985
Verifier verifier = new Verifier(testDir.getAbsolutePath());
10086
verifier.setForkJvm(isForked());
@@ -162,11 +148,11 @@ protected boolean isForked() {
162148
}
163149

164150
protected Verifier getVerifier(String test) throws Exception {
165-
return getVerifier(test, null);
151+
return getVerifier(test, true);
166152
}
167153

168-
protected Verifier getVerifier(String root, String test) throws Exception {
169-
return getVerifier(root, test, true);
154+
protected static void executeOnlyProject(Verifier verifier, String projectFolder) {
155+
verifier.addCliOption("-pl " + projectFolder);
170156
}
171157

172158
protected String getTargetPlatform() {

0 commit comments

Comments
 (0)