Attachment 229859 Details for Bug 371510 – The fix proposal for the NPE in the TabStateHandlerTest run in the headless mode

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

The fix proposal for the NPE in the TabStateHandlerTest run in the headless mode

fix_for_NPE_in_testsuit.patch (text/plain), 3.47 KB, created by Daniel Rolka

on 2013-04-18 09:26:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Rolka

Created: 2013-04-18 09:26:39 EDT

Size: 3.47 KB

patch

obsolete

>diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/TabStateHandlerTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/TabStateHandlerTest.java
>index ef82c98..c008c32 100644
>--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/TabStateHandlerTest.java
>+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/TabStateHandlerTest.java
>@@ -27,18 +27,25 @@
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.custom.CTabFolder;
> import org.eclipse.swt.custom.CTabItem;
>-import org.eclipse.swt.widgets.Display;
>+import org.eclipse.swt.widgets.Shell;
> import org.eclipse.swt.widgets.Widget;
> import org.osgi.service.event.Event;
> 
> public class TabStateHandlerTest extends TestCase {
> 	private StackRendererTestable renderer;
> 	private TabStateHandler handler;
>+	private Shell shell;
> 
> 	@Override
> 	public void setUp() throws Exception {
>+		shell = new Shell();
> 		renderer = new StackRendererTestable();
> 		handler = renderer.new TabStateHandler();
>+	}
>+
>+	@Override
>+	public void tearDown() throws Exception {
>+		shell.dispose();
> 	}
> 
> 	public void testValidateElement() throws Exception {
>@@ -71,8 +78,7 @@
> 	public void testHandleEventWhenTabBusyEvent() throws Exception {
> 		// given
> 		MPart part = MBasicFactory.INSTANCE.createPart();
>-		CTabFolder tabFolder = new CTabFolder(Display.getCurrent()
>-				.getActiveShell(), SWT.NONE);
>+		CTabFolder tabFolder = new CTabFolder(shell, SWT.NONE);
> 		CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
> 
> 		renderer.tabItemForPart = tabItem;
>@@ -95,8 +101,7 @@
> 	public void testHandleEventWhenTabIdleEvent() throws Exception {
> 		// given
> 		MPart part = MBasicFactory.INSTANCE.createPart();
>-		CTabFolder tabFolder = new CTabFolder(Display.getCurrent()
>-				.getActiveShell(), SWT.NONE);
>+		CTabFolder tabFolder = new CTabFolder(shell, SWT.NONE);
> 		CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
> 
> 		renderer.tabItemForPart = tabItem;
>@@ -120,8 +125,7 @@
> 			throws Exception {
> 		// given
> 		MPart part = MBasicFactory.INSTANCE.createPart();
>-		CTabFolder tabFolder = new CTabFolder(Display.getCurrent()
>-				.getActiveShell(), SWT.NONE);
>+		CTabFolder tabFolder = new CTabFolder(shell, SWT.NONE);
> 		CTabItem tabItem1 = new CTabItem(tabFolder, SWT.NONE);
> 		CTabItem tabItem2 = new CTabItem(tabFolder, SWT.NONE);
> 
>@@ -151,8 +155,7 @@
> 			throws Exception {
> 		// given
> 		MPart part = MBasicFactory.INSTANCE.createPart();
>-		CTabFolder tabFolder = new CTabFolder(Display.getCurrent()
>-				.getActiveShell(), SWT.NONE);
>+		CTabFolder tabFolder = new CTabFolder(shell, SWT.NONE);
> 		CTabItem tabItem1 = new CTabItem(tabFolder, SWT.NONE);
> 		CTabItem tabItem2 = new CTabItem(tabFolder, SWT.NONE);
> 
>@@ -182,8 +185,7 @@
> 			throws Exception {
> 		// given
> 		MPart part = MBasicFactory.INSTANCE.createPart();
>-		CTabFolder tabFolder = new CTabFolder(Display.getCurrent()
>-				.getActiveShell(), SWT.NONE);
>+		CTabFolder tabFolder = new CTabFolder(shell, SWT.NONE);
> 		CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
> 
> 		part.getTags().add(CSSConstants.CSS_HIGHLIGHTED_CLASS);
>@@ -208,8 +210,7 @@
> 			throws Exception {
> 		// given
> 		MPart part = MBasicFactory.INSTANCE.createPart();
>-		CTabFolder tabFolder = new CTabFolder(Display.getCurrent()
>-				.getActiveShell(), SWT.NONE);
>+		CTabFolder tabFolder = new CTabFolder(shell, SWT.NONE);
> 		CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
> 
> 		part.getTags().add(CSSConstants.CSS_HIGHLIGHTED_CLASS);

Actions: View

Attachments on bug 371510: 229739 | 229755 | 229859