Bug 492897 - Use Importer API from Platform

Change-Id: I557218b33eb9ddebd748c819d0b9030fead5727b
Signed-off-by: Mickael Istria <mistria@redhat.com>

1 files changed, 11 insertions, 9 deletions

diff --git a/org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java b/org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java
index 87330b97..5a900390 100644
--- a/org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java
+++ b/org.eclipse.m2e.importer.tests/src/org/eclipse/m2e/importer/tests/MavenImporterTest.java
@@ -17,20 +17,22 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.ui.internal.wizards.datatransfer.SmartImportJob;
+import org.eclipse.ui.wizards.datatransfer.ProjectConfigurator;
+
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.importer.internal.MavenProjectConfigurator;
 import org.eclipse.m2e.tests.common.AbstractMavenProjectTestCase;
 import org.eclipse.m2e.tests.common.JobHelpers;
 import org.eclipse.m2e.tests.common.JobHelpers.IJobMatcher;
-import org.eclipse.ui.internal.wizards.datatransfer.EasymportJob;
-import org.eclipse.ui.wizards.datatransfer.ProjectConfigurator;
-import org.junit.Assert;
-import org.junit.Test;
 
 
 public class MavenImporterTest extends AbstractMavenProjectTestCase {
@@ -47,7 +49,7 @@ public class MavenImporterTest extends AbstractMavenProjectTestCase {
     new File(outputDirectory, "module1/.classpath").delete();
 
     Set<IProject> newProjects = null;
-    EasymportJob job = new EasymportJob(outputDirectory, Collections.EMPTY_SET, true, true);
+    SmartImportJob job = new SmartImportJob(outputDirectory, Collections.EMPTY_SET, true, true);
 
     Map<File, List<ProjectConfigurator>> proposals = job.getImportProposals(monitor);
     Assert.assertEquals("Expected 2 projects to import", 2, proposals.size()); //$NON-NLS-1$
@@ -71,10 +73,10 @@ public class MavenImporterTest extends AbstractMavenProjectTestCase {
     Assert.assertEquals("Expected only 2 new projects", 2, newProjects.size()); //$NON-NLS-1$
 
     JobHelpers.waitForJobs(new IJobMatcher() {
-		public boolean matches(Job job) {
-			return MavenProjectConfigurator.UPDATE_MAVEN_CONFIGURATION_JOB_NAME.equals(job.getName());
-		}
-	}, 30_000);
+      public boolean matches(Job job) {
+        return MavenProjectConfigurator.UPDATE_MAVEN_CONFIGURATION_JOB_NAME.equals(job.getName());
+      }
+    }, 30_000);
 
     for(IProject project : newProjects) {
       Assert