Skip to content

Clean-up integration tests and improve re-use of pomless projects #4772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/*/lib/*.jar
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<extensions>
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>${tycho-version}</version>
</extension>
</extensions>

This file was deleted.

This file was deleted.

This file was deleted.

30 changes: 30 additions & 0 deletions tycho-its/projects/TYCHO253extraClassPathEntries/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,37 @@
<packaging>pom</packaging>

<modules>
<module>org.eclipse.tycho.testExtraClasspathTest1</module>
<module>org.eclipse.tycho.testExtraClasspathTest2</module>
<module>org.eclipse.tycho.testExtraClasspathTest3</module>
</modules>

<properties>
<target-platform>http://download.eclipse.org/releases/latest</target-platform>
<tycho.localArtifacts>ignore</tycho.localArtifacts>
</properties>

<repositories>
<repository>
<id>p2</id>
<layout>p2</layout>
<url>${target-platform}</url>
</repository>
</repositories>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
</plugin>
</plugins>
</build>
</project>
1 change: 0 additions & 1 deletion tycho-its/projects/sbom/.mvn/maven.config
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-Dtycho-version=5.0.0-SNAPSHOT
-Dtycho.localArtifacts=ignore
1 change: 0 additions & 1 deletion tycho-its/projects/tycho-ds-dependency/.mvn/maven.config

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,30 @@
*******************************************************************************/
package org.eclipse.tycho.test.TYCHO253extraClassPathEntries;

import java.util.Arrays;

import org.apache.maven.it.Verifier;
import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
import org.junit.Test;

public class ExtraClassPathEntriesTest extends AbstractTychoIntegrationTest {

@Test
public void testJarsExtraClasspath() throws Exception {
Verifier verifier = getVerifier("/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1");
verifier.executeGoals(Arrays.asList("clean", "install"));
Verifier verifier = getVerifier("/TYCHO253extraClassPathEntries");
executeOnlyProject(verifier, "org.eclipse.tycho.testExtraClasspathTest1").executeGoal("verify");
verifier.verifyErrorFreeLog();
}

@Test
public void testExtraClasspath() throws Exception {
Verifier verifier = getVerifier("/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2");
verifier.executeGoals(Arrays.asList("clean", "install"));
Verifier verifier = getVerifier("/TYCHO253extraClassPathEntries");
executeOnlyProject(verifier, "org.eclipse.tycho.testExtraClasspathTest2").executeGoal("verify");
verifier.verifyErrorFreeLog();
}

@Test
public void testReferenceToInnerJar() throws Exception {
Verifier verifier = getVerifier("/TYCHO253extraClassPathEntries");
verifier.executeGoals(Arrays.asList("clean", "install"));
verifier.executeGoal("verify");
verifier.verifyErrorFreeLog();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ protected Verifier getVerifier(String test) throws Exception {
return getVerifier(test, true);
}

protected static Verifier executeOnlyProject(Verifier verifier, String projectFolder) {
verifier.addCliOption("-pl " + projectFolder);
return verifier;
}

protected String getTargetPlatform() {
return EnvironmentUtil.getTargetPlatform();
}
Expand Down
Loading