[404587] Server tools JUnits are not independent, which cause JUnits to
fail
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 662f842..1f995a8 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
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.300.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/src/org/eclipse/wst/server/ui/tests/ServerUIPreferencesTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerUIPreferencesTestCase.java
index 82f2caf..36578e3 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerUIPreferencesTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerUIPreferencesTestCase.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2013 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
@@ -18,80 +18,50 @@
public class ServerUIPreferencesTestCase extends TestCase {
protected static ServerUIPreferences prefs;
- public void test00GetProperties() throws Exception {
+ public void testAll() throws Exception {
prefs = ServerUIPlugin.getPreferences();
- }
- public void test02GetPref() throws Exception {
prefs.getSaveEditors();
- }
- public void test05SetPref() throws Exception {
prefs.setSaveEditors(ServerUIPreferences.SAVE_EDITORS_ALWAYS);
assertEquals(prefs.getSaveEditors(), ServerUIPreferences.SAVE_EDITORS_ALWAYS);
- }
- public void test06SetPref() throws Exception {
prefs.setSaveEditors(ServerUIPreferences.SAVE_EDITORS_NEVER);
assertEquals(prefs.getSaveEditors(), ServerUIPreferences.SAVE_EDITORS_NEVER);
- }
- public void test07SetPref() throws Exception {
prefs.setSaveEditors(ServerUIPreferences.SAVE_EDITORS_PROMPT);
assertEquals(prefs.getSaveEditors(), ServerUIPreferences.SAVE_EDITORS_PROMPT);
- }
- public void test08SetPref() throws Exception {
prefs.setLaunchMode(ServerUIPreferences.LAUNCH_MODE_RESTART);
assertEquals(prefs.getLaunchMode(), ServerUIPreferences.LAUNCH_MODE_RESTART);
- }
- public void test09SetPref() throws Exception {
prefs.setLaunchMode(ServerUIPreferences.LAUNCH_MODE_CONTINUE);
assertEquals(prefs.getLaunchMode(), ServerUIPreferences.LAUNCH_MODE_CONTINUE);
- }
- public void test10SetPref() throws Exception {
prefs.setLaunchMode(ServerUIPreferences.LAUNCH_MODE_PROMPT);
assertEquals(prefs.getLaunchMode(), ServerUIPreferences.LAUNCH_MODE_PROMPT);
- }
- public void test11SetPref() throws Exception {
prefs.setLaunchMode2(ServerUIPreferences.LAUNCH_MODE2_RESTART);
assertEquals(prefs.getLaunchMode2(), ServerUIPreferences.LAUNCH_MODE2_RESTART);
- }
- public void test12SetPref() throws Exception {
prefs.setLaunchMode2(ServerUIPreferences.LAUNCH_MODE2_DISABLE_BREAKPOINTS);
assertEquals(prefs.getLaunchMode2(), ServerUIPreferences.LAUNCH_MODE2_DISABLE_BREAKPOINTS);
- }
- public void test13SetPref() throws Exception {
prefs.setLaunchMode2(ServerUIPreferences.LAUNCH_MODE2_CONTINUE);
assertEquals(prefs.getLaunchMode2(), ServerUIPreferences.LAUNCH_MODE2_CONTINUE);
- }
- public void test14SetPref() throws Exception {
prefs.setLaunchMode2(ServerUIPreferences.LAUNCH_MODE2_PROMPT);
assertEquals(prefs.getLaunchMode2(), ServerUIPreferences.LAUNCH_MODE2_PROMPT);
- }
- public void test15SetPref() throws Exception {
prefs.setEnableBreakpoints(ServerUIPreferences.ENABLE_BREAKPOINTS_ALWAYS);
assertEquals(prefs.getEnableBreakpoints(), ServerUIPreferences.ENABLE_BREAKPOINTS_ALWAYS);
- }
- public void test16SetPref() throws Exception {
prefs.setEnableBreakpoints(ServerUIPreferences.ENABLE_BREAKPOINTS_NEVER);
assertEquals(prefs.getEnableBreakpoints(), ServerUIPreferences.ENABLE_BREAKPOINTS_NEVER);
- }
- public void test17SetPref() throws Exception {
prefs.setEnableBreakpoints(ServerUIPreferences.ENABLE_BREAKPOINTS_PROMPT);
assertEquals(prefs.getEnableBreakpoints(), ServerUIPreferences.ENABLE_BREAKPOINTS_PROMPT);
- }
- public void test19DefaultPref() throws Exception {
prefs.setSaveEditors(prefs.getDefaultSaveEditors());
assertEquals(prefs.getSaveEditors(), prefs.getDefaultSaveEditors());
}
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/WizardTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/WizardTestCase.java
index 7c38eec..d460c6b 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/WizardTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/WizardTestCase.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2013 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
@@ -29,28 +29,22 @@
UITestHelper.assertDialog(dialog);
}
- public void testRunOnServerWizard() throws Exception {
+ public void testAll() throws Exception {
testRoS(null);
- }
- public void testModifyModulesWizard() throws Exception {
Shell shell = UITestHelper.getShell();
ModifyModulesWizard wiz = new ModifyModulesWizard(null);
WizardDialog dialog = new WizardDialog(shell, wiz);
UITestHelper.assertDialog(dialog);
- }
- public void testNewRuntimeWizard() throws Exception {
- Shell shell = UITestHelper.getShell();
- NewRuntimeWizard wiz = new NewRuntimeWizard();
- WizardDialog dialog = new WizardDialog(shell, wiz);
+ shell = UITestHelper.getShell();
+ NewRuntimeWizard wiz2 = new NewRuntimeWizard();
+ dialog = new WizardDialog(shell, wiz2);
UITestHelper.assertDialog(dialog);
- }
- public void testNewServerWizard() throws Exception {
- Shell shell = UITestHelper.getShell();
- NewServerWizard wiz = new NewServerWizard();
- WizardDialog dialog = new WizardDialog(shell, wiz);
+ shell = UITestHelper.getShell();
+ NewServerWizard wiz3 = new NewServerWizard();
+ dialog = new WizardDialog(shell, wiz3);
UITestHelper.assertDialog(dialog);
}
}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/IWizardHandleTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/IWizardHandleTestCase.java
index 55c0fba..552d3e6 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/IWizardHandleTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/IWizardHandleTestCase.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2013 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
@@ -21,39 +21,23 @@
private final String sampleMessage = "Sample message";
private final int sampleMessageType = IMessageProvider.ERROR;
- public void test00Create() {
+ public void testAll() throws Exception {
wizardHandle = new TestWizardHandle();
- }
-
- public void test01Run() throws Exception {
+
wizardHandle.run(true, true, null);
- }
-
- public void test02SetDescription() {
+
wizardHandle.setDescription(null);
- }
-
- public void test03SetImageDescriptor() {
+
wizardHandle.setImageDescriptor(null);
- }
-
- public void test04SetMessage() {
+
wizardHandle.setMessage(sampleMessage, sampleMessageType);
- }
-
- public void test05SetTitle() {
+
wizardHandle.setTitle(null);
- }
-
- public void test06Update() {
+
wizardHandle.update();
- }
-
- public void test07GetMessage() {
+
assertEquals(sampleMessage, wizardHandle.getMessage());
- }
-
- public void test08GetMessageType() {
+
assertEquals(sampleMessageType, wizardHandle.getMessageType());
}
}
\ No newline at end of file
