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

Pushed INDEXER_TIMEOUT_SEC constant up the test class hierarchy.

Browse source
This commit is contained in:
Sergey Prigogin 2012-08-22 15:04:44 -07:00
parent 82a89c35ed
commit 4f739bda84
8 changed files with 26 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java
View file

@ -108,7 +108,6 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.Job;
public class IndexBugsTests extends BaseTestCase { public class IndexBugsTests extends BaseTestCase {
private static final int INDEXER_TIMEOUT_SEC = 20;
private ICProject fCProject; private ICProject fCProject;
protected IIndex fIndex; protected IIndex fIndex;

2
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCompositeTests.java
View file

@ -468,7 +468,7 @@ public class IndexCompositeTests extends BaseTestCase {
* Convenience class for setting up projects. * Convenience class for setting up projects.
*/ */
class ProjectBuilder { class ProjectBuilder {
private static final int INDEXER_TIMEOUT_SEC = 5; private static final int INDEXER_TIMEOUT_SEC = 10;
private final String name; private final String name;
private final boolean cpp; private final boolean cpp;
private List dependencies = new ArrayList(); private List dependencies = new ArrayList();

23
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java
View file

@ -57,7 +57,7 @@ public class PDOMProviderTests extends PDOMTestBase {
{ {
ICProject cproject= CProjectHelper.createCCProject("foo"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); ICProject cproject= CProjectHelper.createCCProject("foo"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n"); TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n");
CCorePlugin.getIndexManager().joinIndexer(3000, npm()); CCorePlugin.getIndexManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm());
IIndex index= CCorePlugin.getIndexManager().getIndex(cproject, A_FRAGMENT_OPTIONS); IIndex index= CCorePlugin.getIndexManager().getIndex(cproject, A_FRAGMENT_OPTIONS);
index.acquireReadLock(); index.acquireReadLock();
@ -78,7 +78,7 @@ public class PDOMProviderTests extends PDOMTestBase {
final URI baseURI= new File("c:/ExternalSDK/").toURI(); final URI baseURI= new File("c:/ExternalSDK/").toURI();
final ICProject cproject2= CProjectHelper.createCCProject("bar"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); final ICProject cproject2= CProjectHelper.createCCProject("bar"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n"); TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n");
CCorePlugin.getIndexManager().joinIndexer(3000, npm()); CCorePlugin.getIndexManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm());
IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager(); IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager();
ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge( ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge(
@ -129,7 +129,7 @@ public class PDOMProviderTests extends PDOMTestBase {
{ {
ICProject cproject= CProjectHelper.createCCProject("foo"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); ICProject cproject= CProjectHelper.createCCProject("foo"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n"); TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n");
CCorePlugin.getIndexManager().joinIndexer(3000, npm()); CCorePlugin.getIndexManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm());
IIndex index= CCorePlugin.getIndexManager().getIndex(cproject, A_FRAGMENT_OPTIONS); IIndex index= CCorePlugin.getIndexManager().getIndex(cproject, A_FRAGMENT_OPTIONS);
index.acquireReadLock(); index.acquireReadLock();
@ -149,12 +149,12 @@ public class PDOMProviderTests extends PDOMTestBase {
final ICProject cproject3= CProjectHelper.createCCProject("bar"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); final ICProject cproject3= CProjectHelper.createCCProject("bar"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject3.getProject(), new Path("/source.cpp"), "namespace Y { class A {}; }\n\n"); TestSourceReader.createFile(cproject3.getProject(), new Path("/source.cpp"), "namespace Y { class A {}; }\n\n");
CCorePlugin.getIndexManager().joinIndexer(3000, npm()); CCorePlugin.getIndexManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm());
final URI baseURI= new File("c:/ExternalSDK/").toURI(); final URI baseURI= new File("c:/ExternalSDK/").toURI();
final ICProject cproject2= CProjectHelper.createCCProject("baz"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); final ICProject cproject2= CProjectHelper.createCCProject("baz"+System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n"); TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n");
CCorePlugin.getIndexManager().joinIndexer(3000, npm()); CCorePlugin.getIndexManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm());
IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager(); IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager();
ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge( ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge(
@ -241,21 +241,18 @@ public class PDOMProviderTests extends PDOMTestBase {
} }
} }
/* public void testVersionMismatchOfExternalPDOM_178998() throws Exception {
* see bugzilla 178998
*/
public void testVersionMismatchOfExternalPDOM() throws Exception {
final File tempPDOM= File.createTempFile("foo", "bar"); final File tempPDOM= File.createTempFile("foo", "bar");
{ {
ICProject cproject= CProjectHelper.createCCProject("foo" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); ICProject cproject= CProjectHelper.createCCProject("foo" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n"); TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n");
CCorePlugin.getIndexManager().joinIndexer(3000, npm()); CCorePlugin.getIndexManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm());
ResourceContainerRelativeLocationConverter cvr= new ResourceContainerRelativeLocationConverter(cproject.getProject()); ResourceContainerRelativeLocationConverter cvr= new ResourceContainerRelativeLocationConverter(cproject.getProject());
CCoreInternals.getPDOMManager().exportProjectPDOM(cproject, tempPDOM, cvr); CCoreInternals.getPDOMManager().exportProjectPDOM(cproject, tempPDOM, cvr);
CProjectHelper.delete(cproject); CProjectHelper.delete(cproject);
// mimic a pdom with superceded version // Mimic a PDOM with superseded version.
WritablePDOM wpdom= new WritablePDOM(tempPDOM, cvr, LanguageManager.getInstance().getPDOMLinkageFactoryMappings()); WritablePDOM wpdom= new WritablePDOM(tempPDOM, cvr, LanguageManager.getInstance().getPDOMLinkageFactoryMappings());
wpdom.acquireWriteLock(); wpdom.acquireWriteLock();
try { try {
@ -269,7 +266,7 @@ public class PDOMProviderTests extends PDOMTestBase {
final URI baseURI= new File("c:/ExternalSDK/").toURI(); final URI baseURI= new File("c:/ExternalSDK/").toURI();
final ICProject cproject2= CProjectHelper.createCCProject("baz" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER); final ICProject cproject2= CProjectHelper.createCCProject("baz" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n"); TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n");
CCorePlugin.getIndexManager().joinIndexer(3000, npm()); CCorePlugin.getIndexManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm());
IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager(); IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager();
ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge( ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge(
@ -302,7 +299,7 @@ public class PDOMProviderTests extends PDOMTestBase {
setExpectedNumberOfLoggedNonOKStatusObjects(1); // (this applies to the entire test duration) setExpectedNumberOfLoggedNonOKStatusObjects(1); // (this applies to the entire test duration)
for (int i= 0; i < 3; i++) { for (int i= 0; i < 3; i++) {
// try several times in order to test the status is logged only once // Try several times in order to test the status is logged only once.
ICProjectDescription pd= CCorePlugin.getDefault().getProjectDescription(cproject2.getProject(), false); ICProjectDescription pd= CCorePlugin.getDefault().getProjectDescription(cproject2.getProject(), false);
assertEquals(0, ipm.getProvidedIndexFragments(pd.getActiveConfiguration(), -1).length); assertEquals(0, ipm.getProvidedIndexFragments(pd.getActiveConfiguration(), -1).length);
} }

2
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestBase.java
View file

@ -57,7 +57,7 @@ import org.eclipse.ui.wizards.datatransfer.ImportOperation;
public class PDOMTestBase extends BaseTestCase { public class PDOMTestBase extends BaseTestCase {
protected static final IProgressMonitor PROGRESS = new NullProgressMonitor(); protected static final IProgressMonitor PROGRESS = new NullProgressMonitor();
static IPath rootPath = new Path("resources/pdomtests"); static IPath rootPath = new Path("resources/pdomtests");
private String projectName= null; private String projectName;
protected ICProject createProject(String folderName) throws CoreException { protected ICProject createProject(String folderName) throws CoreException {
return createProject(folderName, false); return createProject(folderName, false);

5
core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/BaseTestCase.java
View file

@ -45,6 +45,7 @@ import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
public class BaseTestCase extends TestCase { public class BaseTestCase extends TestCase {
protected static final int INDEXER_TIMEOUT_SEC = 10;
private boolean fExpectFailure; private boolean fExpectFailure;
private int fBugNumber; private int fBugNumber;
private int fExpectedLoggedNonOK; private int fExpectedLoggedNonOK;
@ -290,12 +291,12 @@ public class BaseTestCase extends TestCase {
public static void waitForIndexer(ICProject project) throws InterruptedException { public static void waitForIndexer(ICProject project) throws InterruptedException {
final PDOMManager indexManager = CCoreInternals.getPDOMManager(); final PDOMManager indexManager = CCoreInternals.getPDOMManager();
assertTrue(indexManager.joinIndexer(10000, npm())); assertTrue(indexManager.joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm()));
long waitms= 1; long waitms= 1;
while (waitms < 2000 && !indexManager.isProjectRegistered(project)) { while (waitms < 2000 && !indexManager.isProjectRegistered(project)) {
Thread.sleep(waitms); Thread.sleep(waitms);
waitms *= 2; waitms *= 2;
} }
assertTrue(indexManager.joinIndexer(10000, npm())); assertTrue(indexManager.joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm()));
} }
} }

1
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringTestBase.java
View file

@ -56,7 +56,6 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext;
* Common base for refactoring tests. * Common base for refactoring tests.
*/ */
public abstract class RefactoringTestBase extends BaseTestCase { public abstract class RefactoringTestBase extends BaseTestCase {
private static final int INDEXER_TIMEOUT_SEC = 300;
protected static final NullProgressMonitor NULL_PROGRESS_MONITOR = new NullProgressMonitor(); protected static final NullProgressMonitor NULL_PROGRESS_MONITOR = new NullProgressMonitor();
/** Allows empty files to be created during test setup. */ /** Allows empty files to be created during test setup. */

1
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java
View file

@ -70,7 +70,6 @@ import org.eclipse.cdt.internal.ui.search.actions.OpenDeclarationsAction;
* @author dsteffle * @author dsteffle
*/ */
public class BaseSelectionTestsIndexer extends BaseUITestCase { public class BaseSelectionTestsIndexer extends BaseUITestCase {
protected static final int INDEXER_TIMEOUT_SEC = 20;
protected ICProject fCProject; protected ICProject fCProject;
static FileManager fileManager = new FileManager(); static FileManager fileManager = new FileManager();
IProgressMonitor monitor = new NullProgressMonitor(); IProgressMonitor monitor = new NullProgressMonitor();

1
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsAnyIndexer.java
View file

@ -151,7 +151,6 @@ public abstract class CSelectionTestsAnyIndexer extends BaseSelectionTestsIndexe
assertEquals(8, ((ASTNode) def).getLength()); assertEquals(8, ((ASTNode) def).getLength());
} }
// // the header // // the header
// extern int a; // declares // extern int a; // declares
// extern const int c = 1; // defines // extern const int c = 1; // defines