From e37ca5ef2659ec700a1ecda5bd58b81a8b7ff23a Mon Sep 17 00:00:00 2001 From: Andrew Niefer Date: Fri, 10 Sep 2004 19:57:20 +0000 Subject: [PATCH] avoid NPE which prevents parser test suite from being run as not a plugin test. --- .../parser/tests/CompleteParsePluginTest.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParsePluginTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParsePluginTest.java index 1fbc1b4fe87..624d60ae559 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParsePluginTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParsePluginTest.java @@ -93,25 +93,27 @@ public class CompleteParsePluginTest extends TestCase { static FileManager fileManager; { - (CCorePlugin.getDefault().getCoreModel().getIndexManager()).reset(); - monitor = new NullProgressMonitor(); - - workspace = ResourcesPlugin.getWorkspace(); - - ICProject cPrj; - try { - cPrj = CProjectHelper.createCCProject("ParserTestProject", "bin"); //$NON-NLS-1$ //$NON-NLS-2$ - - project = cPrj.getProject(); - project.setSessionProperty(IndexManager.activationKey,new Boolean(false)); - } catch ( CoreException e ) { - /*boo*/ + if( CCorePlugin.getDefault() != null && CCorePlugin.getDefault().getCoreModel() != null){ + (CCorePlugin.getDefault().getCoreModel().getIndexManager()).reset(); + monitor = new NullProgressMonitor(); + + workspace = ResourcesPlugin.getWorkspace(); + + ICProject cPrj; + try { + cPrj = CProjectHelper.createCCProject("ParserTestProject", "bin"); //$NON-NLS-1$ //$NON-NLS-2$ + + project = cPrj.getProject(); + project.setSessionProperty(IndexManager.activationKey,new Boolean(false)); + } catch ( CoreException e ) { + /*boo*/ + } + if (project == null) + fail("Unable to create project"); //$NON-NLS-1$ + + //Create file manager + fileManager = new FileManager(); } - if (project == null) - fail("Unable to create project"); //$NON-NLS-1$ - - //Create file manager - fileManager = new FileManager(); } public CompleteParsePluginTest()