From 21dde9f1480bcc40cdd331bb3b8c669fdb49cd11 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Mon, 18 Dec 2006 18:49:29 +0000 Subject: [PATCH] Fix semantic highlighting tests once more --- .../tests/text/AbstractSemanticHighlightingTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractSemanticHighlightingTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractSemanticHighlightingTest.java index c9003210b5f..65168c8f04b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractSemanticHighlightingTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractSemanticHighlightingTest.java @@ -52,12 +52,11 @@ public class AbstractSemanticHighlightingTest extends TestCase { protected void setUp() throws Exception { super.setUp(); fCProject= EditorTestHelper.createCProject(PROJECT, LINKED_FOLDER); - - disableAllSemanticHighlightings(); - + fEditor= (CEditor) EditorTestHelper.openInEditor(ResourceTestHelper.findFile(fTestFilename), true); fSourceViewer= EditorTestHelper.getSourceViewer(fEditor); assertTrue(EditorTestHelper.joinReconciler(fSourceViewer, 500, 10000, 100)); + EditorTestHelper.joinBackgroundActivities(); } protected String getTestFilename() { @@ -97,6 +96,7 @@ public class AbstractSemanticHighlightingTest extends TestCase { protected void setUp() throws Exception { super.setUp(); disableAllSemanticHighlightings(); + EditorTestHelper.runEventQueue(1000); } protected void assertEqualPositions(Position[] expected, Position[] actual) { @@ -139,10 +139,10 @@ public class AbstractSemanticHighlightingTest extends TestCase { protected void setUpSemanticHighlighting(String semanticHighlighting) { fCurrentHighlighting= semanticHighlighting; enableSemanticHighlighting(semanticHighlighting); - EditorTestHelper.forceReconcile(fSourceViewer); - assertTrue(EditorTestHelper.joinReconciler(fSourceViewer, 500, 10000, 500)); +// EditorTestHelper.forceReconcile(fSourceViewer); +// assertTrue(EditorTestHelper.joinReconciler(fSourceViewer, 500, 10000, 500)); // give enough time to finish updating the highlighting positions - EditorTestHelper.runEventQueue(500); + EditorTestHelper.runEventQueue(1000); } private void enableSemanticHighlighting(String preferenceKey) {