mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Temporary Fix for UI JUnits
This commit is contained in:
parent
5fb6783a6f
commit
fb6c76a062
2 changed files with 17 additions and 4 deletions
|
@ -16,12 +16,16 @@ package org.eclipse.cdt.ui.tests.regression;
|
||||||
|
|
||||||
import java.io.StringWriter;
|
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.CModelException;
|
||||||
import org.eclipse.cdt.core.model.CoreModel;
|
import org.eclipse.cdt.core.model.CoreModel;
|
||||||
import org.eclipse.cdt.core.model.ITranslationUnit;
|
import org.eclipse.cdt.core.model.ITranslationUnit;
|
||||||
import org.eclipse.cdt.core.model.IWorkingCopy;
|
import org.eclipse.cdt.core.model.IWorkingCopy;
|
||||||
import org.eclipse.cdt.core.tests.BaseTestFramework;
|
import org.eclipse.cdt.core.tests.BaseTestFramework;
|
||||||
import org.eclipse.cdt.core.tests.FailingTest;
|
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.CHelpProviderManager;
|
||||||
import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor;
|
import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor;
|
||||||
import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProcessor;
|
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.Document;
|
||||||
import org.eclipse.jface.text.contentassist.ICompletionProposal;
|
import org.eclipse.jface.text.contentassist.ICompletionProposal;
|
||||||
|
|
||||||
import junit.framework.Test;
|
|
||||||
import junit.framework.TestSuite;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author aniefer
|
* @author aniefer
|
||||||
*/
|
*/
|
||||||
|
@ -52,7 +53,14 @@ public class ContentAssistRegressionTests extends BaseTestFramework {
|
||||||
{
|
{
|
||||||
super(name);
|
super(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void setUp() throws Exception {
|
||||||
|
//TEMPORARY: Disable Type Cache
|
||||||
|
super.setUp();
|
||||||
|
TypeCacheManager typeCacheManager = TypeCacheManager.getInstance();
|
||||||
|
typeCacheManager.setProcessTypeCacheEvents(false);
|
||||||
|
}
|
||||||
|
|
||||||
private void disableContributions (){
|
private void disableContributions (){
|
||||||
//disable the help books so we don't get proposals we weren't expecting
|
//disable the help books so we don't get proposals we weren't expecting
|
||||||
final IProject proj = project;
|
final IProject proj = project;
|
||||||
|
|
|
@ -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.IASTNode;
|
||||||
import org.eclipse.cdt.core.parser.ast.IASTScope;
|
import org.eclipse.cdt.core.parser.ast.IASTScope;
|
||||||
import org.eclipse.cdt.core.testplugin.CProjectHelper;
|
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.internal.ui.text.contentassist.CCompletionProcessor;
|
||||||
import org.eclipse.cdt.ui.testplugin.CTestPlugin;
|
import org.eclipse.cdt.ui.testplugin.CTestPlugin;
|
||||||
import org.eclipse.core.resources.IFile;
|
import org.eclipse.core.resources.IFile;
|
||||||
|
@ -97,6 +98,10 @@ public abstract class CompletionProposalsBaseTest extends TestCase{
|
||||||
addNatureToProject(fCProject.getProject(), CCProjectNature.CC_NATURE_ID, null);
|
addNatureToProject(fCProject.getProject(), CCProjectNature.CC_NATURE_ID, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//TEMPORARY: Disable type cache
|
||||||
|
TypeCacheManager typeCacheManager = TypeCacheManager.getInstance();
|
||||||
|
typeCacheManager.setProcessTypeCacheEvents(false);
|
||||||
|
|
||||||
// use the new indexer
|
// use the new indexer
|
||||||
//IndexManager indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
|
//IndexManager indexManager = CCorePlugin.getDefault().getCoreModel().getIndexManager();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue