mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fix for Andrew

Browse source
This commit is contained in:
Hoda Amer 2003-11-10 19:37:02 +00:00
parent 3c191ee1d6
commit f14741b541
4 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.core.tests/ChangeLog
View file

@ -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 2003-11-07 John Camelon
Moved testBug39554() from ASTFailedTests to QuickParseASTTests. Moved testBug39554() from ASTFailedTests to QuickParseASTTests.

8
core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java
View file

@ -21,6 +21,7 @@ import junit.framework.TestSuite;
import org.eclipse.cdt.core.CCProjectNature; import org.eclipse.cdt.core.CCProjectNature;
import org.eclipse.cdt.core.CCorePlugin; 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.ICSearchConstants;
import org.eclipse.cdt.core.search.ICSearchPattern; import org.eclipse.cdt.core.search.ICSearchPattern;
import org.eclipse.cdt.core.search.ICSearchResultCollector; 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.indexing.IndexManager;
import org.eclipse.cdt.internal.core.search.matching.CSearchPattern; import org.eclipse.cdt.internal.core.search.matching.CSearchPattern;
import org.eclipse.cdt.internal.core.sourcedependency.DependencyQueryJob; 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.internal.resources.ResourceException;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
@ -59,7 +59,7 @@ import org.eclipse.core.runtime.Platform;
NullProgressMonitor monitor; NullProgressMonitor monitor;
IndexManager indexManager; IndexManager indexManager;
IWorkspace workspace; IWorkspace workspace;
CSearchResultCollector resultCollector; BasicSearchResultCollector resultCollector;
SearchEngine searchEngine; SearchEngine searchEngine;
ICSearchScope scope; ICSearchScope scope;
@ -99,8 +99,7 @@ import org.eclipse.core.runtime.Platform;
scope = SearchEngine.createWorkspaceScope(); scope = SearchEngine.createWorkspaceScope();
monitor = new NullProgressMonitor(); monitor = new NullProgressMonitor();
resultCollector = new CSearchResultCollector(); resultCollector = new BasicSearchResultCollector();
resultCollector.setProgressMonitor( monitor );
searchEngine = new SearchEngine(); searchEngine = new SearchEngine();
} }
@ -638,7 +637,6 @@ import org.eclipse.core.runtime.Platform;
} }
protected void search(IWorkspace workspace, ICSearchPattern pattern, ICSearchScope scope, ICSearchResultCollector collector) { protected void search(IWorkspace workspace, ICSearchPattern pattern, ICSearchScope scope, ICSearchResultCollector collector) {
resultCollector.setProgressMonitor( monitor );
searchEngine.search( workspace, pattern, scope, collector, false ); searchEngine.search( workspace, pattern, scope, collector, false );
} }

8
core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/BaseSearchTest.java
View file

@ -19,12 +19,12 @@ import junit.framework.TestCase;
import org.eclipse.cdt.core.CCProjectNature; import org.eclipse.cdt.core.CCProjectNature;
import org.eclipse.cdt.core.CCorePlugin; 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.ICSearchConstants;
import org.eclipse.cdt.core.search.ICSearchPattern; import org.eclipse.cdt.core.search.ICSearchPattern;
import org.eclipse.cdt.core.search.ICSearchResultCollector; import org.eclipse.cdt.core.search.ICSearchResultCollector;
import org.eclipse.cdt.core.search.ICSearchScope; import org.eclipse.cdt.core.search.ICSearchScope;
import org.eclipse.cdt.core.search.SearchEngine; import org.eclipse.cdt.core.search.SearchEngine;
import org.eclipse.cdt.internal.ui.search.CSearchResultCollector;
import org.eclipse.cdt.testplugin.FileManager; import org.eclipse.cdt.testplugin.FileManager;
import org.eclipse.core.internal.resources.ResourceException; import org.eclipse.core.internal.resources.ResourceException;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
@ -54,7 +54,7 @@ public class BaseSearchTest extends TestCase implements ICSearchConstants {
IProject testProject; IProject testProject;
NullProgressMonitor monitor; NullProgressMonitor monitor;
IWorkspace workspace; IWorkspace workspace;
CSearchResultCollector resultCollector; BasicSearchResultCollector resultCollector;
SearchEngine searchEngine; SearchEngine searchEngine;
FileManager fileManager; FileManager fileManager;
@ -85,8 +85,7 @@ public class BaseSearchTest extends TestCase implements ICSearchConstants {
scope = SearchEngine.createWorkspaceScope(); scope = SearchEngine.createWorkspaceScope();
resultCollector = new CSearchResultCollector(); resultCollector = new BasicSearchResultCollector();
resultCollector.setProgressMonitor( monitor );
searchEngine = new SearchEngine(); 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) { protected void search(IWorkspace workspace, ICSearchPattern pattern, ICSearchScope scope, ICSearchResultCollector collector) {
resultCollector.setProgressMonitor( monitor );
searchEngine.search( workspace, pattern, scope, collector, false ); searchEngine.search( workspace, pattern, scope, collector, false );
} }

2
core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java
View file

@ -323,8 +323,6 @@ public class OtherPatternTests extends BaseSearchTest {
ICSearchPattern pattern = SearchEngine.createSearchPattern( "Head", CLASS, REFERENCES, true ); ICSearchPattern pattern = SearchEngine.createSearchPattern( "Head", CLASS, REFERENCES, true );
resultCollector.setProgressMonitor( monitor );
resultCollector.aboutToStart(); resultCollector.aboutToStart();
ArrayList matchesList = new ArrayList(); ArrayList matchesList = new ArrayList();