[304137] Update for JUnit 4 Test Framework. Bumped minor version since OrderedTestSuite is being removed and tests are run unordered.
diff --git a/tests/org.eclipse.jst.server.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.ui.tests/META-INF/MANIFEST.MF index 6111665..3345693 100644 --- a/tests/org.eclipse.jst.server.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jst.server.ui.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jst.server.ui.tests Bundle-SymbolicName: org.eclipse.jst.server.ui.tests -Bundle-Version: 1.0.401.qualifier +Bundle-Version: 1.1.000.qualifier Bundle-ClassPath: tests.jar Bundle-Activator: org.eclipse.jst.server.ui.tests.TestsPlugin Bundle-Vendor: Eclipse.org Export-Package: org.eclipse.jst.server.ui.tests Require-Bundle: org.eclipse.core.runtime, - org.junit;bundle-version="[3.8.0,4.0.0)", + org.junit;bundle-version="3.8.0", org.eclipse.ui, org.eclipse.jst.server.ui, org.eclipse.wst.common.project.facet.core
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 deleted file mode 100644 index 205db15..0000000 --- a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/OrderedTestSuite.java +++ /dev/null
@@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2008 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - Initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.server.ui.tests; - -import java.util.Enumeration; -import java.util.Vector; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -class OrderedTestSuite extends TestSuite { - public OrderedTestSuite(Class theClass) { - super(theClass); - } - - @SuppressWarnings("unchecked") - public Enumeration tests() { - Enumeration<TestCase> enum2 = super.tests(); - - Vector<TestCase> list = new Vector<TestCase>(); - 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++) { - TestCase t1 = list.get(i); - TestCase t2 = list.get(j); - if (t1.getName().compareTo(t2.getName()) > 0) { - TestCase obj = list.get(i); - list.set(i, list.get(j)); - list.set(j, obj); - } - } - } - - return list.elements(); - } -}