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

Fix semantic highlighting tests once more

Browse source
This commit is contained in:
Anton Leherbauer 2006-12-18 18:49:29 +00:00
parent 07bc92feec
commit 21dde9f148
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractSemanticHighlightingTest.java
View file

@ -53,11 +53,10 @@ public class AbstractSemanticHighlightingTest extends TestCase {
super.setUp(); super.setUp();
fCProject= EditorTestHelper.createCProject(PROJECT, LINKED_FOLDER); fCProject= EditorTestHelper.createCProject(PROJECT, LINKED_FOLDER);
disableAllSemanticHighlightings();
fEditor= (CEditor) EditorTestHelper.openInEditor(ResourceTestHelper.findFile(fTestFilename), true); fEditor= (CEditor) EditorTestHelper.openInEditor(ResourceTestHelper.findFile(fTestFilename), true);
fSourceViewer= EditorTestHelper.getSourceViewer(fEditor); fSourceViewer= EditorTestHelper.getSourceViewer(fEditor);
assertTrue(EditorTestHelper.joinReconciler(fSourceViewer, 500, 10000, 100)); assertTrue(EditorTestHelper.joinReconciler(fSourceViewer, 500, 10000, 100));
EditorTestHelper.joinBackgroundActivities();
} }
protected String getTestFilename() { protected String getTestFilename() {
@ -97,6 +96,7 @@ public class AbstractSemanticHighlightingTest extends TestCase {
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
disableAllSemanticHighlightings(); disableAllSemanticHighlightings();
EditorTestHelper.runEventQueue(1000);
} }
protected void assertEqualPositions(Position[] expected, Position[] actual) { protected void assertEqualPositions(Position[] expected, Position[] actual) {
@ -139,10 +139,10 @@ public class AbstractSemanticHighlightingTest extends TestCase {
protected void setUpSemanticHighlighting(String semanticHighlighting) { protected void setUpSemanticHighlighting(String semanticHighlighting) {
fCurrentHighlighting= semanticHighlighting; fCurrentHighlighting= semanticHighlighting;
enableSemanticHighlighting(semanticHighlighting); enableSemanticHighlighting(semanticHighlighting);
EditorTestHelper.forceReconcile(fSourceViewer); // EditorTestHelper.forceReconcile(fSourceViewer);
assertTrue(EditorTestHelper.joinReconciler(fSourceViewer, 500, 10000, 500)); // assertTrue(EditorTestHelper.joinReconciler(fSourceViewer, 500, 10000, 500));
// give enough time to finish updating the highlighting positions // give enough time to finish updating the highlighting positions
EditorTestHelper.runEventQueue(500); EditorTestHelper.runEventQueue(1000);
} }
private void enableSemanticHighlighting(String preferenceKey) { private void enableSemanticHighlighting(String preferenceKey) {