456940 Work around NPE in getActiveWorkbenchWindow in tests on Hudson

- Remove unused parameter in ElementUtils, which would require calling
  the problematic getActiveWorkbenchWindow in the test.
- Do an extra call to getActiveWorkbenchWindow() and ignore potential
  exceptions before the first time the method is needed in the
  IUPropertyPagesTest.

Bug: 456940
Change-Id: Ie3a38c2576ebc96e831ff2eb685a8c595c3ae5ff

2 files changed, 20 insertions, 5 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/ElementUtilsTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/ElementUtilsTest.java
index 258c1f5f4..c597e9e0b 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/ElementUtilsTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/actions/ElementUtilsTest.java
@@ -20,7 +20,6 @@ import org.eclipse.equinox.internal.p2.ui.model.MetadataRepositoryElement;
 import org.eclipse.equinox.p2.repository.IRepository;
 import org.eclipse.equinox.p2.repository.IRepositoryManager;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
-import org.eclipse.ui.PlatformUI;
 
 /**
  * @since 3.5
@@ -86,7 +85,7 @@ public class ElementUtilsTest extends ProfileModificationActionTest {
 		// We expect uri3 to get removed (as if it had been removed from a pref page)
 		// System repos shouldn't be touched
 
-		ElementUtils.updateRepositoryUsingElements(getProvisioningUI(), elements, PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
+		ElementUtils.updateRepositoryUsingElements(getProvisioningUI(), elements);
 
 		URI[] enabled = getMetadataRepositoryManager().getKnownRepositories(IRepositoryManager.REPOSITORIES_ALL);
 		URI[] disabled = getMetadataRepositoryManager().getKnownRepositories(IRepositoryManager.REPOSITORIES_DISABLED);
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/IUPropertyPagesTest.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/IUPropertyPagesTest.java
index d076d3cd1..b4a0b779b 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/IUPropertyPagesTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/dialogs/IUPropertyPagesTest.java
@@ -10,12 +10,10 @@
  *******************************************************************************/
 package org.eclipse.equinox.p2.tests.ui.dialogs;
 
-import org.eclipse.equinox.p2.metadata.MetadataFactory;
-import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;
 import org.eclipse.equinox.p2.tests.ui.AbstractProvisioningUITest;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.dialogs.PropertyDialog;
@@ -29,7 +27,23 @@ public class IUPropertyPagesTest extends AbstractProvisioningUITest {
 	private static final String COPYRIGHT = "org.eclipse.equinox.p2.ui.sdk.IUCopyrightPropertyPage";
 	private static final String LICENSE = "org.eclipse.equinox.p2.ui.sdk.IULicensePropertyPage";
 
+	private static boolean initialized;
+
+	public static void init() {
+		if (!initialized) {
+			// workaround for bug 456940
+			try {
+				PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+			} catch (Exception e) {
+				System.err.println("Bug 456940: First invocation of getActiveWorkbenchWindow() threw an Exception:");
+				e.printStackTrace();
+			}
+			initialized = true;
+		}
+	}
+
 	public void testGeneralPage() throws URISyntaxException {
+		init();
 		PropertyDialog dialog = PropertyDialog.createDialogOn(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), GENERAL, getIU());
 		dialog.setBlockOnOpen(false);
 		dialog.open();
@@ -41,6 +55,7 @@ public class IUPropertyPagesTest extends AbstractProvisioningUITest {
 	}
 
 	public void testCopyrightPage() throws URISyntaxException {
+		init();
 		PropertyDialog dialog = PropertyDialog.createDialogOn(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), COPYRIGHT, getIU());
 		dialog.setBlockOnOpen(false);
 		dialog.open();
@@ -52,6 +67,7 @@ public class IUPropertyPagesTest extends AbstractProvisioningUITest {
 	}
 
 	public void testLicensePage() throws URISyntaxException {
+		init();
 		PropertyDialog dialog = PropertyDialog.createDialogOn(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), LICENSE, getIU());
 		dialog.setBlockOnOpen(false);
 		dialog.open();