From 0dc20f21725b2c83e1f9794c8b008fd5a769057e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 12 Dec 2023 13:28:32 +0200 Subject: [PATCH] Further ITs target platform setup simplification Rely more on autosetting it. --- .../TYCHO0294ProductP2TargetPlatformResolver/pom.xml | 7 +------ .../TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml | 2 +- tycho-its/projects/iu.product/pom.xml | 2 +- tycho-its/projects/p2Inf.hostRequireFragment/pom.xml | 7 +------ .../projects/pomDependencyConsider.systemScope/pom.xml | 2 +- tycho-its/projects/product.duplicateIUs/pom.xml | 2 +- .../org.eclipse.core.expressions/pom.xml | 2 +- .../transitively.require.org.eclipse.osgi/pom.xml | 2 +- tycho-its/projects/surefire.junit47/categories/pom.xml | 2 +- .../projects/surefire.junit5tempdir/bundle.test/pom.xml | 2 +- tycho-its/projects/surefire.p2InstalledRuntime/pom.xml | 2 +- tycho-its/projects/tycho-ds/pom.xml | 6 +----- .../ProductP2TargetPlatformResolverTest.java | 2 -- .../LocalRepositoryCrosstalkTest.java | 4 +--- .../tycho/test/compiler/CompilerClasspathEntryTest.java | 4 +--- .../java/org/eclipse/tycho/test/iu/ProductWithIUTest.java | 4 +--- .../test/multiplatform/MultiplatformReactorTest.java | 4 +--- .../test/p2Inf/HostRequiresFragmentWithP2InfTest.java | 4 +--- .../RepoRefLocationP2RepositoryIntegrationTest.java | 4 ++-- .../PomDependencySystemScopedTest.java | 5 +---- .../tycho/test/product/ProductDuplicateIUsTest.java | 4 +--- .../tycho/test/resolver/ReexportedRequireBundleTest.java | 3 --- .../org/eclipse/tycho/test/surefire/CategoriesTest.java | 4 +--- .../eclipse/tycho/test/surefire/JUnit5TempDirTest.java | 4 +--- .../tycho/test/surefire/P2InstalledTestRuntimeTest.java | 8 +++----- .../target/TargetPlatformFilteringIntegrationTest.java | 2 +- 26 files changed, 27 insertions(+), 67 deletions(-) diff --git a/tycho-its/projects/TYCHO0294ProductP2TargetPlatformResolver/pom.xml b/tycho-its/projects/TYCHO0294ProductP2TargetPlatformResolver/pom.xml index 8acebf05db..1bfbca2c1a 100644 --- a/tycho-its/projects/TYCHO0294ProductP2TargetPlatformResolver/pom.xml +++ b/tycho-its/projects/TYCHO0294ProductP2TargetPlatformResolver/pom.xml @@ -13,16 +13,11 @@ product.bundle-based - - 0.8.0-SNAPSHOT - http://download.eclipse.org/eclipse/updates/4.23 - - p2 p2 - ${p2.repo} + ${target-platform} diff --git a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml index 57bfa4b7f1..feca347a1e 100644 --- a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml +++ b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml @@ -31,7 +31,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs galileo p2 - ${p2.repo} + ${target-platform} diff --git a/tycho-its/projects/iu.product/pom.xml b/tycho-its/projects/iu.product/pom.xml index c0fcbfdda9..dcbc899db9 100644 --- a/tycho-its/projects/iu.product/pom.xml +++ b/tycho-its/projects/iu.product/pom.xml @@ -17,7 +17,7 @@ repo p2 - ${test-data-repo} + ${target-platform} diff --git a/tycho-its/projects/p2Inf.hostRequireFragment/pom.xml b/tycho-its/projects/p2Inf.hostRequireFragment/pom.xml index d0c5136a76..7181ddc86f 100644 --- a/tycho-its/projects/p2Inf.hostRequireFragment/pom.xml +++ b/tycho-its/projects/p2Inf.hostRequireFragment/pom.xml @@ -14,16 +14,11 @@ fragments - - 0.22.0-SNAPSHOT - http://download.eclipse.org/eclipse/updates/4.3 - - junitRuntime p2 - ${p2Repository} + ${target-platform} diff --git a/tycho-its/projects/pomDependencyConsider.systemScope/pom.xml b/tycho-its/projects/pomDependencyConsider.systemScope/pom.xml index c4ded163b4..ef213ce9b4 100644 --- a/tycho-its/projects/pomDependencyConsider.systemScope/pom.xml +++ b/tycho-its/projects/pomDependencyConsider.systemScope/pom.xml @@ -16,7 +16,7 @@ e352 - ${repo.url} + ${target-platform} p2 diff --git a/tycho-its/projects/product.duplicateIUs/pom.xml b/tycho-its/projects/product.duplicateIUs/pom.xml index 008bf46419..df7614dfe4 100644 --- a/tycho-its/projects/product.duplicateIUs/pom.xml +++ b/tycho-its/projects/product.duplicateIUs/pom.xml @@ -22,7 +22,7 @@ test-data-repo p2 - ${test-data-repo} + ${target-platform} diff --git a/tycho-its/projects/resolver.reexportBundle/org.eclipse.core.expressions/pom.xml b/tycho-its/projects/resolver.reexportBundle/org.eclipse.core.expressions/pom.xml index eb95800145..ce58f78f20 100644 --- a/tycho-its/projects/resolver.reexportBundle/org.eclipse.core.expressions/pom.xml +++ b/tycho-its/projects/resolver.reexportBundle/org.eclipse.core.expressions/pom.xml @@ -24,7 +24,7 @@ repository p2 - ${repo} + ${target-platform} diff --git a/tycho-its/projects/resolver.reexportBundle/transitively.require.org.eclipse.osgi/pom.xml b/tycho-its/projects/resolver.reexportBundle/transitively.require.org.eclipse.osgi/pom.xml index e90cfdb9d1..fc37b14482 100644 --- a/tycho-its/projects/resolver.reexportBundle/transitively.require.org.eclipse.osgi/pom.xml +++ b/tycho-its/projects/resolver.reexportBundle/transitively.require.org.eclipse.osgi/pom.xml @@ -14,7 +14,7 @@ repository p2 - ${repo} + ${target-platform} diff --git a/tycho-its/projects/surefire.junit47/categories/pom.xml b/tycho-its/projects/surefire.junit47/categories/pom.xml index df95cc61ec..7df07c6a1a 100644 --- a/tycho-its/projects/surefire.junit47/categories/pom.xml +++ b/tycho-its/projects/surefire.junit47/categories/pom.xml @@ -12,7 +12,7 @@ kepler p2 - ${kepler-repo} + ${target-platform} diff --git a/tycho-its/projects/surefire.junit5tempdir/bundle.test/pom.xml b/tycho-its/projects/surefire.junit5tempdir/bundle.test/pom.xml index e2b9d6d32a..fbf314447a 100644 --- a/tycho-its/projects/surefire.junit5tempdir/bundle.test/pom.xml +++ b/tycho-its/projects/surefire.junit5tempdir/bundle.test/pom.xml @@ -10,7 +10,7 @@ 2019-09 p2 - ${2019-09-repo} + ${target-platform} diff --git a/tycho-its/projects/surefire.p2InstalledRuntime/pom.xml b/tycho-its/projects/surefire.p2InstalledRuntime/pom.xml index b8521b747a..7162dc4832 100644 --- a/tycho-its/projects/surefire.p2InstalledRuntime/pom.xml +++ b/tycho-its/projects/surefire.p2InstalledRuntime/pom.xml @@ -24,7 +24,7 @@ test-repo - ${p2.repo.url} + ${target-platform} p2 diff --git a/tycho-its/projects/tycho-ds/pom.xml b/tycho-its/projects/tycho-ds/pom.xml index 337e53607d..bdd4b7ab3b 100644 --- a/tycho-its/projects/tycho-ds/pom.xml +++ b/tycho-its/projects/tycho-ds/pom.xml @@ -5,16 +5,12 @@ tycho.ds 1.0.0-SNAPSHOT eclipse-plugin - - 3.0.0-SNAPSHOT - https://download.eclipse.org/releases/2022-03/ - featureRepo p2 - ${repo-url} + ${target-platform} diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java index 43b17cd925..f59d458add 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java @@ -16,14 +16,12 @@ import org.apache.maven.it.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; -import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories; import org.junit.Test; public class ProductP2TargetPlatformResolverTest extends AbstractTychoIntegrationTest { @Test public void testBasic() throws Exception { Verifier verifier = getVerifier("/TYCHO0294ProductP2TargetPlatformResolver"); - verifier.addCliOption("-Dp2.repo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0367localRepositoryCrosstalk/LocalRepositoryCrosstalkTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0367localRepositoryCrosstalk/LocalRepositoryCrosstalkTest.java index f951002b50..53ba3e5b98 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0367localRepositoryCrosstalk/LocalRepositoryCrosstalkTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0367localRepositoryCrosstalk/LocalRepositoryCrosstalkTest.java @@ -14,15 +14,13 @@ import org.apache.maven.it.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; -import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories; import org.junit.Test; public class LocalRepositoryCrosstalkTest extends AbstractTychoIntegrationTest { @Test public void test() throws Exception { // run bundle 2 test first with latest eclipse - Verifier v01 = getVerifier("/TYCHO0367localRepositoryCrosstalk/bundle02", false); - v01.addCliOption("-Dp2.repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + Verifier v01 = getVerifier("/TYCHO0367localRepositoryCrosstalk/bundle02"); v01.executeGoal("install"); v01.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java index 0fb4799351..82abb0ce8b 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java @@ -22,7 +22,6 @@ import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.eclipse.tycho.TychoConstants; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; @@ -63,8 +62,7 @@ public void testLibEntry() throws Exception { @Test public void testDSComponents() throws Exception { - Verifier verifier = getVerifier("tycho-ds", false, true); - verifier.setSystemProperty("repo-url", TychoConstants.ECLIPSE_LATEST); + Verifier verifier = getVerifier("tycho-ds", true, true); // first test to consume from target platform verifyDs(verifier); // now test consume from maven directly diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/iu/ProductWithIUTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/iu/ProductWithIUTest.java index 9fb7d27ddc..d3604ed5d9 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/iu/ProductWithIUTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/iu/ProductWithIUTest.java @@ -19,15 +19,13 @@ import org.apache.maven.it.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.eclipse.tycho.test.util.P2RepositoryTool; -import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories; import org.junit.Test; public class ProductWithIUTest extends AbstractTychoIntegrationTest { @Test public void testRootFilesFromIUPackagingInstalledAndInRepo() throws Exception { - Verifier verifier = getVerifier("iu.product", false); - verifier.addCliOption("-Dtest-data-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + Verifier verifier = getVerifier("iu.product"); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/multiplatform/MultiplatformReactorTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/multiplatform/MultiplatformReactorTest.java index d6113c55dd..456f8f415c 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/multiplatform/MultiplatformReactorTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/multiplatform/MultiplatformReactorTest.java @@ -16,15 +16,13 @@ import org.apache.maven.it.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; -import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories; import org.junit.Test; public class MultiplatformReactorTest extends AbstractTychoIntegrationTest { @Test public void testMultiplatformReactorBuild() throws Exception { - Verifier verifier = getVerifier("multiPlatform.reactor", false); - verifier.addCliOption("-Dtarget-platform=" + P2Repositories.ECLIPSE_LATEST.toString()); + Verifier verifier = getVerifier("multiPlatform.reactor"); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/HostRequiresFragmentWithP2InfTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/HostRequiresFragmentWithP2InfTest.java index 46d597a56b..55099d8b50 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/HostRequiresFragmentWithP2InfTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/HostRequiresFragmentWithP2InfTest.java @@ -14,15 +14,13 @@ import org.apache.maven.it.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; -import org.eclipse.tycho.test.util.ResourceUtil; import org.junit.Test; public class HostRequiresFragmentWithP2InfTest extends AbstractTychoIntegrationTest { @Test public void testBuildAndTestWithHostRequiringOwnFragment() throws Exception { - Verifier verifier = getVerifier("/p2Inf.hostRequireFragment", false); - verifier.addCliOption("-Dp2Repository=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST); + Verifier verifier = getVerifier("/p2Inf.hostRequireFragment"); // Test that // - the install-time dependency from the host to its fragment can be disabled diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/RepoRefLocationP2RepositoryIntegrationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/RepoRefLocationP2RepositoryIntegrationTest.java index 867c0fb77b..b56c63bbf3 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/RepoRefLocationP2RepositoryIntegrationTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/RepoRefLocationP2RepositoryIntegrationTest.java @@ -38,8 +38,8 @@ public class RepoRefLocationP2RepositoryIntegrationTest extends AbstractTychoInt public void testRefLocation() throws Exception { List allRepositoryReferences = buildAndGetRepositoryReferences( - "/p2Repository.repositoryRef.location", - v -> v.addCliOption("-Dtest-data-repo=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString())); + "/p2Repository.repositoryRef.location", v -> v.addCliOption("-Dtest-data-repo=" + + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString().replace("/", "//"))); assertEquals(4, allRepositoryReferences.size()); assertThat(allRepositoryReferences, diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencySystemScopedTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencySystemScopedTest.java index 9c934c99fe..164b3e00d3 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencySystemScopedTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencySystemScopedTest.java @@ -12,8 +12,6 @@ *******************************************************************************/ package org.eclipse.tycho.test.pomDependencyConsider; -import static org.eclipse.tycho.test.util.ResourceUtil.P2Repositories.ECLIPSE_LATEST; - import java.util.List; import org.apache.maven.it.Verifier; @@ -25,8 +23,7 @@ public class PomDependencySystemScopedTest extends AbstractTychoIntegrationTest @Test public void testSystemScopedDependenciesIgnored() throws Exception { // project with pomDependency=consider and checked-in nested jar - Verifier verifier = getVerifier("pomDependencyConsider.systemScope", false); - verifier.addCliOption("-Drepo.url=" + ECLIPSE_LATEST.toString()); + Verifier verifier = getVerifier("pomDependencyConsider.systemScope"); // fails on second resolver invocation in TestMojo // if (injected) system-scoped dependencies are not filtered out for // pomDependency=consider diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductDuplicateIUsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductDuplicateIUsTest.java index ff83b8ba72..244e22e057 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductDuplicateIUsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductDuplicateIUsTest.java @@ -14,15 +14,13 @@ import org.apache.maven.it.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; -import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories; import org.junit.Test; public class ProductDuplicateIUsTest extends AbstractTychoIntegrationTest { @Test public void testMultipleProductsNoDuplicateIUs() throws Exception { - Verifier verifier = getVerifier("product.duplicateIUs", false); - verifier.addCliOption("-Dtest-data-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + Verifier verifier = getVerifier("product.duplicateIUs"); verifier.executeGoal("integration-test"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ReexportedRequireBundleTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ReexportedRequireBundleTest.java index 2924ba1c54..e11b3a29da 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ReexportedRequireBundleTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ReexportedRequireBundleTest.java @@ -11,7 +11,6 @@ import org.apache.maven.it.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; -import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories; import org.junit.Test; public class ReexportedRequireBundleTest extends AbstractTychoIntegrationTest { @@ -19,7 +18,6 @@ public class ReexportedRequireBundleTest extends AbstractTychoIntegrationTest { @Test public void testBundleNativeCode() throws Exception { Verifier verifier = getVerifier("/resolver.reexportBundle/transitively.require.org.eclipse.osgi"); - verifier.addCliOption("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("compile"); verifier.verifyErrorFreeLog(); } @@ -27,7 +25,6 @@ public void testBundleNativeCode() throws Exception { @Test public void testOrgEclipseCoreExpressions() throws Exception { Verifier verifier = getVerifier("/resolver.reexportBundle/org.eclipse.core.expressions"); - verifier.addCliOption("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("compile"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/CategoriesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/CategoriesTest.java index 9250ce7be9..9643c0dc8f 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/CategoriesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/CategoriesTest.java @@ -14,15 +14,13 @@ import org.apache.maven.it.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; -import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories; import org.junit.Test; public class CategoriesTest extends AbstractTychoIntegrationTest { @Test public void testIncludeExcludeCategories() throws Exception { - Verifier verifier = getVerifier("/surefire.junit47/categories", false); - verifier.addCliOption("-Dkepler-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + Verifier verifier = getVerifier("/surefire.junit47/categories"); verifier.addCliOption("-Dgroups=tycho.demo.itp01.tests.FastTests"); verifier.addCliOption("-DexcludedGroups=tycho.demo.itp01.tests.SlowTests"); verifier.executeGoal("verify"); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JUnit5TempDirTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JUnit5TempDirTest.java index 75ea5bf119..aeecade960 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JUnit5TempDirTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JUnit5TempDirTest.java @@ -4,15 +4,13 @@ import org.apache.maven.it.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; -import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories; import org.junit.Test; public class JUnit5TempDirTest extends AbstractTychoIntegrationTest { @Test public void testJUnit5Runner() throws Exception { - Verifier verifier = getVerifier("/surefire.junit5tempdir/bundle.test", false); - verifier.addCliOption("-D2019-09-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + Verifier verifier = getVerifier("/surefire.junit5tempdir/bundle.test"); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); String projectBasedir = verifier.getBasedir(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/P2InstalledTestRuntimeTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/P2InstalledTestRuntimeTest.java index dc73417158..77fae5b576 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/P2InstalledTestRuntimeTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/P2InstalledTestRuntimeTest.java @@ -24,8 +24,7 @@ public class P2InstalledTestRuntimeTest extends AbstractTychoIntegrationTest { @Test public void testProvisionAppAndRunTest() throws Exception { - Verifier verifier = getVerifier("surefire.p2InstalledRuntime", false); - verifier.addCliOption("-Dp2.repo.url=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); + Verifier verifier = getVerifier("surefire.p2InstalledRuntime"); verifier.addCliOption("-PprovisionProduct"); verifier.executeGoals(List.of("clean", "integration-test")); verifier.verifyErrorFreeLog(); @@ -33,8 +32,7 @@ public void testProvisionAppAndRunTest() throws Exception { @Test public void testRunTestOnProvisionedApp() throws Exception { - Verifier verifier = getVerifier("surefire.p2InstalledRuntime", false); - verifier.addCliOption("-Dp2.repo.url=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); + Verifier verifier = getVerifier("surefire.p2InstalledRuntime"); verifier.addCliOption("-PuseProvisionedProduct"); verifier.addCliOption("-DproductClassifier=" + getProductClassifier()); verifier.executeGoals(List.of("clean", "integration-test")); @@ -44,7 +42,7 @@ public void testRunTestOnProvisionedApp() throws Exception { @Test public void testDifferentHarnessVersions() throws Exception { Verifier verifier = getVerifier("surefire.p2InstalledRuntime", false); - verifier.addCliOption("-Dp2.repo.url=" + ResourceUtil.P2Repositories.ECLIPSE_OXYGEN.toString()); + verifier.addCliOption("-Dtarget-platform=" + ResourceUtil.P2Repositories.ECLIPSE_OXYGEN.toString()); // Use different TP for test bundle and product under test verifier.addCliOption("-Dother.p2.repo.url=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); verifier.addCliOption("-PuseProvisionedProduct"); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java index 861ae89530..16c15c502d 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java @@ -23,7 +23,7 @@ public class TargetPlatformFilteringIntegrationTest extends AbstractTychoIntegra public void test() throws Exception { Verifier verifier = getVerifier("target.restriction.filter", false); verifier.addCliOption("-De342-repo=" + "https:////download.eclipse.org/releases/2021-06/"); - verifier.addCliOption("-De352-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliOption("-De352-repo=" + P2Repositories.ECLIPSE_LATEST.toString().replace("/", "//")); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); }