From bb46ce4f7f075010152434a4a055864b5bd10ae5 Mon Sep 17 00:00:00 2001 From: Andrew Niefer Date: Tue, 16 Nov 2004 15:58:00 +0000 Subject: [PATCH] fix failures in content assist tests --- .../cdt/core/tests/BaseTestFramework.java | 16 ++++++++++++++++ .../regression/ContentAssistRegressionTests.java | 2 +- .../text/contentassist/ContentAssistTests.java | 15 +++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java index bac330864ca..7d3478191c5 100644 --- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java +++ b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java @@ -21,9 +21,13 @@ import junit.framework.TestCase; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.internal.core.search.indexing.IndexManager; +import org.eclipse.cdt.internal.ui.CHelpProviderManager; +import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; import org.eclipse.cdt.testplugin.CProjectHelper; import org.eclipse.cdt.testplugin.FileManager; +import org.eclipse.cdt.ui.text.ICHelpInvocationContext; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -54,6 +58,18 @@ abstract public class BaseTestFramework extends TestCase { project = cproject.getProject(); project.setSessionProperty(IndexManager.activationKey, Boolean.FALSE ); + + //disable the help books so we don't get proposals we weren't expecting + CHelpBookDescriptor helpBooks[]; + helpBooks = CHelpProviderManager.getDefault().getCHelpBookDescriptors(new ICHelpInvocationContext(){ + public IProject getProject(){return project;} + public ITranslationUnit getTranslationUnit(){return null;} + } + ); + for( int i = 0; i < helpBooks.length; i++ ){ + if( helpBooks[i] != null ) + helpBooks[i].enable( false ); + } } catch ( CoreException e ) { /*boo*/ } 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 4bb64db0b2c..310107632d4 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 @@ -61,7 +61,7 @@ public class ContentAssistRegressionTests extends BaseTestFramework { // call the CompletionProcessor CCompletionProcessor completionProcessor = new CCompletionProcessor(null); ICompletionProposal[] results = completionProcessor.evalProposals( new Document(buffer), offset, wc, null); - return results; + return ( results != null ? results : new ICompletionProposal [0] ); } public static Test suite(){ diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java index 292a27ca5d0..0af6158ede3 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java @@ -29,9 +29,12 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; import org.eclipse.cdt.internal.core.search.indexing.IndexManager; +import org.eclipse.cdt.internal.ui.CHelpProviderManager; +import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProcessor; import org.eclipse.cdt.testplugin.CProjectHelper; import org.eclipse.cdt.testplugin.FileManager; +import org.eclipse.cdt.ui.text.ICHelpInvocationContext; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -63,6 +66,18 @@ public class ContentAssistTests extends TestCase { project = cPrj.getProject(); project.setSessionProperty(IndexManager.activationKey,new Boolean(false)); + + //disable the help books so we don't get proposals we weren't expecting + CHelpBookDescriptor helpBooks[]; + helpBooks = CHelpProviderManager.getDefault().getCHelpBookDescriptors(new ICHelpInvocationContext(){ + public IProject getProject(){return project;} + public ITranslationUnit getTranslationUnit(){return null;} + } + ); + for( int i = 0; i < helpBooks.length; i++ ){ + if( helpBooks[i] != null ) + helpBooks[i].enable( false ); + } } catch ( CoreException e ) { /*boo*/ }