From ac235ca6b70cba42e353e5032ca045e810125603 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Tue, 18 Mar 2014 01:00:33 -0400 Subject: [PATCH] Use the default indexer timeout instead of hard-coded ones in some tests Signed-off-by: Marc-Andre Laperle --- .../eclipse/cdt/internal/index/tests/IndexIncludeTest.java | 4 ++-- .../eclipse/cdt/internal/index/tests/IndexLocationTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java index dee71a76225..5c1bbebfad7 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java @@ -122,7 +122,7 @@ public class IndexIncludeTest extends IndexTestBase { } }, npm()); assertTrue("Timestamp was not increased", file.getLocalTimeStamp() >= timestamp); - TestSourceReader.waitUntilFileIsIndexed(fIndex, file, 4000); + waitUntilFileIsIndexed(fIndex, file); fIndex.acquireReadLock(); try { IIndexFile ifile= getIndexFile(file); @@ -155,7 +155,7 @@ public class IndexIncludeTest extends IndexTestBase { TestSourceReader.createFile(fProject.getProject(), "user20061107.h", ""); TestSourceReader.createFile(fProject.getProject(), "system20061107.h", ""); IFile file= TestSourceReader.createFile(fProject.getProject(), "source20061107.cpp", content); - TestSourceReader.waitUntilFileIsIndexed(fIndex, file, 4000); + waitUntilFileIsIndexed(fIndex, file); fIndex.acquireReadLock(); try { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexLocationTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexLocationTest.java index ae1d7fbfe6c..68ea0902df5 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexLocationTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexLocationTest.java @@ -165,7 +165,7 @@ public class IndexLocationTest extends BaseTestCase { CCorePlugin.getIndexManager().reindex(cproject); IIndex index = CCorePlugin.getIndexManager().getIndex(cproject); - TestSourceReader.waitUntilFileIsIndexed(index, content.getFile("external2.h"), 4000); + waitUntilFileIsIndexed(index, content.getFile("external2.h")); index.acquireReadLock(); try { IBinding[] bs= index.findBindings("External".toCharArray(), IndexFilter.ALL, npm()); @@ -198,7 +198,7 @@ public class IndexLocationTest extends BaseTestCase { IIndex index = CCorePlugin.getIndexManager().getIndex(cproject); CCorePlugin.getIndexManager().reindex(cproject); - TestSourceReader.waitUntilFileIsIndexed(index, file, 10000); + waitUntilFileIsIndexed(index, file); waitForIndexer(cproject); index.acquireReadLock(); try {