Bug 369660 - Failures in UITestSuite in I20120124-2000

2 files changed, 24 insertions, 2 deletions

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java
index a6dbbab2dab..f86e3db67f3 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java
@@ -34,7 +34,7 @@ public class DataTransferTestSuite extends TestSuite {
         addTest(new TestSuite(ImportArchiveOperationTest.class)); 
         addTest(new TestSuite(ExportFileSystemOperationTest.class));
         addTest(new TestSuite(ExportArchiveFileOperationTest.class));
-        addTest(new TestSuite(ImportExistingProjectsWizardTest.class));
+        addTest(ImportExistingProjectsWizardTest.suite());
         addTest(new TestSuite(ImportExportWizardsCategoryTests.class));
     }
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java
index e1af790a090..de677674072 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,6 +21,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.zip.ZipFile;
 
+import junit.framework.TestSuite;
+
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -74,6 +76,26 @@ public class ImportExistingProjectsWizardTest extends UITestCase {
 
 	private boolean originalRefreshSetting;
 
+	public static TestSuite suite() {
+		TestSuite ts = new TestSuite();
+		ts.addTest(new ImportExistingProjectsWizardTest("testFindSingleZip"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testFindSingleTar"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testFindSingleDirectory"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testDoNotShowProjectWithSameName"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testImportSingleZip"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testImportZipWithEmptyFolder"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testImportSingleTar"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testImportTarWithEmptyFolder"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testImportSingleDirectory"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testImportSingleDirectoryWithCopy"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testImportSingleDirectoryWithCopyDeleteProjectKeepContents"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testImportZipDeleteContentsImportAgain"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testInitialValue"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testImportArchiveMultiProject"));
+		ts.addTest(new ImportExistingProjectsWizardTest("testGetProjectRecords"));
+		return ts;
+	}
+	
 	public ImportExistingProjectsWizardTest(String testName) {
 		super(testName);
 	}