Remove ECLIPSE_LATEST from tycho-testing-harness

Use the one from tycho-api. Adjust AbstractTychoIntegrationTest to escape '/' in the target platform url so it can be passed as parameter. Fixed test for upstream switch javax.annotation -> jakarta.annotation-api. Simplified tests to rely more on verifier with preset target platform instead of setting it in test.
eclipse-tycho · Dec 11, 2023 · c91cf22 · c91cf22
1 parent 0842d26
commit c91cf22
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 22 deletions.
diff --git a/tycho-its/projects/resolver.split/org.eclipse.equinox.security/pom.xml b/tycho-its/projects/resolver.split/org.eclipse.equinox.security/pom.xml
@@ -24,7 +24,7 @@
     <repository>
       <id>repository</id>
       <layout>p2</layout>
-      <url>${repo}</url>
+      <url>${target-platform}</url>
     </repository>
   </repositories>
 

diff --git a/tycho-its/projects/surefire.requireBundle.multipleVersions/pom.xml b/tycho-its/projects/surefire.requireBundle.multipleVersions/pom.xml
@@ -20,7 +20,7 @@
 		<repository>
 			<id>repo</id>
 			<layout>p2</layout>
-			<url>${repo}</url>
+			<url>${target-platform}</url>
 		</repository>
 	</repositories>
 

diff --git a/tycho-its/projects/surefire.requireBundle/pom.xml b/tycho-its/projects/surefire.requireBundle/pom.xml
@@ -19,7 +19,7 @@
 		<repository>
 			<id>oxygen</id>
 			<layout>p2</layout>
-			<url>${oxygen-repo}</url>
+			<url>${target-platform}</url>
 		</repository>
 	</repositories>
 

diff --git a/tycho-its/projects/tycho98/bundle.tests/META-INF/MANIFEST.MF b/tycho-its/projects/tycho98/bundle.tests/META-INF/MANIFEST.MF
@@ -6,4 +6,4 @@ Bundle-Version: 0.0.1.qualifier
 Require-Bundle: bundle;bundle-version="0.0.1",
  org.junit;bundle-version="4.12.0",
  org.eclipse.core.runtime;bundle-version="3.2.0",
- javax.annotation
+ jakarta.annotation-api
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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2022 Christoph Läubrich and others.
+ * Copyright (c) 2021, 2023 Christoph Läubrich and others.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -22,8 +22,8 @@
 
 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.eclipse.tycho.test.util.EnvironmentUtil;
 import org.junit.Test;
 
 public class CompilerClasspathEntryTest extends AbstractTychoIntegrationTest {
@@ -64,7 +64,7 @@ public void testLibEntry() throws Exception {
 	@Test
 	public void testDSComponents() throws Exception {
 		Verifier verifier = getVerifier("tycho-ds", false, true);
-		verifier.setSystemProperty("repo-url", EnvironmentUtil.ECLIPSE_LATEST);
+		verifier.setSystemProperty("repo-url", TychoConstants.ECLIPSE_LATEST);
 		// 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/resolver/SplitPackagesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/SplitPackagesTest.java
@@ -11,15 +11,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 SplitPackagesTest extends AbstractTychoIntegrationTest {
 
 	@Test
 	public void testSplitPackage() throws Exception {
 		Verifier verifier = getVerifier("/resolver.split/org.eclipse.equinox.security");
-		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/RequireBundleTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RequireBundleTest.java
@@ -14,24 +14,21 @@
 
 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 RequireBundleTest extends AbstractTychoIntegrationTest {
 
 	// requested in bug 485926
 	@Test
 	public void loadResourceFromRequireBundle() throws Exception {
-		Verifier verifier = getVerifier("/surefire.requireBundle", false, true);
-		verifier.addCliOption("-Doxygen-repo=" + P2Repositories.ECLIPSE_LATEST.toString());
+		Verifier verifier = getVerifier("/surefire.requireBundle", true, true);
 		verifier.executeGoal("integration-test");
 		verifier.verifyErrorFreeLog();
 	}
 
 	@Test
 	public void requireMultipleVersionsOfABundle() throws Exception {
-		Verifier verifier = getVerifier("/surefire.requireBundle.multipleVersions", false, true);
-		verifier.addCliOption("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString());
+		Verifier verifier = getVerifier("/surefire.requireBundle.multipleVersions", true, true);
 		verifier.executeGoal("integration-test");
 		verifier.verifyErrorFreeLog();
 	}

diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/util/ResourceUtil.java b/tycho-its/src/test/java/org/eclipse/tycho/test/util/ResourceUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2022 SAP AG and others.
+ * Copyright (c) 2011, 2023 SAP AG and others.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -15,14 +15,16 @@
 import java.io.File;
 import java.net.URI;
 
+import org.eclipse.tycho.TychoConstants;
+
 /**
  * Helper for accessing test resources.
  */
 public class ResourceUtil {
 
 	public enum P2Repositories {
 		ECLIPSE_342("e342"), ECLIPSE_352("e352"), ECLIPSE_OXYGEN("https:////download.eclipse.org/releases/oxygen/"),
-		ECLIPSE_LATEST(EnvironmentUtil.ECLIPSE_LATEST);
+		ECLIPSE_LATEST(TychoConstants.ECLIPSE_LATEST);
 
 		private final String path;
 

diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2022 Sonatype Inc. and others.
+ * Copyright (c) 2008, 2023 Sonatype Inc. and others.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -119,7 +119,7 @@ protected Verifier getVerifier(String test, boolean setTargetPlatform, File user
         tmpDir.mkdirs();
         verifier.addCliOption("-Djava.io.tmpdir=" + tmpDir.getAbsolutePath());
         if (setTargetPlatform) {
-            verifier.addCliOption("-Dtarget-platform=" + getTargetPlatform());
+            verifier.addCliOption("-Dtarget-platform=" + getTargetPlatform().replace("/", "//"));
         }
         if (ignoreLocalArtifacts) {
             verifier.addCliOption("-Dtycho.localArtifacts=ignore");

diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/EnvironmentUtil.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/EnvironmentUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2020 Sonatype Inc. and others.
+ * Copyright (c) 2008, 2023 Sonatype Inc. and others.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.eclipse.tycho.TychoConstants;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 
 /**
@@ -36,8 +37,6 @@ public class EnvironmentUtil {
 
     private static final String MAVEN_HOME_INFO = "Maven home:";
 
-    public static final String ECLIPSE_LATEST = "https:////download.eclipse.org/releases/2023-09/";
-
     private static final Properties props;
 
     static {
@@ -85,7 +84,7 @@ public static boolean isMac() {
     }
 
     public static String getTargetPlatform() {
-        return ECLIPSE_LATEST;
+        return TychoConstants.ECLIPSE_LATEST;
     }
 
     public static String getTestSettings() {