[163029] Update tests for v2.0
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/AllTests.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/AllTests.java
index 900a7ec..40a2371 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/AllTests.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/AllTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 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
@@ -14,6 +14,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jst.server.core.tests.j2ee.*;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -50,7 +51,7 @@
s += File.separator;
runtimeLocation = new Path(s + "lib");
}
- s = System.getProperty("org.eclipse.jst.server.tomcat.40");
+ //s = System.getProperty("org.eclipse.jst.server.tomcat.40");
if (s != null && s.length() > 0) {
if (!s.endsWith(File.separator))
s += File.separator;
@@ -58,13 +59,13 @@
}
// bug 160848
- /*
+
if (runtimeLocation != null)
suite.addTest(new OrderedTestSuite(ModuleTestCase.class));
suite.addTest(new OrderedTestSuite(NoSourceTestCase.class));
suite.addTest(new OrderedTestSuite(BinaryTestCase.class));
- */
+
//$JUnit-END$
return suite;
}
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ApplicationClientTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ApplicationClientTestCase.java
index 7ab5a15..78c636d 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ApplicationClientTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ApplicationClientTestCase.java
@@ -12,16 +12,11 @@
import org.eclipse.jst.server.core.IApplicationClientModule;
import org.eclipse.jst.server.core.tests.impl.TestApplicationClientModule;
-import junit.framework.Test;
import junit.framework.TestCase;
public class ApplicationClientTestCase extends TestCase {
protected static IApplicationClientModule module;
- public static Test suite() {
- return new OrderedTestSuite(ApplicationClientTestCase.class, "ApplicationClientTestCase");
- }
-
public void test00Create() {
module = new TestApplicationClientModule();
}
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ConnectorModuleTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ConnectorModuleTestCase.java
index b4bd5cc..f90523e 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ConnectorModuleTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ConnectorModuleTestCase.java
@@ -12,16 +12,11 @@
import org.eclipse.jst.server.core.IConnectorModule;
import org.eclipse.jst.server.core.tests.impl.TestConnectorModule;
-import junit.framework.Test;
import junit.framework.TestCase;
public class ConnectorModuleTestCase extends TestCase {
protected static IConnectorModule module;
- public static Test suite() {
- return new OrderedTestSuite(ConnectorModuleTestCase.class, "ConnectorModuleTestCase");
- }
-
public void test00Create() {
module = new TestConnectorModule();
}
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBBeanTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBBeanTestCase.java
index 8529c17..1d76948 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBBeanTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBBeanTestCase.java
@@ -11,15 +11,10 @@
package org.eclipse.jst.server.core.tests;
import org.eclipse.jst.server.core.EJBBean;
-import junit.framework.Test;
import junit.framework.TestCase;
public class EJBBeanTestCase extends TestCase {
protected static EJBBean bean;
-
- public static Test suite() {
- return new OrderedTestSuite(EJBBeanTestCase.class, "EJBBeanTestCase");
- }
public void test00Create() {
bean = new EJBBean(null, "test", false, true);
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBModuleTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBModuleTestCase.java
index e5e34ae..1639b4a 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBModuleTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBModuleTestCase.java
@@ -12,16 +12,11 @@
import org.eclipse.jst.server.core.IEJBModule;
import org.eclipse.jst.server.core.tests.impl.TestEJBModule;
-import junit.framework.Test;
import junit.framework.TestCase;
public class EJBModuleTestCase extends TestCase {
protected static IEJBModule module;
- public static Test suite() {
- return new OrderedTestSuite(EJBModuleTestCase.class, "EJBModuleTestCase");
- }
-
public void test00Create() {
module = new TestEJBModule();
}
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EnterpriseApplicationTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EnterpriseApplicationTestCase.java
index 16a7ebb..d35935f 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EnterpriseApplicationTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EnterpriseApplicationTestCase.java
@@ -13,16 +13,11 @@
import org.eclipse.jst.server.core.IEnterpriseApplication;
import org.eclipse.jst.server.core.tests.impl.TestEnterpriseApplication;
-import junit.framework.Test;
import junit.framework.TestCase;
public class EnterpriseApplicationTestCase extends TestCase {
protected static IEnterpriseApplication app;
- public static Test suite() {
- return new OrderedTestSuite(EnterpriseApplicationTestCase.class, "EnterpriseApplicationTestCase");
- }
-
public void test00Create() {
app = new TestEnterpriseApplication();
}
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/GenericRuntimeTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/GenericRuntimeTestCase.java
index 90ca50f..80b8a41 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/GenericRuntimeTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/GenericRuntimeTestCase.java
@@ -17,7 +17,6 @@
import org.eclipse.jst.server.core.internal.IGenericRuntimeWorkingCopy;
import org.eclipse.wst.server.core.*;
-import junit.framework.Test;
import junit.framework.TestCase;
public class GenericRuntimeTestCase extends TestCase {
@@ -28,10 +27,6 @@
protected static IGenericRuntime genericRuntime;
protected static IGenericRuntimeWorkingCopy genericRuntimeWC;
- public static Test suite() {
- return new OrderedTestSuite(GenericRuntimeTestCase.class, "GenericRuntimeTestCase");
- }
-
public void test00CreateRuntime() throws Exception {
IRuntimeType rt = ServerCore.findRuntimeType(RUNTIME_TYPE_ID);
IRuntimeWorkingCopy wc = rt.createRuntime("a", null);
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/J2EEModuleTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/J2EEModuleTestCase.java
index fb1e630..f774f87 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/J2EEModuleTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/J2EEModuleTestCase.java
@@ -12,16 +12,11 @@
import org.eclipse.jst.server.core.IJ2EEModule;
import org.eclipse.jst.server.core.tests.impl.TestJ2EEModule;
-import junit.framework.Test;
import junit.framework.TestCase;
public class J2EEModuleTestCase extends TestCase {
protected static IJ2EEModule module;
- public static Test suite() {
- return new OrderedTestSuite(J2EEModuleTestCase.class, "J2EEModuleTestCase");
- }
-
public void test00Create() {
module = new TestJ2EEModule();
}
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiLaunchableTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiLaunchableTestCase.java
index c4828b9..e76d9e6 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiLaunchableTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiLaunchableTestCase.java
@@ -11,15 +11,10 @@
package org.eclipse.jst.server.core.tests;
import org.eclipse.jst.server.core.JndiLaunchable;
-import junit.framework.Test;
import junit.framework.TestCase;
public class JndiLaunchableTestCase extends TestCase {
protected static JndiLaunchable launch;
-
- public static Test suite() {
- return new OrderedTestSuite(JndiLaunchableTestCase.class, "JndiLaunchableTestCase");
- }
public void test00Create() {
launch = new JndiLaunchable(null, "test");
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiObjectTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiObjectTestCase.java
index f3bf45a..2d5b1a2 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiObjectTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiObjectTestCase.java
@@ -11,15 +11,10 @@
package org.eclipse.jst.server.core.tests;
import org.eclipse.jst.server.core.JndiObject;
-import junit.framework.Test;
import junit.framework.TestCase;
public class JndiObjectTestCase extends TestCase {
protected static JndiObject obj;
-
- public static Test suite() {
- return new OrderedTestSuite(JndiObjectTestCase.class, "JndiObjectTestCase");
- }
public void test00Create() {
obj = new JndiObject(null, "test");
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/OrderedTestSuite.java
index c5abe59..f2864eb 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 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
@@ -10,85 +10,37 @@
*******************************************************************************/
package org.eclipse.jst.server.core.tests;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.util.Enumeration;
import java.util.Vector;
-import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
public class OrderedTestSuite extends TestSuite {
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
+ public OrderedTestSuite(Class theClass) {
+ super(theClass);
}
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
+ public Enumeration tests() {
+ Enumeration enum2 = super.tests();
+
+ Vector list = new Vector();
+ while (enum2.hasMoreElements()) {
+ list.add(enum2.nextElement());
}
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
+
+ int size = list.size();
+ for (int i = 0; i < size - 1; i++) {
+ for (int j = i + 1; j < size; j++) {
+ TestCase t1 = (TestCase) list.get(i);
+ TestCase t2 = (TestCase) list.get(j);
+ if (t1.getName().compareTo(t2.getName()) > 0) {
+ Object obj = list.get(i);
+ list.set(i, list.get(j));
+ list.set(j, obj);
}
}
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
}
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
+
+ return list.elements();
}
}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/RuntimeClasspathProviderDelegateTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/RuntimeClasspathProviderDelegateTestCase.java
index 6ec8746..6d81588 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/RuntimeClasspathProviderDelegateTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/RuntimeClasspathProviderDelegateTestCase.java
@@ -12,16 +12,11 @@
import org.eclipse.jst.server.core.RuntimeClasspathProviderDelegate;
import org.eclipse.jst.server.core.tests.impl.TestRuntimeClasspathProviderDelegate;
-import junit.framework.Test;
import junit.framework.TestCase;
public class RuntimeClasspathProviderDelegateTestCase extends TestCase {
protected static RuntimeClasspathProviderDelegate handler;
- public static Test suite() {
- return new OrderedTestSuite(RuntimeClasspathProviderDelegateTestCase.class, "RuntimeClasspathProviderDelegateTestCase");
- }
-
public void test00Create() {
handler = new TestRuntimeClasspathProviderDelegate();
}
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ServletTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ServletTestCase.java
index a410d8e..167ec71 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ServletTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ServletTestCase.java
@@ -11,15 +11,10 @@
package org.eclipse.jst.server.core.tests;
import org.eclipse.jst.server.core.Servlet;
-import junit.framework.Test;
import junit.framework.TestCase;
public class ServletTestCase extends TestCase {
protected static Servlet servlet;
-
- public static Test suite() {
- return new OrderedTestSuite(ServletTestCase.class, "ServletTestCase");
- }
public void test00Create() {
servlet = new Servlet(null, "class", "alias");
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/WebModuleTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/WebModuleTestCase.java
index 6e9b304..7e72470 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/WebModuleTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/WebModuleTestCase.java
@@ -12,16 +12,11 @@
import org.eclipse.jst.server.core.IWebModule;
import org.eclipse.jst.server.core.tests.impl.TestWebModule;
-import junit.framework.Test;
import junit.framework.TestCase;
public class WebModuleTestCase extends TestCase {
protected static IWebModule module;
- public static Test suite() {
- return new OrderedTestSuite(WebModuleTestCase.class, "WebModuleTestCase");
- }
-
public void test00Create() {
module = new TestWebModule();
}
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/BinaryTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/BinaryTestCase.java
index 88074ba..f0cfb76 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/BinaryTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/BinaryTestCase.java
@@ -16,10 +16,8 @@
import org.eclipse.jst.server.core.IEnterpriseApplication;
import org.eclipse.jst.server.core.IJ2EEModule;
import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.jst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.*;
-import junit.framework.Test;
import junit.framework.TestCase;
public class BinaryTestCase extends TestCase {
@@ -34,10 +32,6 @@
protected static IWebModule webModule;
protected static IJ2EEModule j2eeModule;
- public static Test suite() {
- return new OrderedTestSuite(BinaryTestCase.class, "BinaryTestCase");
- }
-
public void test001ImportModules() throws Exception {
ModuleHelper.importProject("PublishTestBinary.zip", new String[] { PROJECT_NAMES[0] } );
}
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/DeleteModuleTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/DeleteModuleTestCase.java
index 404cfad..5a4b168 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/DeleteModuleTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/DeleteModuleTestCase.java
@@ -10,16 +10,9 @@
*******************************************************************************/
package org.eclipse.jst.server.core.tests.j2ee;
-import org.eclipse.jst.server.core.tests.OrderedTestSuite;
-
-import junit.framework.Test;
import junit.framework.TestCase;
public class DeleteModuleTestCase extends TestCase {
- public static Test suite() {
- return new OrderedTestSuite(DeleteModuleTestCase.class, "DeleteModuleTestCase");
- }
-
public void test0DeleteWebModule() throws Exception {
//ModuleHelper.deleteModule(ModuleTestCase.WEB_MODULE_NAME);
}
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleHelper.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleHelper.java
index 0f33027..a9a744a 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleHelper.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleHelper.java
@@ -72,7 +72,7 @@
boolean interrupted = true;
while (interrupted) {
try {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
+ Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
new NullProgressMonitor());
interrupted = false;
} catch (InterruptedException e) {
@@ -86,7 +86,7 @@
boolean interrupted = true;
while (interrupted) {
try {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
+ Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
new NullProgressMonitor());
interrupted = false;
} catch (InterruptedException e) {
@@ -100,7 +100,7 @@
boolean interrupted = true;
while (interrupted) {
try {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
+ Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
new NullProgressMonitor());
interrupted = false;
} catch (InterruptedException e) {
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleTestCase.java
index 9b4a1aa..cd0daf1 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleTestCase.java
@@ -17,10 +17,8 @@
import org.eclipse.jst.server.core.IJ2EEModule;
import org.eclipse.jst.server.core.IWebModule;
import org.eclipse.jst.server.core.tests.AllTests;
-import org.eclipse.jst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.*;
-import junit.framework.Test;
import junit.framework.TestCase;
/**
* TODO Tests left to do:
@@ -43,10 +41,6 @@
protected static IWebModule webModule;
protected static IJ2EEModule j2eeModule;
- public static Test suite() {
- return new OrderedTestSuite(ModuleTestCase.class, "ModuleTestCase");
- }
-
public void test000CreateRuntime() throws Exception {
IRuntimeType rt = ServerCore.findRuntimeType(RUNTIME_TYPE_ID);
IRuntimeWorkingCopy wc = rt.createRuntime("RuntimeLibraries", null);
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/NoSourceTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/NoSourceTestCase.java
index 95416e6..eb64900 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/NoSourceTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/NoSourceTestCase.java
@@ -13,13 +13,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.jst.server.core.IEnterpriseApplication;
-import org.eclipse.jst.server.core.IJ2EEModule;
-import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.jst.server.core.tests.OrderedTestSuite;
+import org.eclipse.jst.server.core.*;
import org.eclipse.wst.server.core.*;
-import junit.framework.Test;
import junit.framework.TestCase;
public class NoSourceTestCase extends TestCase {
@@ -34,10 +30,6 @@
protected static IWebModule webModule;
protected static IJ2EEModule j2eeModule;
- public static Test suite() {
- return new OrderedTestSuite(NoSourceTestCase.class, "NoSourceTestCase");
- }
-
public void test001ImportModules() throws Exception {
ModuleHelper.importProject("PublishEARNoSource.zip", PROJECT_NAMES);
}
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AbstractTomcatServerTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AbstractTomcatServerTestCase.java
index 3be080a..8691449 100644
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AbstractTomcatServerTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AbstractTomcatServerTestCase.java
@@ -11,7 +11,6 @@
package org.eclipse.jst.server.tomcat.core.tests;
import java.util.List;
-import junit.framework.Test;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
@@ -22,10 +21,6 @@
import org.eclipse.wst.server.core.tests.ext.AbstractServerTestCase;
public abstract class AbstractTomcatServerTestCase extends AbstractServerTestCase {
- public static Test suite() {
- return new OrderedTestSuite(AbstractTomcatServerTestCase.class, "TomcatServerTestCase");
- }
-
protected abstract String getServerTypeId();
public void deleteServer(IServer server2) throws Exception {
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/OrderedTestSuite.java
index 3d2bf40..3ada6b8 100644
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 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
@@ -10,83 +10,37 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.core.tests;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.util.Enumeration;
import java.util.Vector;
-import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
public class OrderedTestSuite extends TestSuite {
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
+ public OrderedTestSuite(Class theClass) {
+ super(theClass);
}
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
- }
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
+ public Enumeration tests() {
+ Enumeration enum2 = super.tests();
- Method[] methods = superClass.getMethods();
- int size = methods.length;
+ Vector list = new Vector();
+ while (enum2.hasMoreElements()) {
+ list.add(enum2.nextElement());
+ }
+
+ int size = list.size();
for (int i = 0; i < size - 1; i++) {
for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
+ TestCase t1 = (TestCase) list.get(i);
+ TestCase t2 = (TestCase) list.get(j);
+ if (t1.getName().compareTo(t2.getName()) > 0) {
+ Object obj = list.get(i);
+ list.set(i, list.get(j));
+ list.set(j, obj);
}
}
}
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
+
+ return list.elements();
}
}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/TomcatRuntimeTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/TomcatRuntimeTestCase.java
index 75fb685..e698993 100644
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/TomcatRuntimeTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/TomcatRuntimeTestCase.java
@@ -16,7 +16,6 @@
import org.eclipse.jst.server.tomcat.core.internal.ITomcatRuntimeWorkingCopy;
import org.eclipse.wst.server.core.*;
-import junit.framework.Test;
import junit.framework.TestCase;
public class TomcatRuntimeTestCase extends TestCase {
@@ -29,10 +28,6 @@
protected static IRuntime runtime;
protected static ITomcatRuntime tomcatRuntime;
- public static Test suite() {
- return new OrderedTestSuite(TomcatRuntimeTestCase.class, "TomcatRuntimeTestCase");
- }
-
protected IRuntimeWorkingCopy createRuntime(String runtimeTypeId) throws Exception {
IRuntimeType rt = ServerCore.findRuntimeType(runtimeTypeId);
IRuntimeWorkingCopy wc = rt.createRuntime("a", null);
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/internal/UtilTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/internal/UtilTestCase.java
index 2e1ec76..ce94edc 100644
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/internal/UtilTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/internal/UtilTestCase.java
@@ -11,15 +11,9 @@
package org.eclipse.jst.server.tomcat.core.tests.internal;
import org.eclipse.jst.server.tomcat.core.internal.TomcatServerBehaviour;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class UtilTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(UtilTestCase.class, "UtilTestCase");
- }
-
public void testArgMerge() {
assertEquals("", TomcatServerBehaviour.mergeArguments("", new String[] { }));
}
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/DeleteModuleTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/DeleteModuleTestCase.java
index 04c2f0f..22823ea 100644
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/DeleteModuleTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/DeleteModuleTestCase.java
@@ -10,17 +10,9 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.core.tests.module;
-import org.eclipse.jst.server.tomcat.core.tests.OrderedTestSuite;
-import org.eclipse.jst.server.tomcat.core.tests.TomcatRuntimeTestCase;
-
-import junit.framework.Test;
import junit.framework.TestCase;
public class DeleteModuleTestCase extends TestCase {
- public static Test suite() {
- return new OrderedTestSuite(TomcatRuntimeTestCase.class, "DeleteModuleTestCase");
- }
-
public void test0DeleteWebModule() throws Exception {
ModuleHelper.deleteModule(ModuleTestCase.WEB_MODULE_NAME);
}
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleHelper.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleHelper.java
index 5bdbac6..3874fcf 100644
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleHelper.java
+++ b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleHelper.java
@@ -19,6 +19,7 @@
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
@@ -140,7 +141,7 @@
boolean interrupted = true;
while (interrupted) {
try {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
+ Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
new NullProgressMonitor());
interrupted = false;
} catch (InterruptedException e) {
@@ -154,7 +155,7 @@
boolean interrupted = true;
while (interrupted) {
try {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
+ Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
new NullProgressMonitor());
interrupted = false;
} catch (InterruptedException e) {
@@ -168,7 +169,7 @@
boolean interrupted = true;
while (interrupted) {
try {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
+ Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
new NullProgressMonitor());
interrupted = false;
} catch (InterruptedException e) {
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleTestCase.java
index 1a2ef1f..c762e3c 100644
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleTestCase.java
@@ -10,21 +10,14 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.core.tests.module;
-import org.eclipse.jst.server.tomcat.core.tests.OrderedTestSuite;
-import org.eclipse.jst.server.tomcat.core.tests.TomcatRuntimeTestCase;
import org.eclipse.wst.server.core.IModule;
-import junit.framework.Test;
import junit.framework.TestCase;
public class ModuleTestCase extends TestCase {
protected static final String WEB_MODULE_NAME = "MyWeb";
public static IModule webModule;
- public static Test suite() {
- return new OrderedTestSuite(TomcatRuntimeTestCase.class, "ModuleTestCase");
- }
-
public void test01CreateWebModule() throws Exception {
ModuleHelper.createModule(WEB_MODULE_NAME);
}
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AbstractTomcatServerTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AbstractTomcatServerTestCase.java
index 20ce4ab..0351f33 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AbstractTomcatServerTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AbstractTomcatServerTestCase.java
@@ -11,9 +11,7 @@
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
import java.util.List;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.core.runtime.Path;
import org.eclipse.jst.server.tomcat.core.internal.ITomcatConfigurationWorkingCopy;
@@ -25,10 +23,6 @@
public abstract class AbstractTomcatServerTestCase extends TestCase {
protected static IServer server;
- public static Test suite() {
- return new TestSuite(AbstractTomcatServerTestCase.class, "TomcatServerTestCase");
- }
-
protected IServer getServer() throws Exception {
if (server == null) {
server = createServer();
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizard2TestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizard2TestCase.java
index c396ec6..36c792f 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizard2TestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizard2TestCase.java
@@ -10,9 +10,6 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
@@ -20,10 +17,6 @@
import org.eclipse.wst.server.ui.tests.dialog.WizardTestCase;
public class AddRemoveModulesWizard2TestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(AddRemoveModulesWizard2TestCase.class, "AddRemoveModulesWizardTestCase");
- }
-
public void testAddRemoveModulesWizard() throws Exception {
Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
tagAsSummary("Add/remove modules wizard", dims);
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizardTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizardTestCase.java
index 05f8a60..a41563d 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizardTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizardTestCase.java
@@ -10,9 +10,6 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
@@ -20,10 +17,6 @@
import org.eclipse.wst.server.ui.tests.dialog.WizardTestCase;
public class AddRemoveModulesWizardTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(AddRemoveModulesWizardTestCase.class, "AddRemoveModulesWizardTestCase");
- }
-
public void testAddRemoveModulesWizard() throws Exception {
Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
tagAsSummary("Add/remove modules wizard", dims);
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AutobuildTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AutobuildTestCase.java
index 82ce015..9b91a70 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AutobuildTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AutobuildTestCase.java
@@ -12,15 +12,9 @@
import org.eclipse.core.resources.ResourcesPlugin;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class AutobuildTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(AutobuildTestCase.class, "AutobuildTestCase");
- }
-
public void testBuild() throws Exception {
ResourcesPlugin.getWorkspace().getDescription().setAutoBuilding(true);
}
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildCleanTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildCleanTestCase.java
index 5ece148..9a65a73 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildCleanTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildCleanTestCase.java
@@ -10,18 +10,11 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
public class BuildCleanTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(BuildCleanTestCase.class, "BuildCleanTestCase");
- }
-
public void testBuild() throws Exception {
Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
tagAsSummary("Build clean", dims);
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullAgainTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullAgainTestCase.java
index c37b840..6bbaee6 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullAgainTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullAgainTestCase.java
@@ -10,18 +10,11 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
public class BuildFullAgainTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(BuildFullAgainTestCase.class, "BuildFullAgainTestCase");
- }
-
public void testBuild() throws Exception {
Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
tagAsSummary("Build full again", dims);
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullTestCase.java
index 96355c4..30eaf90 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullTestCase.java
@@ -10,18 +10,11 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
public class BuildFullTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(BuildFullTestCase.class, "BuildFullTestCase");
- }
-
public void testBuild() throws Exception {
Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
tagAsSummary("Build full", dims);
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildIncrementalTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildIncrementalTestCase.java
index 10fdb1a..7001aa0 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildIncrementalTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildIncrementalTestCase.java
@@ -10,18 +10,11 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
public class BuildIncrementalTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(BuildIncrementalTestCase.class, "BuildIncrementalTestCase");
- }
-
public void testBuild() throws Exception {
Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
tagAsSummary("Build incremental", dims);
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateHugeModuleTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateHugeModuleTestCase.java
index 2103c46..f6f5517 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateHugeModuleTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateHugeModuleTestCase.java
@@ -10,9 +10,7 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -29,10 +27,6 @@
protected static final int NUM_RESOURCES = 2000;
protected static final int NUM_EXTERNAL_JARS = 100;
- public static Test suite() {
- return new TestSuite(CreateHugeModuleTestCase.class, "CreateHugeModuleTestCase");
- }
-
public void testCreateHugeWebModule() throws Exception {
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
public void run(IProgressMonitor monitor) throws CoreException {
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateJavaContentTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateJavaContentTestCase.java
index 1fe8f6b..81ea83d 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateJavaContentTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateJavaContentTestCase.java
@@ -10,9 +10,7 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -23,10 +21,6 @@
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
public class CreateJavaContentTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(CreateJavaContentTestCase.class, "CreateJavaContentTestCase");
- }
-
public void testCreateModuleJavaContent() throws Exception {
for (int i = 0; i < CreateModulesTestCase.NUM_MODULES; i++) {
final int ii = i;
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateModulesTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateModulesTestCase.java
index bdc0606..1fb4ee8 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateModulesTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateModulesTestCase.java
@@ -10,9 +10,6 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
@@ -23,10 +20,6 @@
protected static final int NUM_RESOURCES = 500;
protected static final int NUM_BUILDS = 10;
- public static Test suite() {
- return new TestSuite(CreateModulesTestCase.class, "CreateModulesTestCase");
- }
-
public void testCreateModules() throws Exception {
Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
tagAsSummary("Create web modules", dims);
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateWebContentTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateWebContentTestCase.java
index 2d4e490..39c5839 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateWebContentTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateWebContentTestCase.java
@@ -10,9 +10,7 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -23,10 +21,6 @@
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
public class CreateWebContentTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(CreateWebContentTestCase.class, "CreateWebContentTestCase");
- }
-
public void testCreateWebModuleContent() throws Exception {
for (int i = 0; i < CreateModulesTestCase.NUM_MODULES; i++) {
final int ii = i;
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateXMLContentTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateXMLContentTestCase.java
index 51a9a23..25ec03f 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateXMLContentTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateXMLContentTestCase.java
@@ -10,9 +10,7 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -23,10 +21,6 @@
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
public class CreateXMLContentTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(CreateXMLContentTestCase.class, "CreateXMLContentTestCase");
- }
-
public void testCreateWebModuleContent() throws Exception {
for (int i = 0; i < CreateModulesTestCase.NUM_MODULES; i++) {
final int ii = i;
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/DeleteModulesTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/DeleteModulesTestCase.java
index 17c37b5..f74796e 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/DeleteModulesTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/DeleteModulesTestCase.java
@@ -10,18 +10,11 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
public class DeleteModulesTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(DeleteModulesTestCase.class, "DeleteModulesTestCase");
- }
-
public void testDeleteModules() throws Exception {
Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
tagAsSummary("Delete modules", dims);
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/GetDelegateTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/GetDelegateTestCase.java
index ae1b3d4..0243741 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/GetDelegateTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/GetDelegateTestCase.java
@@ -11,8 +11,6 @@
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
import java.io.File;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
@@ -24,11 +22,8 @@
import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.tests.performance.common.AbstractGetDelegateTestCase;
-public class GetDelegateTestCase extends AbstractGetDelegateTestCase {
- public static Test suite() {
- return new TestSuite(GetDelegateTestCase.class, "GetDelegateTestCase");
- }
+public class GetDelegateTestCase extends AbstractGetDelegateTestCase {
public void testGetDelegate() throws Exception {
Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
tagAsSummary("Create Tomcat runtime", dims);
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorAgainTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorAgainTestCase.java
index 48a9447..df0eace 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorAgainTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorAgainTestCase.java
@@ -10,9 +10,6 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.test.performance.Dimension;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
@@ -22,10 +19,6 @@
import org.eclipse.wst.server.ui.internal.editor.ServerEditorInput;
public class OpenEditorAgainTestCase extends AbstractOpenEditorTestCase {
- public static Test suite() {
- return new TestSuite(OpenEditorAgainTestCase.class, "OpenEditorAgainTestCase");
- }
-
public void testOpenEditor() throws Exception {
Dimension[] dims = new Dimension[] { Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP };
tagAsSummary("Open Tomcat editor again", dims);
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorTestCase.java
index 3981fd7..c738ac8 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorTestCase.java
@@ -10,24 +10,17 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.test.performance.Dimension;
import org.eclipse.wst.server.tests.performance.common.AbstractOpenEditorTestCase;
public class OpenEditorTestCase extends AbstractOpenEditorTestCase {
- public static Test suite() {
- return new TestSuite(OpenEditorTestCase.class, "OpenEditorTestCase");
- }
+ public void testOpenEditor() throws Exception {
+ Dimension[] dims = new Dimension[] { Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP };
+ tagAsSummary("Open Tomcat editor", dims);
+ super.testOpenEditor();
+ }
- public void testOpenEditor() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsSummary("Open Tomcat editor", dims);
- super.testOpenEditor();
- }
-
- protected String getServerTypeId() {
- return "org.eclipse.jst.server.tomcat.50";
- }
+ protected String getServerTypeId() {
+ return "org.eclipse.jst.server.tomcat.50";
+ }
}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishHugeModuleTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishHugeModuleTestCase.java
index 90d0d49..056f882 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishHugeModuleTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishHugeModuleTestCase.java
@@ -10,9 +10,6 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
@@ -21,10 +18,6 @@
import org.eclipse.wst.server.core.IServerWorkingCopy;
public class PublishHugeModuleTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(PublishHugeModuleTestCase.class, "PublishHugeModuleTestCase");
- }
-
public void testHugePublish() throws Exception {
Dimension[] dims = new Dimension[] { Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP };
tagAsSummary("Publish huge module to Tomcat", dims);
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishTestCase.java
index 789756f..f91373a 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishTestCase.java
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishTestCase.java
@@ -10,9 +10,6 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
@@ -21,10 +18,6 @@
import org.eclipse.wst.server.core.IServerWorkingCopy;
public class PublishTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(PublishTestCase.class, "PublishTestCase");
- }
-
public void testPublish() throws Exception {
Dimension[] dims = new Dimension[] { Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP };
tagAsSummary("Publish to Tomcat", dims);
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/OrderedTestSuite.java
index 011616c..cabf5ad 100644
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 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
@@ -10,85 +10,37 @@
*******************************************************************************/
package org.eclipse.jst.server.tomcat.ui.tests;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.util.Enumeration;
import java.util.Vector;
-import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
class OrderedTestSuite extends TestSuite{
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
+ public OrderedTestSuite(Class theClass) {
+ super(theClass);
}
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
+ public Enumeration tests() {
+ Enumeration enum2 = super.tests();
+
+ Vector list = new Vector();
+ while (enum2.hasMoreElements()) {
+ list.add(enum2.nextElement());
}
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
+
+ int size = list.size();
+ for (int i = 0; i < size - 1; i++) {
+ for (int j = i + 1; j < size; j++) {
+ TestCase t1 = (TestCase) list.get(i);
+ TestCase t2 = (TestCase) list.get(j);
+ if (t1.getName().compareTo(t2.getName()) > 0) {
+ Object obj = list.get(i);
+ list.set(i, list.get(j));
+ list.set(j, obj);
}
}
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
}
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
+
+ return list.elements();
}
}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/OrderedTestSuite.java
index 1295ca7..ac76751 100644
--- a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 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
@@ -10,85 +10,37 @@
*******************************************************************************/
package org.eclipse.jst.server.ui.tests;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.util.Enumeration;
import java.util.Vector;
-import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-class OrderedTestSuite extends TestSuite{
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
+class OrderedTestSuite extends TestSuite {
+ public OrderedTestSuite(Class theClass) {
+ super(theClass);
}
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
+ public Enumeration tests() {
+ Enumeration enum2 = super.tests();
+
+ Vector list = new Vector();
+ while (enum2.hasMoreElements()) {
+ list.add(enum2.nextElement());
}
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
+
+ int size = list.size();
+ for (int i = 0; i < size - 1; i++) {
+ for (int j = i + 1; j < size; j++) {
+ TestCase t1 = (TestCase) list.get(i);
+ TestCase t2 = (TestCase) list.get(j);
+ if (t1.getName().compareTo(t2.getName()) > 0) {
+ Object obj = list.get(i);
+ list.set(i, list.get(j));
+ list.set(j, obj);
}
}
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
}
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
+
+ return list.elements();
}
}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/ContentFilterTestCase.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/ContentFilterTestCase.java
index 1fcd9c6..ac9a92c 100644
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/ContentFilterTestCase.java
+++ b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/ContentFilterTestCase.java
@@ -12,16 +12,11 @@
import org.eclipse.wst.internet.monitor.core.internal.provisional.ContentFilterDelegate;
-import junit.framework.Test;
import junit.framework.TestCase;
public class ContentFilterTestCase extends TestCase {
protected static ContentFilterDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(MonitorListenerTestCase.class, "MonitorTestCase");
- }
-
+
public void test00Creation() {
delegate = new TestContentFilterDelegate();
}
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorListenerTestCase.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorListenerTestCase.java
index 7ba5b1a..8d8f71c 100644
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorListenerTestCase.java
+++ b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorListenerTestCase.java
@@ -11,7 +11,6 @@
package org.eclipse.wst.internet.monitor.core.tests;
import org.eclipse.wst.internet.monitor.core.internal.provisional.*;
-import junit.framework.Test;
import junit.framework.TestCase;
public class MonitorListenerTestCase extends TestCase {
@@ -45,10 +44,6 @@
super();
}
- public static Test suite() {
- return new OrderedTestSuite(MonitorListenerTestCase.class, "MonitorListenerTestCase");
- }
-
public void test0AddListener() throws Exception {
MonitorCore.addMonitorListener(listener);
}
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorTestCase.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorTestCase.java
index ab4e9d2..317d0c1 100644
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorTestCase.java
+++ b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorTestCase.java
@@ -11,7 +11,6 @@
package org.eclipse.wst.internet.monitor.core.tests;
import org.eclipse.wst.internet.monitor.core.internal.provisional.*;
-import junit.framework.Test;
import junit.framework.TestCase;
/**
* Note: use ports between 22100-22200 to ensure they are free on the build machine.
@@ -22,10 +21,6 @@
public MonitorTestCase() {
super();
}
-
- public static Test suite() {
- return new OrderedTestSuite(MonitorListenerTestCase.class, "MonitorTestCase");
- }
public void test00GetMonitors() throws Exception {
assertNotNull(MonitorCore.getMonitors());
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/OrderedTestSuite.java
index ee781b5..150a08e 100644
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 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
@@ -10,85 +10,37 @@
*******************************************************************************/
package org.eclipse.wst.internet.monitor.core.tests;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.util.Enumeration;
import java.util.Vector;
-import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-class OrderedTestSuite extends TestSuite{
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
+class OrderedTestSuite extends TestSuite {
+ public OrderedTestSuite(Class theClass) {
+ super(theClass);
}
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
+ public Enumeration tests() {
+ Enumeration enum2 = super.tests();
+
+ Vector list = new Vector();
+ while (enum2.hasMoreElements()) {
+ list.add(enum2.nextElement());
}
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
+
+ int size = list.size();
+ for (int i = 0; i < size - 1; i++) {
+ for (int j = i + 1; j < size; j++) {
+ TestCase t1 = (TestCase) list.get(i);
+ TestCase t2 = (TestCase) list.get(j);
+ if (t1.getName().compareTo(t2.getName()) > 0) {
+ Object obj = list.get(i);
+ list.set(i, list.get(j));
+ list.set(j, obj);
}
}
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
}
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
+
+ return list.elements();
}
}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/RequestTestCase.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/RequestTestCase.java
index b38e6bd..f7c169a 100644
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/RequestTestCase.java
+++ b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/RequestTestCase.java
@@ -15,7 +15,6 @@
import java.net.URL;
import org.eclipse.wst.internet.monitor.core.internal.provisional.*;
-import junit.framework.Test;
import junit.framework.TestCase;
/**
* Note: use ports between 22100-22200 to ensure they are free on the build machine.
@@ -49,10 +48,6 @@
super();
}
- public static Test suite() {
- return new OrderedTestSuite(RequestTestCase.class, "RequestTestCase");
- }
-
public void test00GetMonitors() throws Exception {
assertNotNull(MonitorCore.getMonitors());
}
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/extension/ContentFiltersTestCase.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/extension/ContentFiltersTestCase.java
index c8a611e..1920b30 100644
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/extension/ContentFiltersTestCase.java
+++ b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/extension/ContentFiltersTestCase.java
@@ -12,15 +12,10 @@
import org.eclipse.wst.internet.monitor.core.internal.IContentFilter;
import org.eclipse.wst.internet.monitor.core.internal.MonitorPlugin;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
+
public class ContentFiltersTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ContentFiltersTestCase.class, "ContentFiltersTestCase");
- }
-
public void test1ContentFiltersExtension() throws Exception {
IContentFilter[] cf = MonitorPlugin.getInstance().getContentFilters();
if (cf != null) {
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/OrderedTestSuite.java
index 8e7ecd6..f737515 100644
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 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
@@ -10,85 +10,37 @@
*******************************************************************************/
package org.eclipse.wst.internet.monitor.ui.tests;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.util.Enumeration;
import java.util.Vector;
-import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-class OrderedTestSuite extends TestSuite{
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
+class OrderedTestSuite extends TestSuite {
+ public OrderedTestSuite(Class theClass) {
+ super(theClass);
}
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
+ public Enumeration tests() {
+ Enumeration enum2 = super.tests();
+
+ Vector list = new Vector();
+ while (enum2.hasMoreElements()) {
+ list.add(enum2.nextElement());
}
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
+
+ int size = list.size();
+ for (int i = 0; i < size - 1; i++) {
+ for (int j = i + 1; j < size; j++) {
+ TestCase t1 = (TestCase) list.get(i);
+ TestCase t2 = (TestCase) list.get(j);
+ if (t1.getName().compareTo(t2.getName()) > 0) {
+ Object obj = list.get(i);
+ list.set(i, list.get(j));
+ list.set(j, obj);
}
}
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
}
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
+
+ return list.elements();
}
}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/PreferencesTestCase.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/PreferencesTestCase.java
index b5b12f9..1e9f2ac 100644
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/PreferencesTestCase.java
+++ b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/PreferencesTestCase.java
@@ -10,17 +10,11 @@
*******************************************************************************/
package org.eclipse.wst.internet.monitor.ui.tests;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.jface.dialogs.Dialog;
public class PreferencesTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(PreferencesTestCase.class);
- }
-
public PreferencesTestCase(String name) {
super(name);
}
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/extension/ContentViewersTestCase.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/extension/ContentViewersTestCase.java
index 30e1fc8..5bfda65 100644
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/extension/ContentViewersTestCase.java
+++ b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/extension/ContentViewersTestCase.java
@@ -10,18 +10,13 @@
*******************************************************************************/
package org.eclipse.wst.internet.monitor.ui.tests.extension;
-import org.eclipse.wst.internet.monitor.ui.internal.provisional.ContentViewer;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
+
+import org.eclipse.wst.internet.monitor.ui.internal.provisional.ContentViewer;
public class ContentViewersTestCase extends TestCase {
protected static ContentViewer viewer;
- public static Test suite() {
- return new TestSuite(ContentViewersTestCase.class, "ContentViewersTestCase");
- }
-
public void test00Create() {
viewer = new TestContentViewer();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ModificationStampTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ModificationStampTestCase.java
index e456ded..50ec549 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ModificationStampTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ModificationStampTestCase.java
@@ -16,18 +16,12 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Do not run - test was created solely to show a JDT compilation problem (modification
* stamps do not get updated in the output directory) which WTP has worked around.
*/
public class ModificationStampTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ModificationStampTestCase.class, "ModificationStampTestCase");
- }
-
public void testModificationStamp() throws Exception {
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("Test");
if (!project.exists())
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/OrderedTestSuite.java
index 73406cc..cf492ae 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 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
@@ -10,85 +10,37 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.util.Enumeration;
import java.util.Vector;
-import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-public class OrderedTestSuite extends TestSuite{
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
+public class OrderedTestSuite extends TestSuite {
+ public OrderedTestSuite(Class theClass) {
+ super(theClass);
}
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
+ public Enumeration tests() {
+ Enumeration enum2 = super.tests();
+
+ Vector list = new Vector();
+ while (enum2.hasMoreElements()) {
+ list.add(enum2.nextElement());
}
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
+
+ int size = list.size();
+ for (int i = 0; i < size - 1; i++) {
+ for (int j = i + 1; j < size; j++) {
+ TestCase t1 = (TestCase) list.get(i);
+ TestCase t2 = (TestCase) list.get(j);
+ if (t1.getName().compareTo(t2.getName()) > 0) {
+ Object obj = list.get(i);
+ list.set(i, list.get(j));
+ list.set(j, obj);
}
}
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
}
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
+
+ return list.elements();
}
}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ProjectPropertiesTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ProjectPropertiesTestCase.java
index 38b7314..008200f 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ProjectPropertiesTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ProjectPropertiesTestCase.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
@@ -22,10 +21,6 @@
protected static IProject project;
protected static ProjectProperties props;
- public static Test suite() {
- return new OrderedTestSuite(ProjectPropertiesTestCase.class, "AbstractServerTestCase");
- }
-
public void test00GetProperties() throws Exception {
project = ResourcesPlugin.getWorkspace().getRoot().getProject("test");
if (project != null && !project.exists()) {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerCoreTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerCoreTestCase.java
index a0f17fb..94cd3a1 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerCoreTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerCoreTestCase.java
@@ -10,19 +10,13 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerCore;
public class ServerCoreTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ServerCoreTestCase.class, "RuntimeLocatorDelegateTestCase");
- }
-
public void testGetRuntimesExtension() throws Exception {
IRuntime[] runtimes = ServerCore.getRuntimes();
if (runtimes != null) {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerEventTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerEventTestCase.java
index 07e8d6b..8348e36 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerEventTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerEventTestCase.java
@@ -16,7 +16,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.wst.server.core.*;
-import junit.framework.Test;
import junit.framework.TestCase;
public class ServerEventTestCase extends TestCase {
@@ -28,10 +27,6 @@
private static int SAMPLE_STATE = 1;
private static int SAMPLE_PUBLISHING_STATE = 2;
private static boolean SAMPLE_RESTART_STATE = true;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerEventTestCase.class, "ServerEventTestCase");
- }
public static IServer createSampleServer() {
return new IServer() {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerOperationTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerOperationTestCase.java
index 495e88e..f2cd8ca 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerOperationTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerOperationTestCase.java
@@ -12,16 +12,11 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.wst.server.core.IServer;
-import junit.framework.Test;
import junit.framework.TestCase;
public class ServerOperationTestCase extends TestCase {
protected static IServer.IOperationListener listener;
- public static Test suite() {
- return new OrderedTestSuite(ServerOperationTestCase.class, "ServerOperationTestCase");
- }
-
public void test00Create() throws Exception {
listener = new IServer.IOperationListener() {
public void done(IStatus result) {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPortTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPortTestCase.java
index 3208da6..55d9eb2 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPortTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPortTestCase.java
@@ -11,15 +11,9 @@
package org.eclipse.wst.server.core.tests;
import org.eclipse.wst.server.core.ServerPort;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class ServerPortTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ServerPortTestCase.class, "ServerPortTestCase");
- }
-
public void test00CreatePort() throws Exception {
new ServerPort(null, null, 0, null);
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPreferencesTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPreferencesTestCase.java
index 1cbdbed..311188d 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPreferencesTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPreferencesTestCase.java
@@ -10,7 +10,6 @@
**********************************************************************/
package org.eclipse.wst.server.core.tests;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.internal.ServerPreferences;
@@ -18,10 +17,6 @@
public class ServerPreferencesTestCase extends TestCase {
protected static ServerPreferences prefs;
- public static Test suite() {
- return new OrderedTestSuite(ServerPreferencesTestCase.class, "ServerPreferencesTestCase");
- }
-
public void test00GetProperties() throws Exception {
prefs = ServerPreferences.getInstance();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerUtilTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerUtilTestCase.java
index 482ca04..2d2f6d0 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerUtilTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerUtilTestCase.java
@@ -10,9 +10,7 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -23,10 +21,6 @@
import org.eclipse.wst.server.core.internal.ResourceManager;
public class ServerUtilTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ServerUtilTestCase.class, "ServerUtilTestCase");
- }
-
public void testFindServer0Extension() throws Exception {
try {
ResourceManager.findServer(null);
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractRuntimeTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractRuntimeTestCase.java
index 5826fc7..06bc12b 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractRuntimeTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractRuntimeTestCase.java
@@ -13,7 +13,6 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
@@ -24,7 +23,6 @@
import org.eclipse.wst.server.core.internal.Runtime;
import org.eclipse.wst.server.core.internal.ServerPlugin;
import org.eclipse.wst.server.core.model.RuntimeDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
/**
* Abstract runtime test case. Use this harness to test a specific runtime.
* All you have to do is extend this class, implement the abstract
@@ -47,10 +45,6 @@
}
};
- public static Test suite() {
- return new OrderedTestSuite(AbstractRuntimeTestCase.class, "AbstractRuntimeTestCase");
- }
-
protected IRuntime getRuntime() throws Exception {
if (runtime == null)
runtime = createRuntime();
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractServerTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractServerTestCase.java
index 4681289..798a4bf 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractServerTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractServerTestCase.java
@@ -13,7 +13,6 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
@@ -24,7 +23,6 @@
import org.eclipse.wst.server.core.internal.ServerPlugin;
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
import org.eclipse.wst.server.core.model.ServerDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
/**
* Abstract server test case. Use this harness to test a specific server.
* All you have to do is extend this class, implement the abstract
@@ -54,10 +52,6 @@
}
};
- public static Test suite() {
- return new OrderedTestSuite(AbstractServerTestCase.class, "AbstractServerTestCase");
- }
-
protected IServer getServer() throws Exception {
if (server == null) {
server = createServer();
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ClientsTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ClientsTestCase.java
index 1e92def..e33f307 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ClientsTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ClientsTestCase.java
@@ -10,18 +10,12 @@
**********************************************************************/
package org.eclipse.wst.server.core.tests.extension;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.wst.server.core.internal.IClient;
import org.eclipse.wst.server.core.internal.ServerPlugin;
public class ClientsTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ClientsTestCase.class, "ClientsTestCase");
- }
-
public void testClientsExtension() throws Exception {
IClient[] clients = ServerPlugin.getClients();
if (clients != null) {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/LaunchableAdaptersTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/LaunchableAdaptersTestCase.java
index 39601fe..cd88eaa 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/LaunchableAdaptersTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/LaunchableAdaptersTestCase.java
@@ -10,18 +10,12 @@
**********************************************************************/
package org.eclipse.wst.server.core.tests.extension;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.wst.server.core.internal.ILaunchableAdapter;
import org.eclipse.wst.server.core.internal.ServerPlugin;
public class LaunchableAdaptersTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(LaunchableAdaptersTestCase.class, "LaunchableAdaptersTestCase");
- }
-
public void testLaunchableAdaptersExtension() throws Exception {
ILaunchableAdapter[] la = ServerPlugin.getLaunchableAdapters();
if (la != null) {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ModuleFactoriesTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ModuleFactoriesTestCase.java
index d79c5f1..e805f93 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ModuleFactoriesTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ModuleFactoriesTestCase.java
@@ -10,17 +10,11 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.extension;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.core.resources.IProject;
import org.eclipse.wst.server.core.ServerUtil;
public class ModuleFactoriesTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ModuleFactoriesTestCase.class, "ModuleFactoriesTestCase");
- }
-
public void testModuleFactoriesExtension() throws Exception {
// get modules
try {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeLocatorsTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeLocatorsTestCase.java
index eab5702..9e2f03a 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeLocatorsTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeLocatorsTestCase.java
@@ -10,18 +10,12 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.extension;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.wst.server.core.internal.IRuntimeLocator;
import org.eclipse.wst.server.core.internal.ServerPlugin;
public class RuntimeLocatorsTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(RuntimeLocatorsTestCase.class, "RuntimeLocatorsTestCase");
- }
-
public void testRuntimeLocatorsExtension() throws Exception {
IRuntimeLocator[] runtimeLocators = ServerPlugin.getRuntimeLocators();
if (runtimeLocators != null) {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeTypesTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeTypesTestCase.java
index fc19605..848939c 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeTypesTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeTypesTestCase.java
@@ -10,18 +10,12 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.extension;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.wst.server.core.IRuntimeType;
import org.eclipse.wst.server.core.ServerCore;
public class RuntimeTypesTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(RuntimeTypesTestCase.class, "RuntimeTypesTestCase");
- }
-
public void testRuntimeTypesExtension() throws Exception {
IRuntimeType[] runtimeTypes = ServerCore.getRuntimeTypes();
if (runtimeTypes != null) {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerLocatorsTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerLocatorsTestCase.java
index 3c9ea0d..8651cda 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerLocatorsTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerLocatorsTestCase.java
@@ -10,15 +10,9 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.extension;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class ServerLocatorsTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ServerLocatorsTestCase.class, "ServerLocatorsTestCase");
- }
-
public void testServerLocatorsExtension() throws Exception {
/*IServerLocator[] serverLocators = ServerCore.getser();
if (runtimeLocators != null) {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTasksTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTasksTestCase.java
index 3be4b39..0e1d46a 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTasksTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTasksTestCase.java
@@ -10,18 +10,12 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.extension;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.wst.server.core.internal.IPublishTask;
import org.eclipse.wst.server.core.internal.ServerPlugin;
public class ServerTasksTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ServerTasksTestCase.class, "ServerTasksTestCase");
- }
-
public void testServerTasksExtension() throws Exception {
IPublishTask[] serverTasks = ServerPlugin.getPublishTasks();
if (serverTasks != null) {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTypesTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTypesTestCase.java
index 9a21e08..de5277d 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTypesTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTypesTestCase.java
@@ -10,18 +10,12 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.extension;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.wst.server.core.IServerType;
import org.eclipse.wst.server.core.ServerCore;
public class ServerTypesTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ServerTypesTestCase.class, "ServerTypesTestCase");
- }
-
public void testServerTypesExtension() throws Exception {
IServerType[] serverTypes = ServerCore.getServerTypes();
if (serverTypes != null) {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/StartupExtensionTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/StartupExtensionTestCase.java
index 0c5787d..0dc4d08 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/StartupExtensionTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/StartupExtensionTestCase.java
@@ -10,16 +10,10 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.extension;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.wst.server.core.ServerCore;
public class StartupExtensionTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(StartupExtensionTestCase.class, "StartupExtensionTestCase");
- }
-
public void testStartupExtension() throws Exception {
// startup
ServerCore.getServers();
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ClientDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ClientDelegateTestCase.java
index ebba9a0..5f7b5c7 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ClientDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ClientDelegateTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.model.ClientDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestClientDelegate;
public class ClientDelegateTestCase extends TestCase {
protected static ClientDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(ClientDelegateTestCase.class, "ClientDelegateTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
delegate = new TestClientDelegate();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/IURLProviderTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/IURLProviderTestCase.java
index bf7fb34..4965e40 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/IURLProviderTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/IURLProviderTestCase.java
@@ -11,20 +11,14 @@
package org.eclipse.wst.server.core.tests.model;
import java.net.URL;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.model.IURLProvider;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
public class IURLProviderTestCase extends TestCase {
protected static IURLProvider urlProvider;
- public static Test suite() {
- return new OrderedTestSuite(IURLProviderTestCase.class, "IURLProviderTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
urlProvider = new IURLProvider() {
public URL getModuleRootURL(IModule module) {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/LaunchableAdapterDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/LaunchableAdapterDelegateTestCase.java
index ce918a6..bfe5ec6 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/LaunchableAdapterDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/LaunchableAdapterDelegateTestCase.java
@@ -10,22 +10,16 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.wst.server.core.IModuleArtifact;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.model.LaunchableAdapterDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
public class LaunchableAdapterDelegateTestCase extends TestCase {
protected static LaunchableAdapterDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(LaunchableAdapterDelegateTestCase.class, "LaunchableAdapterDelegateTestCase");
- }
-
public void test00CreateDelegate() {
delegate = new LaunchableAdapterDelegate() {
public Object getLaunchable(IServer server, IModuleArtifact moduleArtifact) throws CoreException {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleArtifactAdapterDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleArtifactAdapterDelegateTestCase.java
index 7d8e6a4..d728952 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleArtifactAdapterDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleArtifactAdapterDelegateTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.IModuleArtifact;
import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
public class ModuleArtifactAdapterDelegateTestCase extends TestCase {
protected static ModuleArtifactAdapterDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(ModuleArtifactAdapterDelegateTestCase.class, "ModuleArtifactAdapterDelegateTestCase");
- }
-
public void test00CreateDelegate() {
delegate = new ModuleArtifactAdapterDelegate() {
public IModuleArtifact getModuleArtifact(Object obj) {
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleDelegateTestCase.java
index f92e35a..73cca31 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleDelegateTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestModuleDelegate;
public class ModuleDelegateTestCase extends TestCase {
protected static ModuleDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(ModuleDelegateTestCase.class, "ModuleDelegateTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
delegate = new TestModuleDelegate();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleEventTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleEventTestCase.java
index 855293f..e109119 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleEventTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleEventTestCase.java
@@ -10,19 +10,13 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.internal.ModuleEvent;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
public class ModuleEventTestCase extends TestCase {
protected static ModuleEvent event;
- public static Test suite() {
- return new OrderedTestSuite(ModuleEventTestCase.class, "ModuleEventTestCase");
- }
-
public void test00CreateEvent() throws Exception {
event = new ModuleEvent(null, false, null, null, null);
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryDelegateTestCase.java
index e544fca..914e542 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryDelegateTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.model.ModuleFactoryDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestModuleFactoryDelegate;
public class ModuleFactoryDelegateTestCase extends TestCase {
protected static ModuleFactoryDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(ModuleFactoryDelegateTestCase.class, "ModuleFactoryDelegateTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
delegate = new TestModuleFactoryDelegate();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryEventTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryEventTestCase.java
index c9d186f..efa8332 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryEventTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryEventTestCase.java
@@ -10,19 +10,13 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.internal.ModuleFactoryEvent;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
public class ModuleFactoryEventTestCase extends TestCase {
protected static ModuleFactoryEvent event;
- public static Test suite() {
- return new OrderedTestSuite(ModuleFactoryEventTestCase.class, "ModuleFactoryEventTestCase");
- }
-
public void test00CreateEvent() throws Exception {
event = new ModuleFactoryEvent(null, null);
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFileTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFileTestCase.java
index 1edd88e..74b3caf 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFileTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFileTestCase.java
@@ -10,21 +10,15 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.core.resources.IFile;
import org.eclipse.wst.server.core.internal.ModuleFile;
import org.eclipse.wst.server.core.model.IModuleFile;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
public class ModuleFileTestCase extends TestCase {
protected static IModuleFile delegate;
- public static Test suite() {
- return new OrderedTestSuite(ModuleFileTestCase.class, "ModuleFileTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
delegate = new ModuleFile((IFile)null, "name", null);
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFolderTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFolderTestCase.java
index f42c6c3..cb95230 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFolderTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFolderTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.internal.ModuleFolder;
import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
public class ModuleFolderTestCase extends TestCase {
protected static IModuleFolder delegate;
- public static Test suite() {
- return new OrderedTestSuite(ModuleFolderTestCase.class, "ModuleFolderTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
delegate = new ModuleFolder(null, "name", null);
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleListenerTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleListenerTestCase.java
index 332008c..f4362a2 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleListenerTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleListenerTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.internal.IModuleListener;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestModuleListener;
public class ModuleListenerTestCase extends TestCase {
protected static IModuleListener listener;
- public static Test suite() {
- return new OrderedTestSuite(ModuleListenerTestCase.class, "ModuleListenerTestCase");
- }
-
public void test00CreateListener() throws Exception {
listener = new TestModuleListener();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaTestCase.java
index 80a9829..f6d93dc 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestModuleResourceDelta;
public class ModuleResourceDeltaTestCase extends TestCase {
protected static IModuleResourceDelta delta;
- public static Test suite() {
- return new OrderedTestSuite(ModuleResourceDeltaTestCase.class, "ModuleResourceDeltaTestCase");
- }
-
public void test00CreateDelegate() {
delta = new TestModuleResourceDelta();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaVisitorTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaVisitorTestCase.java
index 01d20df..3bc48d8 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaVisitorTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaVisitorTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.internal.IModuleResourceDeltaVisitor;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestModuleResourceDeltaVisitor;
public class ModuleResourceDeltaVisitorTestCase extends TestCase {
protected static IModuleResourceDeltaVisitor delta;
- public static Test suite() {
- return new OrderedTestSuite(ModuleResourceDeltaVisitorTestCase.class, "ModuleResourceDeltaVisitorTestCase");
- }
-
public void test00CreateDelegate() {
delta = new TestModuleResourceDeltaVisitor();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceTestCase.java
index 02e4309..3e9fe01 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestModuleResource;
public class ModuleResourceTestCase extends TestCase {
protected static IModuleResource resource;
- public static Test suite() {
- return new OrderedTestSuite(ModuleResourceTestCase.class, "ModuleResourceTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
resource = new TestModuleResource();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeDelegateTestCase.java
index 26a8293..2f65abe 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeDelegateTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.model.RuntimeDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestRuntimeDelegate;
public class RuntimeDelegateTestCase extends TestCase {
protected static RuntimeDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(RuntimeDelegateTestCase.class, "RuntimeDelegateTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
delegate = new TestRuntimeDelegate();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeLocatorDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeLocatorDelegateTestCase.java
index 451c6bd..70c149f 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeLocatorDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeLocatorDelegateTestCase.java
@@ -10,21 +10,15 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
import org.eclipse.wst.server.core.model.RuntimeLocatorDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestRuntimeLocatorDelegate;
public class RuntimeLocatorDelegateTestCase extends TestCase {
protected static RuntimeLocatorDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(RuntimeLocatorDelegateTestCase.class, "RuntimeLocatorDelegateTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
delegate = new TestRuntimeLocatorDelegate();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerBehaviourDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerBehaviourDelegateTestCase.java
index 7045f89..84ca3fb 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerBehaviourDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerBehaviourDelegateTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestServerBehaviourDelegate;
public class ServerBehaviourDelegateTestCase extends TestCase {
protected static ServerBehaviourDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(ServerBehaviourDelegateTestCase.class, "ServerBehaviourDelegateTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
delegate = new TestServerBehaviourDelegate();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerDelegateTestCase.java
index e510ac2..d8a20b3 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerDelegateTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.model.ServerDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestServerDelegate;
public class ServerDelegateTestCase extends TestCase {
protected static ServerDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(ServerDelegateTestCase.class, "ServerDelegateTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
delegate = new TestServerDelegate();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerLocatorDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerLocatorDelegateTestCase.java
index 67895fc..c9e81de 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerLocatorDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerLocatorDelegateTestCase.java
@@ -10,21 +10,15 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.internal.provisional.ServerLocatorDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestServerLocatorDelegate;
public class ServerLocatorDelegateTestCase extends TestCase {
protected static ServerLocatorDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(ServerLocatorDelegateTestCase.class, "ServerLocatorDelegateTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
delegate = new TestServerLocatorDelegate();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerTaskDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerTaskDelegateTestCase.java
index ad476b8..c71e1d9 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerTaskDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerTaskDelegateTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.model;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.core.model.PublishTaskDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.tests.impl.TestServerTaskDelegate;
public class ServerTaskDelegateTestCase extends TestCase {
protected static PublishTaskDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(ServerTaskDelegateTestCase.class, "ServerTaskDelegateTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
delegate = new TestServerTaskDelegate();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/HTTPLaunchableTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/HTTPLaunchableTestCase.java
index 0fc5294..db7a949 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/HTTPLaunchableTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/HTTPLaunchableTestCase.java
@@ -10,17 +10,11 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.util;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.util.HttpLaunchable;
-import junit.framework.Test;
import junit.framework.TestCase;
+import org.eclipse.wst.server.core.util.HttpLaunchable;
public class HTTPLaunchableTestCase extends TestCase {
protected static HttpLaunchable launch;
-
- public static Test suite() {
- return new OrderedTestSuite(HTTPLaunchableTestCase.class, "HTTPLaunchableTestCase");
- }
public void test00Create() {
launch = new HttpLaunchable(null);
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/NullModuleArtifactTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/NullModuleArtifactTestCase.java
index fca9960..519fb49 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/NullModuleArtifactTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/NullModuleArtifactTestCase.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2006 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
@@ -10,26 +10,20 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.util;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
import org.eclipse.wst.server.core.util.NullModuleArtifact;
-import junit.framework.Test;
import junit.framework.TestCase;
public class NullModuleArtifactTestCase extends TestCase {
protected static NullModuleArtifact nma;
-
- public static Test suite() {
- return new OrderedTestSuite(NullModuleArtifactTestCase.class, "NullModuleArtifactTestCase");
- }
public void test00Create() {
nma = new NullModuleArtifact(null);
}
-
+
public void test01GetModule() {
assertNull(nma.getModule());
}
-
+
public void test02ToString() {
nma.toString();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleFactoryDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleFactoryDelegateTestCase.java
index 0b26514..c8c1ea0 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleFactoryDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleFactoryDelegateTestCase.java
@@ -10,19 +10,13 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.util;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
+import junit.framework.TestCase;
import org.eclipse.wst.server.core.tests.impl.TestProjectModuleFactoryDelegate;
import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
-import junit.framework.Test;
-import junit.framework.TestCase;
public class ProjectModuleFactoryDelegateTestCase extends TestCase {
protected static ProjectModuleFactoryDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(ProjectModuleFactoryDelegateTestCase.class, "ProjectModuleFactoryDelegateTestCase");
- }
-
public void test00Create() {
delegate = new TestProjectModuleFactoryDelegate();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleTestCase.java
index 2a5590f..9907477 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleTestCase.java
@@ -10,19 +10,13 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.util;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
+import junit.framework.TestCase;
import org.eclipse.wst.server.core.tests.impl.TestProjectModule;
import org.eclipse.wst.server.core.util.ProjectModule;
-import junit.framework.Test;
-import junit.framework.TestCase;
public class ProjectModuleTestCase extends TestCase {
protected static ProjectModule pm;
- public static Test suite() {
- return new OrderedTestSuite(ProjectModuleTestCase.class, "ProjectModuleTestCase");
- }
-
public void test00Create() {
pm = new TestProjectModule();
}
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/StaticWebTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/StaticWebTestCase.java
index adca550..764e1fa 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/StaticWebTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/StaticWebTestCase.java
@@ -10,18 +10,12 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.util;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
+import junit.framework.TestCase;
import org.eclipse.wst.server.core.tests.impl.TestStaticWeb;
import org.eclipse.wst.server.core.util.IStaticWeb;
-import junit.framework.Test;
-import junit.framework.TestCase;
public class StaticWebTestCase extends TestCase {
protected static IStaticWeb web;
-
- public static Test suite() {
- return new OrderedTestSuite(StaticWebTestCase.class, "StaticWebTestCase");
- }
public void test00Create() {
web = new TestStaticWeb();
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/WebResourceTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/WebResourceTestCase.java
index 755c669..98d5748 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/WebResourceTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/WebResourceTestCase.java
@@ -10,17 +10,11 @@
*******************************************************************************/
package org.eclipse.wst.server.core.tests.util;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.util.WebResource;
-import junit.framework.Test;
import junit.framework.TestCase;
+import org.eclipse.wst.server.core.util.WebResource;
public class WebResourceTestCase extends TestCase {
protected static WebResource web;
-
- public static Test suite() {
- return new OrderedTestSuite(WebResourceTestCase.class, "WebResourceTestCase");
- }
public void test00Create() {
web = new WebResource(null, null);
diff --git a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/AddRemoveModulesWizardTestCase.java b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/AddRemoveModulesWizardTestCase.java
index a6b0681..7410c32 100644
--- a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/AddRemoveModulesWizardTestCase.java
+++ b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/AddRemoveModulesWizardTestCase.java
@@ -10,18 +10,11 @@
*******************************************************************************/
package org.eclipse.wst.server.tests.performance;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
import org.eclipse.wst.server.ui.tests.dialog.WizardTestCase;
public class AddRemoveModulesWizardTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(AddRemoveModulesWizardTestCase.class, "AddRemoveModulesWizardTestCase");
- }
-
public void testAddRemoveModulesWizard() throws Exception {
Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
tagAsGlobalSummary("Add/remove modules wizard", dims);
diff --git a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/MementoTestCase.java b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/MementoTestCase.java
index 71025ff..b8cfefe 100644
--- a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/MementoTestCase.java
+++ b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/MementoTestCase.java
@@ -14,9 +14,6 @@
import java.io.IOException;
import java.net.URL;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -25,10 +22,6 @@
import org.eclipse.wst.server.core.internal.XMLMemento;
public class MementoTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(MementoTestCase.class, "MementoTestCase");
- }
-
protected static IPath getLocalPath(IPath path2) {
try {
URL url = FileLocator.find(TestsPlugin.instance.getBundle(), path2, null);
diff --git a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/ModuleFactoriesExtensionTestCase.java b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/ModuleFactoriesExtensionTestCase.java
index a058e11..8836939 100644
--- a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/ModuleFactoriesExtensionTestCase.java
+++ b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/ModuleFactoriesExtensionTestCase.java
@@ -10,18 +10,12 @@
*******************************************************************************/
package org.eclipse.wst.server.tests.performance;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
import org.eclipse.wst.server.core.internal.ModuleFactory;
import org.eclipse.wst.server.core.internal.ServerPlugin;
public class ModuleFactoriesExtensionTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(ModuleFactoriesExtensionTestCase.class, "ModuleFactoriesExtensionTestCase");
- }
-
public void testModuleFactoriesExtension() throws Exception {
Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
tagAsGlobalSummary("Module Factories", dims);
diff --git a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/StartupExtensionTestCase.java b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/StartupExtensionTestCase.java
index be767a9..c7e05fa 100644
--- a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/StartupExtensionTestCase.java
+++ b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/StartupExtensionTestCase.java
@@ -10,18 +10,11 @@
*******************************************************************************/
package org.eclipse.wst.server.tests.performance;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.eclipse.test.performance.Dimension;
import org.eclipse.test.performance.PerformanceTestCase;
import org.eclipse.wst.server.core.ServerCore;
public class StartupExtensionTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(StartupExtensionTestCase.class, "StartupExtensionTestCase");
- }
-
public void testStartupExtension() throws Exception {
Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
tagAsGlobalSummary("Runtime/Server startup", dims);
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AbstractOpenEditorTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AbstractOpenEditorTestCase.java
index 5066344..3f2b2ee 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AbstractOpenEditorTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AbstractOpenEditorTestCase.java
@@ -10,9 +10,7 @@
**********************************************************************/
package org.eclipse.wst.server.ui.tests;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
@@ -21,10 +19,6 @@
public abstract class AbstractOpenEditorTestCase extends TestCase {
private final String SERVER_EDITOR_ID = "org.eclipse.wst.server.ui.tests.editor";
-
- public static Test suite() {
- return new TestSuite(AbstractOpenEditorTestCase.class, "OpenEditorTestCase");
- }
public void testOpenEditor() throws Exception {
IServer server = getServer();
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/OrderedTestSuite.java
index 7b6eda0..0282b76 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 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
@@ -10,85 +10,37 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.util.Enumeration;
import java.util.Vector;
-import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
public class OrderedTestSuite extends TestSuite {
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
+ public OrderedTestSuite(Class theClass) {
+ super(theClass);
}
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
+ public Enumeration tests() {
+ Enumeration enum2 = super.tests();
+
+ Vector list = new Vector();
+ while (enum2.hasMoreElements()) {
+ list.add(enum2.nextElement());
}
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
+
+ int size = list.size();
+ for (int i = 0; i < size - 1; i++) {
+ for (int j = i + 1; j < size; j++) {
+ TestCase t1 = (TestCase) list.get(i);
+ TestCase t2 = (TestCase) list.get(j);
+ if (t1.getName().compareTo(t2.getName()) > 0) {
+ Object obj = list.get(i);
+ list.set(i, list.get(j));
+ list.set(j, obj);
}
}
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
}
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
+
+ return list.elements();
}
}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerLaunchConfigurationTabTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerLaunchConfigurationTabTestCase.java
index 1c836f9..260ed39 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerLaunchConfigurationTabTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerLaunchConfigurationTabTestCase.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.ui.ServerLaunchConfigurationTab;
@@ -18,12 +17,6 @@
public class ServerLaunchConfigurationTabTestCase extends TestCase {
protected static ServerLaunchConfigurationTab tab;
- public static Test suite() {
- return new OrderedTestSuite(ServerLaunchConfigurationTabTestCase.class, "ServerLaunchConfigurationTabTestCase");
- }
-
-
-
public void test00CreateTab() {
tab = new ServerLaunchConfigurationTab();
}
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 4b0db13..c64abc1 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
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
@@ -19,10 +18,6 @@
public class ServerUIPreferencesTestCase extends TestCase {
protected static ServerUIPreferences prefs;
- public static Test suite() {
- return new OrderedTestSuite(ServerUIPreferencesTestCase.class, "ServerUIPreferencesTestCase");
- }
-
public void test00GetProperties() throws Exception {
prefs = ServerUIPlugin.getPreferences();
}
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/PreferencesTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/PreferencesTestCase.java
index 22c8bcb..6e26e9e 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/PreferencesTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/PreferencesTestCase.java
@@ -10,17 +10,11 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests.dialog;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.eclipse.jface.dialogs.Dialog;
public class PreferencesTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(PreferencesTestCase.class);
- }
-
public PreferencesTestCase(String name) {
super(name);
}
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IOrderedTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IOrderedTestCase.java
index f72d8e2..40813cd 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IOrderedTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IOrderedTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests.editor;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.ui.internal.editor.IOrdered;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
import org.eclipse.wst.server.ui.tests.impl.TestOrdered;
public class IOrderedTestCase extends TestCase {
protected static IOrdered ordered;
- public static Test suite() {
- return new OrderedTestSuite(IOrderedTestCase.class, "IOrderedTestCase");
- }
-
public void test00Create() {
ordered = new TestOrdered();
}
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IServerEditorPartInputTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IServerEditorPartInputTestCase.java
index 709f6c9..3361839 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IServerEditorPartInputTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IServerEditorPartInputTestCase.java
@@ -10,22 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests.editor;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.ui.editor.IServerEditorPartInput;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
import org.eclipse.wst.server.ui.tests.impl.TestServerEditorPartInput;
public class IServerEditorPartInputTestCase extends TestCase {
protected static IServerEditorPartInput input;
- public static Test suite() {
- return new OrderedTestSuite(IServerEditorPartInputTestCase.class, "IServerEditorPartInputTestCase");
- }
-
-
-
public void test00Create() {
input = new TestServerEditorPartInput();
}
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorActionFactoryDelegateTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorActionFactoryDelegateTestCase.java
index 955ad10..8d7d2ba 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorActionFactoryDelegateTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorActionFactoryDelegateTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests.editor;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.ui.internal.provisional.ServerEditorActionFactoryDelegate;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
import org.eclipse.wst.server.ui.tests.impl.TestServerEditorActionFactoryDelegate;
public class ServerEditorActionFactoryDelegateTestCase extends TestCase {
protected static ServerEditorActionFactoryDelegate delegate;
- public static Test suite() {
- return new OrderedTestSuite(ServerEditorActionFactoryDelegateTestCase.class, "ServerEditorActionFactoryDelegateTestCase");
- }
-
public void test00CreateDelegate() throws Exception {
delegate = new TestServerEditorActionFactoryDelegate();
}
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorPartTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorPartTestCase.java
index e13286b..0245124 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorPartTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorPartTestCase.java
@@ -10,20 +10,14 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests.editor;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.wst.server.ui.editor.ServerEditorPart;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
public class ServerEditorPartTestCase extends TestCase {
protected static ServerEditorPart editor;
- public static Test suite() {
- return new OrderedTestSuite(ServerEditorPartTestCase.class, "ServerEditorPartTestCase");
- }
-
public void test00CreateEditor() {
editor = new ServerEditorPart() {
public void createPartControl(Composite parent) {
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorSectionTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorSectionTestCase.java
index 8de491e..ffb5bc0 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorSectionTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorSectionTestCase.java
@@ -10,19 +10,13 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests.editor;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.ui.editor.ServerEditorSection;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
public class ServerEditorSectionTestCase extends TestCase {
protected static ServerEditorSection section;
- public static Test suite() {
- return new OrderedTestSuite(ServerEditorSectionTestCase.class, "ServerEditorSectionTestCase");
- }
-
public void test00Create() {
section = new ServerEditorSection() {
// do nothing
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 f585f58..95746ca 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
@@ -10,11 +10,9 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests.wizard;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
import org.eclipse.wst.server.ui.tests.impl.TestWizardHandle;
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
@@ -23,10 +21,6 @@
private final String sampleMessage = "Sample message";
private final int sampleMessageType = IMessageProvider.ERROR;
- public static Test suite() {
- return new OrderedTestSuite(IWizardHandleTestCase.class, "IWizardHandleTestCase");
- }
-
public void test00Create() {
wizardHandle = new TestWizardHandle();
}
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/TaskWizardTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/TaskWizardTestCase.java
index d91830a..66aebbe 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/TaskWizardTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/TaskWizardTestCase.java
@@ -10,18 +10,12 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests.wizard;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.eclipse.wst.server.ui.internal.wizard.TaskWizard;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
public class TaskWizardTestCase extends TestCase {
protected static TaskWizard wizard;
-
- public static Test suite() {
- return new OrderedTestSuite(TaskWizardTestCase.class, "TaskWizardTestCase");
- }
public void test00Create() {
wizard = new TaskWizard("title", null, null);
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/WizardFragmentTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/WizardFragmentTestCase.java
index 5085f17..4f0b56f 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/WizardFragmentTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/WizardFragmentTestCase.java
@@ -10,19 +10,13 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests.wizard;
-import junit.framework.Test;
import junit.framework.TestCase;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
public class WizardFragmentTestCase extends TestCase {
protected static WizardFragment fragment;
- public static Test suite() {
- return new OrderedTestSuite(WizardFragmentTestCase.class, "WizardFragmentTestCase");
- }
-
public void test00CreateFragment() {
fragment = new WizardFragment() {
// do nothing
