[499865] A warning or confirmation dialog should appear when modules are removed from a server
diff --git a/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF index f313288..74c69a0 100644 --- a/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.wst.server.ui.tests Bundle-SymbolicName: org.eclipse.wst.server.ui.tests;singleton:=true -Bundle-Version: 1.1.401.qualifier +Bundle-Version: 1.1.402.qualifier Bundle-ClassPath: tests.jar Bundle-Activator: org.eclipse.wst.server.ui.tests.TestsPlugin Bundle-Vendor: Eclipse.org
diff --git a/tests/org.eclipse.wst.server.ui.tests/plugin.xml b/tests/org.eclipse.wst.server.ui.tests/plugin.xml index cb2bd4f..ca2822a 100644 --- a/tests/org.eclipse.wst.server.ui.tests/plugin.xml +++ b/tests/org.eclipse.wst.server.ui.tests/plugin.xml
@@ -8,4 +8,31 @@ id="org.eclipse.wst.server.ui.tests.dialog.deleteServerDialogTestExtension"> </deleteServerDialogExtension> </extension> + + <extension + point="org.eclipse.wst.server.ui.removeModuleMessageExtension"> + <removeModuleMessageExtension + id="org.eclipse.wst.server.ui.tests.removeModuleMessageExtensionTestA" + serverTypeId="org.eclipse.wst.server.testA*" + class="org.eclipse.wst.server.ui.tests.RemoveModuleMessageTestExtension"> + </removeModuleMessageExtension> + </extension> + + <extension + point="org.eclipse.wst.server.ui.removeModuleMessageExtension"> + <removeModuleMessageExtension + id="org.eclipse.wst.server.ui.tests.removeModuleMessageExtensionTestB" + serverTypeId="org.eclipse.wst.server.testB.*" + class="org.eclipse.wst.server.ui.tests.RemoveModuleMessageTestExtension"> + </removeModuleMessageExtension> + </extension> + + <extension + point="org.eclipse.wst.server.ui.removeModuleMessageExtension"> + <removeModuleMessageExtension + id="org.eclipse.wst.server.ui.tests.removeModuleMessageExtensionTestB" + serverTypeId="org.eclipse.wst.server.testC" + class="org.eclipse.wst.server.ui.tests.RemoveModuleMessageTestExtension"> + </removeModuleMessageExtension> + </extension> </plugin>
diff --git a/tests/org.eclipse.wst.server.ui.tests/pom.xml b/tests/org.eclipse.wst.server.ui.tests/pom.xml index 1dd0b44..ffa7acb 100644 --- a/tests/org.eclipse.wst.server.ui.tests/pom.xml +++ b/tests/org.eclipse.wst.server.ui.tests/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.wst.server.ui.tests</artifactId> - <version>1.1.401-SNAPSHOT</version> + <version>1.1.402-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties>
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AllTests.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AllTests.java index 8783d63..3cf4d5c 100644 --- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AllTests.java +++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AllTests.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2015 IBM Corporation and others. + * Copyright (c) 2004, 2016 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 @@ -56,6 +56,8 @@ suite.addTestSuite(AbstractServerLabelProviderTestCase.class); suite.addTestSuite(ServerDiscoveryTestCase.class); + + suite.addTestSuite(RemoveModuleMessageExtensionTestCase.class); //$JUnit-END$ return suite; }
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/UITestHelper.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/UITestHelper.java index ce0ef62..3a2da86 100644 --- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/UITestHelper.java +++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/UITestHelper.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2011 IBM Corporation and others. + * Copyright (c) 2004, 2016 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 @@ -92,7 +92,7 @@ // fill the manager with contributions from the matching contributors PropertyPageContributorManager.getManager().contribute(manager, element); - IWorkbenchAdapter adapter = (IWorkbenchAdapter)element.getAdapter(IWorkbenchAdapter.class); + IWorkbenchAdapter adapter = element.getAdapter(IWorkbenchAdapter.class); if (adapter != null) { name = adapter.getLabel(element); }