diff --git a/core/org.eclipse.cdt.core.tests/ChangeLog b/core/org.eclipse.cdt.core.tests/ChangeLog index df779f00546..2d58bc0debf 100644 --- a/core/org.eclipse.cdt.core.tests/ChangeLog +++ b/core/org.eclipse.cdt.core.tests/ChangeLog @@ -1,3 +1,9 @@ +2005-02-02 Tanya Wolff + added regression tests to AutomatedIntegrationSuite + * build.properties + * regression/org.eclipse.cdt.core.tests/SearchRegressionTests.java + * suite/org.eclipse.cdt.core.suite/AutomatedIntegrationSuite.java + 2005-01-31 Bogdan Gheorghe Patch from Dave Daoust to streamline Index Manager Tests diff --git a/core/org.eclipse.cdt.core.tests/build.properties b/core/org.eclipse.cdt.core.tests/build.properties index 8ce427f2b5b..7ea4ba068b8 100644 --- a/core/org.eclipse.cdt.core.tests/build.properties +++ b/core/org.eclipse.cdt.core.tests/build.properties @@ -14,4 +14,5 @@ source.cdtcoretests.jar = build/,\ suite/,\ indexer/,\ search/,\ - misc/ + misc/,\ + regression/ diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SearchRegressionTests.java b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SearchRegressionTests.java index 321a27a688c..887e43c8275 100644 --- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SearchRegressionTests.java +++ b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SearchRegressionTests.java @@ -220,9 +220,11 @@ public class SearchRegressionTests extends BaseTestFramework implements ICSearch String code = writer.toString(); IFile f = importFile( "ClassDeclarationReference.cpp", code ); //$NON-NLS-1$ - + ICElement[] list = new ICElement[1]; + list[0]=cproject.getCProject(); + ICSearchPattern pattern = SearchEngine.createSearchPattern( "A", CLASS, ALL_OCCURRENCES, true ); //$NON-NLS-1$ - Set matches = search( pattern ); + Set matches = search( pattern, list ); assertEquals( 2, matches.size() ); assertMatch( matches, f, code.indexOf( "A {" ) ); //$NON-NLS-1$ @@ -290,9 +292,11 @@ public class SearchRegressionTests extends BaseTestFramework implements ICSearch writer.write("} \n" ); //$NON-NLS-1$ String code = writer.toString(); IFile b = importFile( "ClassStructReference.cpp", code ); //$NON-NLS-1$ - + ICElement[] list = new ICElement[1]; + list[0]=cproject.getCProject(); + ICSearchPattern pattern = SearchEngine.createSearchPattern( "*", CLASS_STRUCT, REFERENCES, true ); //$NON-NLS-1$ - Set matches = search( pattern ); + Set matches = search( pattern,list ); assertMatch( matches, b, code.indexOf( "Mammal/*ref1*/" ) ); //$NON-NLS-1$ assertMatch( matches, b, code.indexOf( "bioticPotential/*ref2*/" ) ); //$NON-NLS-1$ @@ -335,9 +339,11 @@ public class SearchRegressionTests extends BaseTestFramework implements ICSearch writer.write("} \n" ); //$NON-NLS-1$ String code2 = writer.toString(); IFile g = importFile( "NamespaceDeclaration.cpp", code2 ); //$NON-NLS-1$ - + ICElement[] list = new ICElement[1]; + list[0]=cproject.getCProject(); + ICSearchPattern pattern = SearchEngine.createSearchPattern( "*", NAMESPACE, DECLARATIONS, true ); //$NON-NLS-1$ - Set matches = search( pattern ); + Set matches = search( pattern,list ); assertEquals( 3, matches.size() ); assertMatch( matches, gh, code.indexOf( "N" ) ); //$NON-NLS-1$ @@ -369,10 +375,11 @@ public class SearchRegressionTests extends BaseTestFramework implements ICSearch writer.write("using namespace R; \n" ); //$NON-NLS-1$ String source = writer.toString(); IFile cpp = importFile( "NamespaceDefinition.cpp", source ); //$NON-NLS-1$ - + ICElement[] list = new ICElement[1]; + list[0]=cproject.getCProject(); ICSearchPattern pattern = SearchEngine.createSearchPattern( "*", NAMESPACE, DEFINITIONS, true ); //$NON-NLS-1$ - Set matches = search( pattern ); - + Set matches = search( pattern,list ); + assertEquals( 4, matches.size() ); assertMatch( matches, h, header.indexOf( "N/*def1*/" ) ); //$NON-NLS-1$ assertMatch( matches, h, header.indexOf( "M" ) ); //$NON-NLS-1$ @@ -402,9 +409,10 @@ public class SearchRegressionTests extends BaseTestFramework implements ICSearch writer.write("N3::C3 *d = new N3::C3(); \n" ); //$NON-NLS-1$ String code2 = writer.toString(); IFile n = importFile( "NamespaceReference.cpp", code2 ); //$NON-NLS-1$ - + ICElement[] list = new ICElement[1]; + list[0]=cproject.getCProject(); ICSearchPattern pattern = SearchEngine.createSearchPattern( "*", NAMESPACE, REFERENCES, true ); //$NON-NLS-1$ - Set matches = search( pattern ); + Set matches = search( pattern,list ); assertEquals( 8, matches.size() ); assertMatch( matches, n, code2.indexOf( "N1::N2::C2 *c" ) ); //$NON-NLS-1$ @@ -451,26 +459,28 @@ public class SearchRegressionTests extends BaseTestFramework implements ICSearch IFile gh = importFile( "MethodDeclaration.cpp", code ); //$NON-NLS-1$ //vp1 constructor, explicit cctor, destructor ICSearchPattern pattern=SearchEngine.createSearchPattern("*M", METHOD, DECLARATIONS, true); //$NON-NLS-1$ - Set matches = search(pattern); + ICElement[] list = new ICElement[1]; + list[0]=cproject.getCProject(); + Set matches = search(pattern,list); assertEquals( 3, matches.size()); assertMatch( matches, gh, code.indexOf( "M/*dec1*/" ) ); //$NON-NLS-1$ assertMatch( matches, gh, code.indexOf( "M/*dec2*/" ) ); //$NON-NLS-1$ assertMatch( matches, gh, code.indexOf( "~M/*dec3*/" ) ); //$NON-NLS-1$ //vp2 method, static, inline pattern=SearchEngine.createSearchPattern("m*", METHOD, DECLARATIONS, true); //$NON-NLS-1$ - matches = search(pattern); + matches = search(pattern,list); assertEquals( 3, matches.size()); assertMatch( matches, gh, code.indexOf( "m1/*dec4*/" ) ); //$NON-NLS-1$ assertMatch( matches, gh, code.indexOf( "m2/*dec5*/" ) ); //$NON-NLS-1$ assertMatch( matches, gh, code.indexOf( "m3/*dec6*/" ) ); //$NON-NLS-1$ //vp3 namespace scope, fully qualified search pattern=SearchEngine.createSearchPattern("N::C::m3", METHOD, DECLARATIONS, true); //$NON-NLS-1$ - matches = search(pattern); + matches = search(pattern,list); assertEquals( 1, matches.size()); assertMatch( matches, gh, code.indexOf( "m3/*dec6*/" ) ); //$NON-NLS-1$ //vp4 operator with and without space in name pattern=SearchEngine.createSearchPattern("operator ??", METHOD, DECLARATIONS, true); //$NON-NLS-1$ - matches = search(pattern); + matches = search(pattern,list); assertEquals( 2, matches.size()); assertMatch( matches, gh, code.indexOf( "operator <