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/AllPDEMinimalTests.java

@@ -32,6 +32,7 @@
 import org.eclipse.pde.ui.tests.target.AllTargetMinimalTests;
 import org.eclipse.pde.ui.tests.views.log.AllLogViewTests;
 import org.eclipse.pde.ui.tests.wizards.AllNewProjectMinimalTests;
+import org.eclipse.ui.tests.smartimport.ProjectSmartImportTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -43,19 +44,29 @@
  */
 
 @RunWith(Suite.class)
-@SuiteClasses({ AllTargetMinimalTests.class, AllNewProjectMinimalTests.class, AllPreferenceTests.class,
-	// AllImportTests.class,
-	AllBundleModelTests.class, AllXMLModelTests.class, AllValidatorTests.class, AllNLSTests.class,
-	AllPDERuntimeTests.class,
-	// ExportBundleTests.class,
-	AllLauncherTests.class, AllLogViewTests.class, ProjectCreationTests.class, BundleRootTests.class,
-	PluginRegistryTestsMinimal.class, ClasspathResolverTest.class, PDESchemaHelperTest.class,
+@SuiteClasses({ AllTargetMinimalTests.class, //
+	AllNewProjectMinimalTests.class, //
+	AllPreferenceTests.class, //
+	// AllImportTests.class, //
+	AllBundleModelTests.class, //
+	AllXMLModelTests.class, //
+	AllValidatorTests.class, //
+	AllNLSTests.class, //
+	AllPDERuntimeTests.class, //
+	// ExportBundleTests.class, //
+	AllLauncherTests.class, //
+	AllLogViewTests.class, //
+	ProjectCreationTests.class, //
+	BundleRootTests.class, //
+	PluginRegistryTestsMinimal.class, //
+	ClasspathResolverTest.class, //
+	PDESchemaHelperTest.class, //
 	DynamicPluginProjectReferencesTest.class,
-	// ClasspathContributorTest.class
-	ClasspathResolutionTest.class,
-	BundleErrorReporterTest.class,
-		AllPDECoreTests.class
-})
+	// ClasspathContributorTest.class //
+	ClasspathResolutionTest.class, //
+	BundleErrorReporterTest.class, //
+	AllPDECoreTests.class, //
+	ProjectSmartImportTest.class })
 public class AllPDEMinimalTests {
 
 }

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 Red Hat, Inc. and others.
+ * Copyright (c) 2018, 2023 Red Hat, Inc. and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -46,15 +46,15 @@
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ProjectTestTemplate {
+public class ProjectSmartImportTest {
 
 	@Parameters(name = "{0}")
 	public static Object[][] data() {
 		return new Object[][] { //
-				{ "JavaEclipseProject", List.of("org.eclipse.jdt.core.javanature") }, //
-				{ "FeatureProject", List.of("org.eclipse.pde.FeatureNature") }, //
-				{ "PlainEclipseProject", List.of() }, //
-				{ "PlainJavaProject", List.of("org.eclipse.jdt.core.javanature") }, //
+			{ "JavaEclipseProject", List.of("org.eclipse.jdt.core.javanature") }, //
+			{ "FeatureProject", List.of("org.eclipse.pde.FeatureNature") }, //
+			{ "PlainEclipseProject", List.of() }, //
+			{ "PlainJavaProject", List.of("org.eclipse.jdt.core.javanature") }, //
 		};
 	}
 
@@ -70,7 +70,7 @@ public static Object[][] data() {
 	@BeforeClass
 	public static void setupClass() throws IOException, CoreException {
 		// Copy imported projects to temp-directory to not pollute this project
-		Path source = Path.of("resources").toRealPath();
+		Path source = Path.of("tests/smartImport").toRealPath();
 		Path target = workingDirectory.getRoot().toPath();
 		try (Stream<Path> files = Files.walk(source).filter(Files::isRegularFile)) {
 			for (Path file : (Iterable<Path>) files::iterator) {
@@ -94,7 +94,6 @@ private static Path getErrorLogFile() {
 	}
 
 	@Test
-	@SuppressWarnings("restriction")
 	public void testImport() throws CoreException, InterruptedException {
 		File projectPath = new File(workingDirectory.getRoot(), projectName);
 
@@ -125,7 +124,7 @@ private void checkProblemsView(IProject project) throws CoreException {
 		}).toList();
 		assertTrue(
 				"There should be no errors in imported project: " + System.lineSeparator() + errorMarkers.stream()
-						.map(String::valueOf).collect(Collectors.joining(System.lineSeparator())),
+				.map(String::valueOf).collect(Collectors.joining(System.lineSeparator())),
 				errorMarkers.isEmpty());
 
 	}

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>