From bb020742a9bf5d2224ab1be15af08f835d8e0dab Mon Sep 17 00:00:00 2001
From: Anton Leherbauer <anton.leherbauer@windriver.com>
Date: Tue, 4 Dec 2007 10:49:53 +0000
Subject: [PATCH] Fix editor tests depending on reconciler

---
 .../cdt/ui/tests/text/EditorTestHelper.java    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/EditorTestHelper.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/EditorTestHelper.java
index fbf8a24aa3e..f07ba3cc1f5 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/EditorTestHelper.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/EditorTestHelper.java
@@ -81,6 +81,7 @@ import org.eclipse.cdt.ui.PreferenceConstants;
 import org.eclipse.cdt.ui.testplugin.CTestPlugin;
 
 import org.eclipse.cdt.internal.ui.text.CReconcilingStrategy;
+import org.eclipse.cdt.internal.ui.text.CompositeReconcilingStrategy;
 
 
 /**
@@ -344,17 +345,22 @@ public class EditorTestHelper {
 		if (reconciler == null)
 			return true;
 		final Accessor backgroundThreadAccessor= getBackgroundThreadAccessor(reconciler);
-		final Accessor cReconcilerAccessor;
+		Accessor reconcilerAccessor= null;
 		if (reconciler instanceof MonoReconciler) {
 			IReconcilingStrategy strategy= reconciler.getReconcilingStrategy(IDocument.DEFAULT_CONTENT_TYPE);
 			if (strategy instanceof CReconcilingStrategy) {
-				cReconcilerAccessor= new Accessor(strategy, CReconcilingStrategy.class);
-			} else {
-				cReconcilerAccessor= null;
+				reconcilerAccessor= new Accessor(strategy, CReconcilingStrategy.class);
+			} else if (strategy instanceof CompositeReconcilingStrategy) {
+				IReconcilingStrategy[] strategies= ((CompositeReconcilingStrategy)strategy).getReconcilingStrategies();
+				for (int i = 0; i < strategies.length; i++) {
+					if (strategies[i] instanceof CReconcilingStrategy) {
+						reconcilerAccessor= new Accessor(strategies[i], CReconcilingStrategy.class);
+						break;
+					}
+				}
 			}
-		} else {
-			cReconcilerAccessor= null;
 		}
+		final Accessor cReconcilerAccessor= reconcilerAccessor;
 		DisplayHelper helper= new DisplayHelper() {
 			public boolean condition() {
 				return !isRunning(cReconcilerAccessor, backgroundThreadAccessor);