diff options
2 files changed, 16 insertions, 3 deletions
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StringSubstitutionTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StringSubstitutionTests.java index 600aa7f68..22f361c6c 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StringSubstitutionTests.java +++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StringSubstitutionTests.java @@ -31,9 +31,11 @@ import org.eclipse.jdt.debug.tests.AbstractDebugTest; import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.jdt.launching.JavaLaunchDelegate; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.PartInitException; @@ -767,13 +769,18 @@ public class StringSubstitutionTests extends AbstractDebugTest implements IValue IViewPart part; try { part = page.showView("org.eclipse.ui.views.ResourceNavigator"); + assertNotNull("the part org.eclipse.ui.views.ResourceNavigator should not be null", part); ISelection selection = null; if (resource == null) { selection = new StructuredSelection(); } else { selection = new StructuredSelection(resource); } - part.getSite().getSelectionProvider().setSelection(selection); + IWorkbenchPartSite site = part.getSite(); + assertNotNull("The part site for org.eclipse.ui.views.ResourceNavigator should not be null ", site); + ISelectionProvider provider = site.getSelectionProvider(); + assertNotNull("the selection provider should not be null for org.eclipse.ui.views.ResourceNavigator", provider); + provider.setSelection(selection); } catch (PartInitException e) { assertNotNull("Failed to open navigator view", null); } diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/RefreshTabTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/RefreshTabTests.java index c7867fc6a..d433a180a 100755 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/RefreshTabTests.java +++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/launching/RefreshTabTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,9 +16,11 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.ui.RefreshTab; import org.eclipse.jdt.debug.tests.AbstractDebugTest; +import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.PartInitException; /** @@ -46,7 +48,11 @@ public class RefreshTabTests extends AbstractDebugTest { IViewPart part; try { part = page.showView("org.eclipse.ui.views.ResourceNavigator"); //$NON-NLS-1$ - part.getSite().getSelectionProvider().setSelection(new StructuredSelection(resource)); + IWorkbenchPartSite site = part.getSite(); + assertNotNull("The part site for org.eclipse.ui.views.ResourceNavigator should not be null ", site); + ISelectionProvider provider = site.getSelectionProvider(); + assertNotNull("the selection provider should not be null for org.eclipse.ui.views.ResourceNavigator", provider); + provider.setSelection(new StructuredSelection(resource)); } catch (PartInitException e) { assertNotNull("Failed to open navigator view", null); //$NON-NLS-1$ } |