Additions to PR#927

build/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF

@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.apache.ant,
  org.eclipse.debug.core,
  org.eclipse.equinox.p2.publisher;bundle-version="1.1.0",
- org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.0.0"
+ org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.0.0",
+ org.eclipse.equinox.p2.repository.tools
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.eclipse.equinox.frameworkadmin;version="2.0.0",
  org.eclipse.equinox.internal.p2.artifact.repository,

build/org.eclipse.pde.build.tests/META-INF/p2.inf

@@ -0,0 +1,2 @@
+requires.0.namespace = org.eclipse.equinox.p2.iu
+requires.0.name = org.eclipse.osgi.compatibility.state

build/org.eclipse.pde.build.tests/build.properties

@@ -20,5 +20,4 @@ bin.includes = META-INF/,\
                test.xml
 src.includes = about.html
 jars.compile.order = .
-pom.model.property.skipTests = true
 pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}

build/org.eclipse.pde.build.tests/pom.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.pde</groupId>
+		<artifactId>eclipse.pde.build</artifactId>
+		<version>4.31.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.pde.build.tests</artifactId>
+	<version>1.4.300-SNAPSHOT</version>
+	<packaging>eclipse-test-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<dependency-resolution>
+						<extraRequirements>
+							<!-- The product -->
+							<requirement>
+								<type>p2-installable-unit</type>
+								<id>org.eclipse.sdk.ide</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+							<!-- The "deltapack" -->
+							<requirement>
+								<type>eclipse-feature</type>
+								<id>org.eclipse.equinox.executable</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+						</extraRequirements>
+					</dependency-resolution>
+					<environments>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<configuration>
+					<product>org.eclipse.sdk.ide</product>
+					<testRuntime>p2Installed</testRuntime>
+					<testClass>org.eclipse.pde.build.tests.PDEBuildTestSuite</testClass>
+					<systemProperties>
+						<pde.build.includeP2>false</pde.build.includeP2>
+						<pde.build.verification>true</pde.build.verification>
+					</systemProperties>
+					<installAllEnvironments>true</installAllEnvironments>
+					<work>${project.build.directory}/surefire.app</work>
+				</configuration>
+				<executions>
+					<execution>
+						<id>p2-tests</id>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<testClass>org.eclipse.pde.build.tests.P2TestSuite</testClass>
+							<systemProperties>
+								<pde.build.verification>true</pde.build.verification>
+							</systemProperties>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java

@@ -18,6 +18,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -56,22 +57,22 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.equinox.internal.p2.publisher.eclipse.Messages;
 import org.eclipse.equinox.p2.publisher.eclipse.FeatureEntry;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.eclipse.pde.build.internal.tests.ant.AntUtils;
 import org.eclipse.pde.build.tests.BuildConfiguration;
 import org.eclipse.pde.build.tests.PDETestCase;
 import org.eclipse.pde.internal.build.AbstractScriptGenerator;
 import org.eclipse.pde.internal.build.BuildScriptGenerator;
 import org.eclipse.pde.internal.build.Config;
 import org.eclipse.pde.internal.build.IBuildPropertiesConstants;
 import org.eclipse.pde.internal.build.IPDEBuildConstants;
 import org.eclipse.pde.internal.build.builder.BuildDirector;
 import org.eclipse.pde.internal.build.site.BuildTimeFeature;
 import org.eclipse.pde.internal.build.site.BuildTimeFeatureFactory;
 import org.eclipse.pde.internal.build.site.BuildTimeSiteFactory;
 import org.eclipse.pde.internal.build.site.QualifierReplacer;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.osgi.framework.Version;
