Bug 387168 -failures in testImportProject and
testBug234149_aFewProviders
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ProjectSetImporterTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ProjectSetImporterTests.java
index d0cfd8e..ba174b4 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ProjectSetImporterTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ProjectSetImporterTests.java
@@ -45,6 +45,7 @@
import org.eclipse.team.internal.ccvs.core.CVSTeamProviderType;
import org.eclipse.team.internal.ccvs.ui.wizards.CVSScmUrlImportWizardPage;
import org.eclipse.team.internal.ui.ProjectSetImporter;
+import org.eclipse.team.internal.ui.Utils;
import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
import org.eclipse.team.tests.ccvs.core.EclipseTest;
import org.eclipse.team.ui.IScmUrlImportWizardPage;
@@ -108,7 +109,7 @@
project2.delete(true, null);
IProject[] importProjectSet = ProjectSetImporter.importProjectSet(
- PSF_FILENAME, Display.getDefault().getActiveShell(), null);
+ PSF_FILENAME, Utils.findShell(), null);
assertEquals(2, importProjectSet.length);
assertEquals(project1, importProjectSet[0]);
@@ -157,7 +158,7 @@
IProject[] importProjectSet = null;
importProjectSet = ProjectSetImporter.importProjectSet(
- PSF_FILENAME, Display.getDefault().getActiveShell(), null);
+ PSF_FILENAME, Utils.findShell(), null);
assertEquals(project, importProjectSet[0]);
assertEquals(project2, importProjectSet[1]);
