From c526e81cb59e81ab8aca65297ee053e693e4921c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Sun, 22 Oct 2023 19:49:14 +0200 Subject: [PATCH] Fix LocalRepositoryCrosstalkTest --- .../bundle01/Eclipse34Test.java | 2 +- .../LocalRepositoryCrosstalkTest.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/src/TYCHO0367localRepositoryCrosstalk/bundle01/Eclipse34Test.java b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/src/TYCHO0367localRepositoryCrosstalk/bundle01/Eclipse34Test.java index 8c17e37cbb..de84d5770b 100644 --- a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/src/TYCHO0367localRepositoryCrosstalk/bundle01/Eclipse34Test.java +++ b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/src/TYCHO0367localRepositoryCrosstalk/bundle01/Eclipse34Test.java @@ -29,7 +29,7 @@ public void test() Bundle equinox = getBundle( "org.eclipse.osgi"); assertEquals( 3, equinox.getVersion().getMajor() ); - assertEquals( 12, equinox.getVersion().getMinor() ); + assertEquals( 13, equinox.getVersion().getMinor() ); } public Bundle getBundle( String id ) 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 1e92aec601..f951002b50 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 @@ -20,15 +20,16 @@ public class LocalRepositoryCrosstalkTest extends AbstractTychoIntegrationTest { @Test public void test() throws Exception { - // run e352 test first + // run bundle 2 test first with latest eclipse Verifier v01 = getVerifier("/TYCHO0367localRepositoryCrosstalk/bundle02", false); v01.addCliOption("-Dp2.repo=" + P2Repositories.ECLIPSE_LATEST.toString()); v01.executeGoal("install"); v01.verifyErrorFreeLog(); - // now run e342 test, it should not "see" e352 artifacts in local repo + // now run bundle1 test, it should not "see" artifacts in local repo from newer + // update site Verifier v02 = getVerifier("/TYCHO0367localRepositoryCrosstalk/bundle01", false); - v02.addCliOption("-Dp2.repo=" + P2Repositories.ECLIPSE_OXYGEN.toString()); + v02.addCliOption("-Dp2.repo=https:////download.eclipse.org/releases/photon/"); v02.executeGoal("install"); v02.verifyErrorFreeLog(); }