@@ -102,37 +103,37 @@
 	public void testBug148288() throws Exception {
 		IProject buildProject = newTest();
 
 		class MyBuildScriptGenerator extends BuildScriptGenerator {
 			@Override
 			public HashMap<Config, String> getArchivesFormat() {
 				return super.getArchivesFormat();
 			}
 		}
 		;
 
 		String location = buildProject.getLocation().toOSString();
 		MyBuildScriptGenerator generator = new MyBuildScriptGenerator();
 		generator.setElements(new String[] {});
 		generator.setWorkingDirectory(location);
 		BuildTimeSiteFactory.setInstalledBaseSite(location);
 		AbstractScriptGenerator.setConfigInfo("win32, win32, x86");
 		generator.setArchivesFormat("win32, win32, x86 - antZip");
 		generator.generate();
 
 		HashMap<Config, String> map = generator.getArchivesFormat();
 		assertEquals(map.size(), 1);
 		Config config = map.keySet().iterator().next();
 		assertEquals(map.get(config), "antZip");
 
 		clearStatics();
 
 		generator = new MyBuildScriptGenerator();
 		generator.setElements(new String[] {});
 		generator.setWorkingDirectory(location);
 		BuildTimeSiteFactory.setInstalledBaseSite(location);
 		generator.setArchivesFormat("win32, win32, x86 - folder");
 		AbstractScriptGenerator.setConfigInfo("win32, win32, x86");
 		generator.generate();
 
 		map = generator.getArchivesFormat();
 		assertEquals(map.size(), 1);
@@ -288,14 +289,14 @@
 
 		assertResourceFile(buildFolder, "features/sdk/feature.xml");
 		IFile feature = buildFolder.getFile("features/sdk/feature.xml");
 		BuildTimeFeatureFactory factory = new BuildTimeFeatureFactory();
 		BuildTimeFeature model = factory.parseBuildFeature(feature.getLocationURI().toURL());
 
 		FeatureEntry[] included = model.getIncludedFeatureReferences();
 		assertEquals(included.length, 3);
 		assertEquals(included[0].getId(), "foo");
 		assertEquals(included[1].getId(), "bar");
 		assertEquals(included[2].getId(), "disco");
 	}
 
 	@Test
@@ -483,15 +484,15 @@
 		runAntScript(buildXML.getLocation().toOSString(), new String[] { "default" },
 				buildFolder.getLocation().toOSString(), null);
 
 		BuildTimeFeatureFactory factory = new BuildTimeFeatureFactory();
 		BuildTimeFeature feature = factory.parseBuildFeature(featureXML.getLocationURI().toURL());
 		FeatureEntry[] pluginEntryModels = feature.getPluginEntries();
 		assertEquals(pluginEntryModels[0].getId(), "foo");
 		assertEquals(pluginEntryModels[0].getVersion(), "1.0.0.vA");
 		assertEquals(pluginEntryModels[1].getId(), "bar");
 		assertEquals(pluginEntryModels[1].getVersion(), "1.0.0.id_v");
 		assertEquals(pluginEntryModels[2].getId(), "foo.version");
 		assertEquals(pluginEntryModels[2].getVersion(), "2.1.2");
 	}
 
 	@Test
@@ -529,11 +530,11 @@
 		IFile featureXML = buildFolder.getFile("feature.xml");
 		Utils.writeBuffer(featureXML, buffer);
 
 		BuildTimeFeatureFactory factory = new BuildTimeFeatureFactory();
 		try {
 			factory.parseBuildFeature(featureXML.getLocationURI().toURL());
 		} catch (CoreException e) {
 			assertTrue(e.getStatus().toString().indexOf(Messages.feature_parse_emptyRequires) > 0);
 			return;
 		}
 		assertTrue(false);
