From f14741b5417ca5ff934e86b5ff7ba2e157dd4f95 Mon Sep 17 00:00:00 2001
From: Hoda Amer <hamer@ca.ibm.com>
Date: Mon, 10 Nov 2003 19:37:02 +0000
Subject: [PATCH] Fix for Andrew
---
core/org.eclipse.cdt.core.tests/ChangeLog | 3 +++
.../eclipse/cdt/core/indexer/tests/DependencyTests.java | 8 +++-----
.../org/eclipse/cdt/core/search/tests/BaseSearchTest.java | 8 +++-----
.../eclipse/cdt/core/search/tests/OtherPatternTests.java | 2 --
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/core/org.eclipse.cdt.core.tests/ChangeLog b/core/org.eclipse.cdt.core.tests/ChangeLog
index 33b524a5e8b..e796cdeb3be 100644
--- a/core/org.eclipse.cdt.core.tests/ChangeLog
+++ b/core/org.eclipse.cdt.core.tests/ChangeLog
@@ -1,3 +1,6 @@
+2003-11-06 Andrew Niefer
+ Remove dependancy on cdt.internal.ui.search.CSearchResultCollector in BaseSearchTest and DependencyTests
+
2003-11-07 John Camelon
Moved testBug39554() from ASTFailedTests to QuickParseASTTests.
diff --git a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java
index cbeb4e215eb..5b9ec6dc680 100644
--- a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java
+++ b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java
@@ -21,6 +21,7 @@ import junit.framework.TestSuite;
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.PatternSearchJob;
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 @@ import org.eclipse.core.runtime.Platform;
NullProgressMonitor monitor;
IndexManager indexManager;
IWorkspace workspace;
- CSearchResultCollector resultCollector;
+ BasicSearchResultCollector resultCollector;
SearchEngine searchEngine;
ICSearchScope scope;
@@ -99,8 +99,7 @@ import org.eclipse.core.runtime.Platform;
scope = SearchEngine.createWorkspaceScope();
monitor = new NullProgressMonitor();
- resultCollector = new CSearchResultCollector();
- resultCollector.setProgressMonitor( monitor );
+ resultCollector = new BasicSearchResultCollector();
searchEngine = new SearchEngine();
}
@@ -638,7 +637,6 @@ import org.eclipse.core.runtime.Platform;
}
protected void search(IWorkspace workspace, ICSearchPattern pattern, ICSearchScope scope, ICSearchResultCollector collector) {
- resultCollector.setProgressMonitor( monitor );
searchEngine.search( workspace, pattern, scope, collector, false );
}
diff --git a/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/BaseSearchTest.java b/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/BaseSearchTest.java
index 645d7bde85b..464e0694831 100644
--- a/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/BaseSearchTest.java
+++ b/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/BaseSearchTest.java
@@ -19,12 +19,12 @@ import junit.framework.TestCase;
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 @@ public class BaseSearchTest extends TestCase implements ICSearchConstants {
IProject testProject;
NullProgressMonitor monitor;
IWorkspace workspace;
- CSearchResultCollector resultCollector;
+ BasicSearchResultCollector resultCollector;
SearchEngine searchEngine;
FileManager fileManager;
@@ -85,8 +85,7 @@ public class BaseSearchTest extends TestCase implements ICSearchConstants {
scope = SearchEngine.createWorkspaceScope();
- resultCollector = new CSearchResultCollector();
- resultCollector.setProgressMonitor( monitor );
+ resultCollector = new BasicSearchResultCollector();
searchEngine = new SearchEngine();
}
@@ -180,7 +179,6 @@ public class BaseSearchTest extends TestCase implements ICSearchConstants {
}
protected void search(IWorkspace workspace, ICSearchPattern pattern, ICSearchScope scope, ICSearchResultCollector collector) {
- resultCollector.setProgressMonitor( monitor );
searchEngine.search( workspace, pattern, scope, collector, false );
}
diff --git a/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java b/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java
index 876a9529693..d61833ca13f 100644
--- a/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java
+++ b/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java
@@ -322,8 +322,6 @@ public class OtherPatternTests extends BaseSearchTest {
String path = pluginRoot + "resources/search/include.h";
ICSearchPattern pattern = SearchEngine.createSearchPattern( "Head", CLASS, REFERENCES, true );
-
- resultCollector.setProgressMonitor( monitor );
resultCollector.aboutToStart();