Clean up usage of TestScannerProvider within the tests.

4 files changed, 17 insertions, 10 deletions

diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java
index 8807d760d7b..76cb447f1f2 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java
@@ -53,7 +53,6 @@ public class CallHierarchyAcrossProjectsTest extends CallHierarchyBaseTest {
 	}
 
 	protected void tearDown() throws Exception {
-		TestScannerProvider.sIncludes= null;
 		if (fCProject2 != null) {
 			CProjectHelper.delete(fCProject2);
 		}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java
index 9f91b681b83..296439e7bc4 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java
@@ -12,7 +12,6 @@
 package org.eclipse.cdt.ui.tests.includebrowser;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.swt.widgets.Tree;
@@ -44,7 +43,8 @@ public class IncludeBrowserBaseTest extends BaseUITestCase {
 		super(name);
 	}
 
-	protected void setUp() throws CoreException {
+	protected void setUp() throws Exception {
+		super.setUp();
 		fCProject= CProjectHelper.createCCProject("__ibTest__", "bin", IPDOMManager.ID_FAST_INDEXER);
 		
 		// clear the index
@@ -52,10 +52,11 @@ public class IncludeBrowserBaseTest extends BaseUITestCase {
 		fIndex= CCorePlugin.getIndexManager().getIndex(fCProject);
 	}
 	
-	protected void tearDown() throws CoreException {
+	protected void tearDown() throws Exception {
 		if (fCProject != null) {
 			CProjectHelper.delete(fCProject);
 		}
+		super.tearDown();
 	}
 	
 	protected ICProject getProject() {
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java
index d34258fb821..f4d6c01a135 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java
@@ -6,7 +6,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * Andrew Ferguson (Symbian) - Initial implementation
+ *    Andrew Ferguson (Symbian) - Initial implementation
+ *    Markus Schorn (Wind River Systems)
  *******************************************************************************/
 package org.eclipse.cdt.ui.tests.search;
 
@@ -58,6 +59,7 @@ public class BasicSearchTest extends BaseUITestCase {
 	}
 	
 	protected void setUp() throws Exception {
+		super.setUp();
 		fCProject = CProjectHelper.createCCProject(getName()+System.currentTimeMillis(), "bin", IPDOMManager.ID_NO_INDEXER); 
 		Bundle b = CTestPlugin.getDefault().getBundle();
 		testData = TestSourceReader.getContentsForTest(b, "ui", this.getClass(), getName(), 2);
@@ -74,6 +76,7 @@ public class BasicSearchTest extends BaseUITestCase {
 		if(fCProject != null) {
 			fCProject.getProject().delete(true, NPM);
 		}
+		super.tearDown();
 	}
 
 	// // empty
@@ -110,14 +113,19 @@ public class BasicSearchTest extends BaseUITestCase {
 		ILabelProvider labpv= (ILabelProvider) viewer.getLabelProvider();
 		IStructuredContentProvider scp= (IStructuredContentProvider) viewer.getContentProvider();
 		
-		Object result0= result.getElements()[0];
-		Object result1= result.getElements()[1];
+		String label0= labpv.getText(scp.getElements(result)[0]);
+		String label1= labpv.getText(scp.getElements(result)[1]);
+		
+		// the content provider does not sort the result, so we have to do it:
+		if (label0.compareTo(label1) < 0) {
+			String h= label0; label0= label1; label1= h;
+		}
 		
 		// check the results are rendered
 		String expected0= fCProject.getProject().getName();
 		String expected1= new Path(externalFile.getAbsolutePath()).toString();
-		assertEquals(expected0,labpv.getText(scp.getElements(result)[0]));
-		assertEquals(expected1,labpv.getText(scp.getElements(result)[1]));
+		assertEquals(expected0,label0);
+		assertEquals(expected1,label1);
 	}
 	
 	/**
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyAcrossProjectsTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyAcrossProjectsTest.java
index 8a14ad3b903..2013296774f 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyAcrossProjectsTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyAcrossProjectsTest.java
@@ -58,7 +58,6 @@ public class TypeHierarchyAcrossProjectsTest extends TypeHierarchyBaseTest {
 	}
 
 	protected void tearDown() throws Exception {
-		TestScannerProvider.sIncludes= null;
 		if (fCProject2 != null) {
 			CProjectHelper.delete(fCProject2);
 		}