Move only remaining test from pde.ui.tests.smartimport into pde.ui.tests

And delete the now empty o.e.pde.ui.tests.smartimport.

ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDETests.java

@@ -35,6 +35,7 @@
 import org.eclipse.pde.ui.tests.target.AllTargetTests;
 import org.eclipse.pde.ui.tests.views.log.AllLogViewTests;
 import org.eclipse.pde.ui.tests.wizards.AllNewProjectTests;
+import org.eclipse.ui.tests.smartimport.ProjectSmartImportTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -62,7 +63,8 @@
 	DynamicPluginProjectReferencesTest.class, //
 	ClasspathResolutionTest.class, //
 	BundleErrorReporterTest.class, //
-	AllPDECoreTests.class //
+	AllPDECoreTests.class, //
+	ProjectSmartImportTest.class, //
 })
 public class AllPDETests {
 

ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/PDETestCase.java

@@ -16,9 +16,16 @@
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.StackWalker.Option;
+import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.core.resources.IProject;
@@ -29,6 +36,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.URIUtil;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -46,6 +54,8 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
 
 /**
  * Provides a default {@link #tearDown()} implementation to delete all
@@ -54,6 +64,8 @@
  */
 public abstract class PDETestCase {
 
+	private static final StackWalker STACK_WALKER = StackWalker.getInstance(Option.RETAIN_CLASS_REFERENCE);
+
 	private static boolean welcomeClosed;
 	@Rule
 	public TestName name = new TestName();
@@ -149,4 +161,37 @@ public static void assumeRunningInStandaloneEclipseSDK() {
 			throw new IllegalStateException(e);
 		}
 	}
+
+	/**
+	 * Copies the content of the specified directory from the callers bundle to
+	 * the specified specified target directory and restores the relative
+	 * structure within the given directory.
+	 * <p>
+	 * This method works for bundles in directory and jar shape and is therefore
+	 * suitable for tests that run in Eclipse I-builds too (where the
+	 * Test-Plugins are executed as jars).
+	 * </p>
+	 *
+	 * @param rootPath
+	 *            the path of the directory to copy from this bundle
+	 * @param targetRoot
+	 *            the target directory
+	 */
+	public static void copyFromThisBundleInto(String rootPath, Path targetRoot)
+			throws IOException, URISyntaxException {
+		Class<?> caller = STACK_WALKER.getCallerClass();
+		Bundle bundle = FrameworkUtil.getBundle(caller);
+		URI rootEntry = bundle.getEntry(rootPath).toURI();
+		List<URL> entries = Collections.list(bundle.findEntries(rootPath, null, true));
+		for (URL entry : entries) {
+			String relativePath = URIUtil.makeRelative(entry.toURI(), rootEntry).toString();
+			if (!relativePath.endsWith("/")) {
+				Path targetPath = targetRoot.resolve(relativePath);
+				Files.createDirectories(targetPath.getParent());
+				try (InputStream is = entry.openStream()) {
+					Files.copy(is, targetPath, StandardCopyOption.REPLACE_EXISTING);
+				}
+			}
+		}
+	}
 }

ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/ProjectTestTemplate.java → ui/org.eclipse.pde.ui.tests/src/org/eclipse/ui/tests/smartimport/ProjectSmartImportTest.java

@@ -23,7 +23,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.assertj.core.api.Condition;
 import org.eclipse.core.resources.IMarker;
@@ -34,6 +33,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.pde.ui.tests.PDETestCase;
 import org.eclipse.pde.ui.tests.util.ProjectUtils;
 import org.junit.After;
 import org.junit.BeforeClass;
@@ -46,7 +46,7 @@
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ProjectTestTemplate {
+public class ProjectSmartImportTest {
 
 	@Parameters(name = "{0}")
 	public static Object[][] projects() {
@@ -69,15 +69,8 @@ public static Object[][] projects() {
 	@BeforeClass
 	public static void setupClass() throws Exception {
 		// Copy imported projects to temp-directory to not pollute this project
-		Path source = Path.of("resources").toRealPath();
-		Path target = workingDirectory.getRoot().toPath();
-		try (Stream<Path> files = Files.walk(source).filter(Files::isRegularFile)) {
-			for (Path file : (Iterable<Path>) files::iterator) {
-				Path targetFile = target.resolve(source.relativize(file));
-				Files.createDirectories(targetFile.getParent());
-				Files.copy(file, targetFile);
-			}
-		}
+		// and have it unzipped for I-build tests
+		PDETestCase.copyFromThisBundleInto("tests/smartImport", workingDirectory.getRoot().toPath());
 		Files.writeString(getErrorLogFile(), ""); // empty error log
 		ProjectUtils.deleteAllWorkspaceProjects();
 	}
@@ -93,7 +86,6 @@ private static Path getErrorLogFile() {
 	}
 
 	@Test
-	@SuppressWarnings("restriction")
 	public void testImport() throws CoreException, InterruptedException {
 		File projectPath = new File(workingDirectory.getRoot(), projectName);
 

ui/pom.xml

@@ -29,7 +29,6 @@
     <module>org.eclipse.pde.ui</module>
     <module>org.eclipse.pde.ui.templates</module>
     <module>org.eclipse.pde.ui.tests</module>
-    <module>org.eclipse.pde.ui.tests.smartimport</module>
     <module>org.eclipse.pde.spy.core</module>
     <module>org.eclipse.pde.spy.bundle</module>
     <module>org.eclipse.pde.spy.event</module>