From fb6c76a0629baf145a06b014530d3826a03fd5c1 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Mon, 16 May 2005 12:50:49 +0000
Subject: [PATCH] Temporary Fix for UI JUnits

---
 .../regression/ContentAssistRegressionTests.java | 16 ++++++++++++----
 .../CompletionProposalsBaseTest.java             |  5 +++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/regression/ContentAssistRegressionTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/regression/ContentAssistRegressionTests.java
index 60121df9dc0..a7c1ee4a571 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/regression/ContentAssistRegressionTests.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/regression/ContentAssistRegressionTests.java
@@ -16,12 +16,16 @@ package org.eclipse.cdt.ui.tests.regression;
 
 import java.io.StringWriter;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.core.model.IWorkingCopy;
 import org.eclipse.cdt.core.tests.BaseTestFramework;
 import org.eclipse.cdt.core.tests.FailingTest;
+import org.eclipse.cdt.internal.core.browser.cache.TypeCacheManager;
 import org.eclipse.cdt.internal.ui.CHelpProviderManager;
 import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor;
 import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProcessor;
@@ -32,9 +36,6 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * @author aniefer
  */
@@ -52,7 +53,14 @@ public class ContentAssistRegressionTests extends BaseTestFramework {
     {
         super(name);
     }
-       
+	
+	protected void setUp() throws Exception {
+		//TEMPORARY: Disable Type Cache
+        super.setUp();
+		TypeCacheManager typeCacheManager = TypeCacheManager.getInstance();
+		typeCacheManager.setProcessTypeCacheEvents(false);
+	}
+	
     private void disableContributions (){
         //disable the help books so we don't get proposals we weren't expecting
         final IProject proj = project;
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsBaseTest.java
index d2f570f0bf8..10ee892a592 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsBaseTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsBaseTest.java
@@ -30,6 +30,7 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode;
 import org.eclipse.cdt.core.parser.ast.IASTNode;
 import org.eclipse.cdt.core.parser.ast.IASTScope;
 import org.eclipse.cdt.core.testplugin.CProjectHelper;
+import org.eclipse.cdt.internal.core.browser.cache.TypeCacheManager;
 import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProcessor;
 import org.eclipse.cdt.ui.testplugin.CTestPlugin;
 import org.eclipse.core.resources.IFile;
@@ -97,6 +98,10 @@ public abstract class CompletionProposalsBaseTest  extends TestCase{
 			addNatureToProject(fCProject.getProject(), CCProjectNature.CC_NATURE_ID, null);
 		}
 
+		//TEMPORARY: Disable type cache
+		TypeCacheManager typeCacheManager = TypeCacheManager.getInstance();
+		typeCacheManager.setProcessTypeCacheEvents(false);
+		
 		// use the new indexer
 		//IndexManager indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
 	}