@@ -702,43 +703,43 @@
 
 	@Test
 	public void testBug247091_2() throws Exception {
 		VersionRange range = org.eclipse.pde.internal.build.Utils.createVersionRange("1.0.0");
 		assertTrue(range.getIncludeMinimum());
 		assertTrue(range.getIncludeMaximum());
 		assertEquals(range.getMinimum(), new Version("1.0.0"));
 		assertEquals(range.getRight(), new Version("1.0.0"));
 
 		range = org.eclipse.pde.internal.build.Utils.createVersionRange("1.0.0.qualifier");
 		assertTrue(range.getIncludeMinimum());
 		assertFalse(range.getIncludeMaximum());
 		assertEquals(range.getMinimum(), new Version("1.0.0"));
 		assertEquals(range.getRight(), new Version("1.0.1"));
 
 		range = org.eclipse.pde.internal.build.Utils.createVersionRange("1.0.0.zqualifier");
 		assertTrue(range.getIncludeMinimum());
 		assertFalse(range.getIncludeMaximum());
 		assertEquals(range.getMinimum(), new Version("1.0.0.z"));
 		assertEquals(range.getRight(), new Version("1.0.1"));
 
 		range = org.eclipse.pde.internal.build.Utils.createVersionRange("1.0.0.abcqualifier");
 		assertTrue(range.getIncludeMinimum());
 		assertFalse(range.getIncludeMaximum());
 		assertEquals(range.getMinimum(), new Version("1.0.0.abc"));
 		assertEquals(range.getRight(), new Version("1.0.0.abd"));
 
 		range = org.eclipse.pde.internal.build.Utils.createVersionRange("1.0.0.abzqualifier");
 		assertTrue(range.getIncludeMinimum());
 		assertFalse(range.getIncludeMaximum());
 		assertEquals(range.getMinimum(), new Version("1.0.0.abz"));
 		assertEquals(range.getRight(), new Version("1.0.0.ac"));
 
 		range = org.eclipse.pde.internal.build.Utils.createVersionRange("1.0.0.abzzqualifier");
 		assertTrue(range.getIncludeMinimum());
 		assertFalse(range.getIncludeMaximum());
 		assertEquals(range.getMinimum(), new Version("1.0.0.abzz"));
 		assertEquals(range.getRight(), new Version("1.0.0.ac"));
 
 		range = org.eclipse.pde.internal.build.Utils.createVersionRange("1.0.0.abzz_qualifier");
 		assertTrue(range.getIncludeMinimum());
 		assertFalse(range.getIncludeMaximum());
 		assertEquals(range.getMinimum(), new Version("1.0.0.abzz_"));
@@ -828,6 +829,7 @@
 
 	@Test
 	public void testBug238177() throws Exception {
+		assumeFalse(Boolean.getBoolean("pde.build.verification"));
 		IFolder buildFolder = newTest("238177");
 		IFolder a = Utils.createFolder(buildFolder, "plugins/A");
 		IFolder b = Utils.createFolder(buildFolder, "plugins/B");
@@ -903,33 +905,33 @@
 		assertEquals("plugins/F", tasks[0].getRuntimeConfigurableWrapper().getAttributeMap().get("dir"));
 	}
 
 	public static class TestQualifierDirector extends BuildDirector {
 		public TestQualifierDirector() {
 			super();
 			setGenerateVersionSuffix(true);
 			setWorkingDirectory("foo");
 		}
 
 		public String getQualifierSuffix(BuildTimeFeature feature) throws CoreException {
 			return super.generateFeatureVersionSuffix(feature);
 		}
 	}
 
 	@Test
 	public void testQualifierSuffixes() throws Exception {
 		BuildTimeFeature f1 = new BuildTimeFeature("foo", "1.0.0.v1");
 		f1.addEntry(new FeatureEntry("a", "1.2.3.aaa-0z-aaa", true));
 		f1.setContextQualifierLength(2);
 
 		BuildTimeFeature f2 = new BuildTimeFeature("foo", "1.0.0.v1");
 		f2.addEntry(new FeatureEntry("a", "1.2.3.aaa-10-aaa", true));
 		f2.setContextQualifierLength(2);
 
 		TestQualifierDirector director = new TestQualifierDirector();
 		assertTrue(director.getQualifierSuffix(f1).compareTo(director.getQualifierSuffix(f2)) < 0);
 
 		f1 = new BuildTimeFeature("foo", "1.0.0.v1");
 		f1.addEntry(new FeatureEntry("a", "1.2.3.abcd", true));
 		f1.setContextQualifierLength(2);
 
 		f2 = new BuildTimeFeature("foo", "1.0.0.v1");

build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java

@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.pde.build.internal.tests;
 
+import static org.junit.Assume.assumeTrue;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -51,10 +53,10 @@
 import org.eclipse.equinox.frameworkadmin.BundleInfo;
 import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
 import org.eclipse.pde.build.tests.Activator;
 import org.eclipse.pde.internal.build.AbstractScriptGenerator;
 import org.eclipse.pde.internal.build.BundleHelper;
 import org.eclipse.pde.internal.build.FeatureGenerator;
 import org.eclipse.pde.internal.build.site.BuildTimeSiteFactory;
 
 public class Utils {
 	private static final String ID = "id";
@@ -189,24 +191,24 @@
 	static public void generateFeature(IFolder workingDirectory, String id, String[] featureList, String[] pluginList,
 			String product, boolean includeLaunchers, boolean verify, String version)
 			throws CoreException, IOException {
 		FeatureGenerator generator = new FeatureGenerator();
 		if (verify) {
 			AbstractScriptGenerator.setConfigInfo("*,*,*");
 			String baseLocation = Platform.getInstallLocation().getURL().getPath();
 			BuildTimeSiteFactory.setInstalledBaseSite(baseLocation);
 			File executable = findExecutable();
 			if (executable != null && !executable.equals(new File(baseLocation)))
 				generator.setPluginPath(new String[] { executable.getAbsolutePath() });
 		}
 		generator.setIncludeLaunchers(includeLaunchers);
 		generator.setVerify(verify);
 		generator.setFeatureId(id);
 		generator.setVersion(version);
 		generator.setProductFile(product);
 		generator.setFeatureList(featureList);
 		generator.setPluginList(pluginList);
 		generator.setWorkingDirectory(workingDirectory.getLocation().toOSString());
 		generator.generate();
 	}
 
 	static public void generateProduct(IFile productFile, String id, String version, String[] entryList,
@@ -265,7 +267,7 @@
 		if (features) {
 			buffer.append("  <features>\n");
 			for (String element : entryList) {
 				Map<String, Object> items = org.eclipse.pde.internal.build.Utils.parseExtraBundlesString(element,
 						false);
 				buffer.append("    <feature id=\"");
 				buffer.append(items.get(ID));
@@ -281,7 +283,7 @@
 		} else {
 			buffer.append("  <plugins>\n");
 			for (String element : entryList) {
 				Map<String, Object> items = org.eclipse.pde.internal.build.Utils.parseExtraBundlesString(element,
 						false);
 				buffer.append("    <plugin id=\"");
 				buffer.append(items.get(ID));
@@ -352,11 +354,11 @@
 		if (executableLocation != null)
 			return executableLocation;
 
 		SimpleConfiguratorManipulator manipulator = BundleHelper.getDefault()
 				.acquireService(SimpleConfiguratorManipulator.class);
 		if (manipulator != null) {
 			BundleInfo[] bundles = manipulator
 					.loadConfiguration(BundleHelper.getDefault().getBundle().getBundleContext(), null);
 			// find a fragment for a platform we aren't
 			String id = "org.eclipse.equinox.launcher.win32.win32.x86_64";
 			for (BundleInfo bundle : bundles) {
@@ -377,7 +379,10 @@
 			// Eclipse.app/Contents/Eclipse).
 			baseLocation = baseLocation.getParentFile().getParentFile();
 		}
-		executableLocation = findExecutable(new File(baseLocation.getParent(), "deltapack/eclipse"));
+		File fallback = new File(baseLocation.getParent(), "deltapack/eclipse");
+		executableLocation = findExecutable(fallback);
+		assumeTrue("All attempts to find the executable failed including fallback to " + fallback.getAbsolutePath(),
+				executableLocation != null);
 		return executableLocation;
 	}
 
@@ -490,14 +495,14 @@
 				jar = new JarFile(location.toFile());
 				return jar.getManifest();
 			} finally {
 				org.eclipse.pde.internal.build.Utils.close(jar);
 			}
 		} else if (location.lastSegment().equalsIgnoreCase("MANIFEST.MF")) {
 			InputStream stream = new FileInputStream(location.toFile());
 			try {
 				return new Manifest(stream);
 			} finally {
 				org.eclipse.pde.internal.build.Utils.close(stream);
 			}
 		}
 		return null;