Clean-up LocalTargetDefinitionTests

Remove unused code and unify and modernize remaining code.

Author: HannesWell

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java

@@ -107,46 +107,6 @@ public class P2Utils {
 	public static final IProvidedCapability BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, Version.createOSGi(1, 0, 0));
 	public static final String CAPABILITY_NS_JAVA_PACKAGE = "java.package"; //$NON-NLS-1$
 
-	/**
-	 * Returns bundles defined by the 'bundles.info' file in the
-	 * specified location, or <code>null</code> if none. The "bundles.info" file
-	 * is assumed to be at a fixed location relative to the configuration area URL.
-	 * This method will also look for a "source.info".  If available, any source
-	 * bundles found will also be added to the returned list.  If bundle URLs found
-	 * in the bundles.info are relative, they will be appended to platformHome to
-	 * make them absolute.
-	 *
-	 * @param platformHome absolute path in the local file system to an installation
-	 * @param configurationArea url location of the configuration directory to search for bundles.info and source.info
-	 * @return URLs of all bundles in the installation or <code>null</code> if not able
-	 * 	to locate a bundles.info
-	 */
-	public static URL[] readBundlesTxt(String platformHome, File configurationArea) {
-		if (configurationArea == null) {
-			return null;
-		}
-		try {
-			BundleInfo[] bundles = readBundles(platformHome, configurationArea);
-			if (bundles == null) {
-				return null;
-			}
-			int length = bundles.length;
-			BundleInfo[] srcBundles = readSourceBundles(platformHome, configurationArea);
-			if (srcBundles != null) {
-				length += srcBundles.length;
-			}
-			URL[] urls = new URL[length];
-			copyURLs(urls, 0, bundles);
-			if (srcBundles != null && srcBundles.length > 0) {
-				copyURLs(urls, bundles.length, srcBundles);
-			}
-			return urls;
-		} catch (MalformedURLException e) {
-			PDECore.log(e);
-			return null;
-		}
-	}
-
 	/**
 	 * Returns bundles defined by the 'bundles.info' relative to the given
 	 * home and configuration area, or <code>null</code> if none.
@@ -207,19 +167,6 @@ public static BundleInfo[] readSourceBundles(String platformHome, File configura
 		}
 	}
 
-	/**
-	 * Copies URLs from the given bundle info objects into the specified array starting at the given index.
-	 *
-	 * @param dest array to copy URLs into
-	 * @param start index to start copying into
-	 * @param infos associated bundle infos
-	 */
-	private static void copyURLs(URL[] dest, int start, BundleInfo[] infos) throws MalformedURLException {
-		for (BundleInfo info : infos) {
-			dest[start++] = new File(info.getLocation()).toURL();
-		}
-	}
-
 	/**
 	 * Returns a list of {@link BundleInfo} for each bundle entry or
 	 * <code>null</code> if there is a problem reading the file.

ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/build/properties/AbstractBuildValidationTest.java

@@ -51,7 +51,6 @@
 import org.eclipse.pde.internal.ui.PDEPlugin;
 import org.eclipse.pde.internal.ui.correction.ResolutionGenerator;
 import org.eclipse.pde.ui.tests.PDETestsPlugin;
-import org.eclipse.pde.ui.tests.target.LocalTargetDefinitionTests;
 import org.eclipse.ui.IMarkerResolution;
 import org.junit.Before;
 import org.osgi.service.prefs.BackingStoreException;
@@ -243,7 +242,7 @@ protected IPath doUnZip(IPath location, String archivePath) throws IOException {
 					file.createNewFile();
 					try (InputStream inputStream = new BufferedInputStream(zipFile.getInputStream(entry));
 							BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(file))) {
-						byte[] bytes = LocalTargetDefinitionTests.getInputStreamAsByteArray(inputStream, -1);
+						byte[] bytes = inputStream.readAllBytes();
 						outputStream.write(bytes);
 					}
 				}

ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/TargetPlatformPerfTest.java

@@ -45,7 +45,6 @@
 import org.eclipse.pde.core.target.LoadTargetDefinitionJob;
 import org.eclipse.pde.internal.core.PDECore;
 import org.eclipse.pde.ui.tests.PDETestsPlugin;
-import org.eclipse.pde.ui.tests.target.LocalTargetDefinitionTests;
 import org.eclipse.pde.ui.tests.util.TargetPlatformUtil;
 import org.eclipse.pde.ui.tests.util.TestBundleCreator;
 import org.eclipse.test.performance.Dimension;
@@ -274,7 +273,7 @@ private static IPath doUnZip(IPath location, String archivePath) throws IOExcept
 					file.createNewFile();
 					try (InputStream inputStream = new BufferedInputStream(zipFile.getInputStream(entry));
 							BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(file))) {
-						byte[] bytes = LocalTargetDefinitionTests.getInputStreamAsByteArray(inputStream, -1);
+						byte[] bytes = inputStream.readAllBytes();
 						outputStream.write(bytes);
 					}
 				}

ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/AbstractTargetTest.java

@@ -178,7 +178,7 @@ private IPath doUnZip(IPath location, String archivePath) throws IOException {
 					file.createNewFile();
 					try (InputStream inputStream = new BufferedInputStream(zipFile.getInputStream(entry));
 							BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(file))) {
-						byte[] bytes = LocalTargetDefinitionTests.getInputStreamAsByteArray(inputStream, -1);
+						byte[] bytes = inputStream.readAllBytes();
 						outputStream.write(bytes);
 					}
 				}