[cdt-patch] bug43562: Fix core.tests plugin dependency on internal.ui.se

[Andrew Niefer <aniefer@xxxxxxxxxx>]

Fixed bug 43562: Search test suite in core.tests plugin depends upon UI

The search tests and depedency tests now use 
core.search.BasicSearchResultCollector instead of 
internal.ui.search.CSearchResultCollector

-Andrew


Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/ChangeLog,v
retrieving revision 1.140
diff -u -r1.140 ChangeLog
--- ChangeLog	6 Nov 2003 04:57:38 -0000	1.140
+++ ChangeLog	6 Nov 2003 19:52:17 -0000
@@ -1,3 +1,6 @@
+2003-11-06 Andrew Niefer
+	Remove dependancy on cdt.internal.ui.search.CSearchResultCollector in BaseSearchTest and DependencyTests
+
 2003-11-05 John Camelon
 	Added CompleteParseASTTest::testBug44838().  
 	Added CompleteParseASTTest::testBug46165().  
Index: indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java,v
retrieving revision 1.2
diff -u -r1.2 DependencyTests.java
--- indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java	27 Oct 2003 20:57:33 -0000	1.2
+++ indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java	6 Nov 2003 19:52:17 -0000
@@ -21,6 +21,7 @@
 
 import org.eclipse.cdt.core.CCProjectNature;
 import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.search.BasicSearchResultCollector;
 import org.eclipse.cdt.core.search.ICSearchConstants;
 import org.eclipse.cdt.core.search.ICSearchPattern;
 import org.eclipse.cdt.core.search.ICSearchResultCollector;
@@ -33,7 +34,6 @@
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
 import org.eclipse.cdt.internal.core.search.matching.CSearchPattern;
 import org.eclipse.cdt.internal.core.sourcedependency.DependencyQueryJob;
-import org.eclipse.cdt.internal.ui.search.CSearchResultCollector;
 import org.eclipse.core.internal.resources.ResourceException;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -59,7 +59,7 @@
 	NullProgressMonitor		monitor;
 	IndexManager 			indexManager;
 	IWorkspace 				workspace;
-	CSearchResultCollector	resultCollector;
+	BasicSearchResultCollector	resultCollector;
 	SearchEngine			searchEngine;
 	ICSearchScope 			scope;
 
@@ -99,8 +99,7 @@
 		
 		scope = SearchEngine.createWorkspaceScope();
 		monitor = new NullProgressMonitor();
-		resultCollector = new CSearchResultCollector();
-		resultCollector.setProgressMonitor( monitor );
+		resultCollector = new BasicSearchResultCollector();
 	
 		searchEngine = new SearchEngine();
 	}
@@ -638,7 +637,6 @@
    }
 	
    protected void search(IWorkspace workspace, ICSearchPattern pattern, ICSearchScope scope, ICSearchResultCollector collector) {
-	   resultCollector.setProgressMonitor( monitor );
 	   searchEngine.search( workspace, pattern, scope, collector, false );
    }
    
Index: search/org/eclipse/cdt/core/search/tests/BaseSearchTest.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/BaseSearchTest.java,v
retrieving revision 1.11
diff -u -r1.11 BaseSearchTest.java
--- search/org/eclipse/cdt/core/search/tests/BaseSearchTest.java	27 Oct 2003 20:57:33 -0000	1.11
+++ search/org/eclipse/cdt/core/search/tests/BaseSearchTest.java	6 Nov 2003 19:52:18 -0000
@@ -19,12 +19,12 @@
 
 import org.eclipse.cdt.core.CCProjectNature;
 import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.search.BasicSearchResultCollector;
 import org.eclipse.cdt.core.search.ICSearchConstants;
 import org.eclipse.cdt.core.search.ICSearchPattern;
 import org.eclipse.cdt.core.search.ICSearchResultCollector;
 import org.eclipse.cdt.core.search.ICSearchScope;
 import org.eclipse.cdt.core.search.SearchEngine;
-import org.eclipse.cdt.internal.ui.search.CSearchResultCollector;
 import org.eclipse.cdt.testplugin.FileManager;
 import org.eclipse.core.internal.resources.ResourceException;
 import org.eclipse.core.resources.IFile;
@@ -54,7 +54,7 @@
 	IProject 				testProject;
 	NullProgressMonitor		monitor;
 	IWorkspace 				workspace;
-	CSearchResultCollector	resultCollector;
+	BasicSearchResultCollector	resultCollector;
 	SearchEngine			searchEngine;
 	FileManager 			fileManager;
     
@@ -85,8 +85,7 @@
 		
 		scope = SearchEngine.createWorkspaceScope();
 	
-		resultCollector = new CSearchResultCollector();
-		resultCollector.setProgressMonitor( monitor );
+		resultCollector = new BasicSearchResultCollector();
 		
 		searchEngine = new SearchEngine();
 	}
@@ -180,7 +179,6 @@
 	}
 	
 	protected void search(IWorkspace workspace, ICSearchPattern pattern, ICSearchScope scope, ICSearchResultCollector collector) {
-		resultCollector.setProgressMonitor( monitor );
 		searchEngine.search( workspace, pattern, scope, collector, false );
 	}
 	
Index: search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java,v
retrieving revision 1.19
diff -u -r1.19 OtherPatternTests.java
--- search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java	27 Oct 2003 20:57:33 -0000	1.19
+++ search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java	6 Nov 2003 19:52:18 -0000
@@ -322,8 +322,6 @@
 		String path = pluginRoot + "resources/search/include.h";
 		
 		ICSearchPattern pattern = SearchEngine.createSearchPattern( "Head", CLASS, REFERENCES, true );
-
-		resultCollector.setProgressMonitor( monitor );
 		
 		resultCollector.aboutToStart();