From 10cb69009ab40075c45c17a99d6a89e11f77789c Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Wed, 18 Feb 2015 20:40:34 -0500 Subject: [PATCH] removed mandatory sleeps to speed-up tests Change-Id: Id55eb28cc5f98ccfaff9ab88eb6fff87352519d2 --- .../eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java | 2 +- .../ui/tests/text/selection/BaseSelectionTestsIndexer.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java index 85ac7c5a5fd..a21dbe66ed6 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java @@ -151,7 +151,7 @@ public class SemanticHighlightingTest extends TestCase { BaseTestCase.waitForIndexer(fCProject); fEditor= (CEditor) EditorTestHelper.openInEditor(ResourceTestHelper.findFile("/SHTest/" + sourceFileName), true); fSourceViewer= EditorTestHelper.getSourceViewer(fEditor); - assertTrue(EditorTestHelper.joinReconciler(fSourceViewer, 500, 10000, 100)); + assertTrue(EditorTestHelper.joinReconciler(fSourceViewer, 0, 10000, 100)); EditorTestHelper.joinBackgroundActivities(); fIndex = CCorePlugin.getIndexManager().getIndex(fCProject); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java index 75fc638be06..bc93622c0f9 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java @@ -205,7 +205,7 @@ public class BaseSelectionTestsIndexer extends BaseUITestCase { if (part instanceof CEditor) { CEditor editor= (CEditor) part; - EditorTestHelper.joinReconciler(EditorTestHelper.getSourceViewer(editor), 100, 5000, 10); + EditorTestHelper.joinReconciler(EditorTestHelper.getSourceViewer(editor), 0, 5000, 10); ((AbstractTextEditor)part).getSelectionProvider().setSelection(new TextSelection(offset,length)); final OpenDeclarationsAction action = (OpenDeclarationsAction) editor.getAction("OpenDeclarations"); //$NON-NLS-1$ @@ -215,7 +215,7 @@ public class BaseSelectionTestsIndexer extends BaseUITestCase { part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); assertTrue (part instanceof CEditor); editor= (CEditor) part; - EditorTestHelper.joinReconciler(EditorTestHelper.getSourceViewer(editor), 100, 5000, 10); + EditorTestHelper.joinReconciler(EditorTestHelper.getSourceViewer(editor), 0, 5000, 10); // the action above should highlight the declaration, so now retrieve it and use that selection to get the IASTName selected on the TU ISelection sel= editor.getSelectionProvider().getSelection();