Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2016-04-25 19:12:01 +0000
committerThomas Watson2016-04-25 19:12:01 +0000
commit00920f9106e614eff9f89ff334ef0df1809fe88c (patch)
treef4dbff3d435b77f836deff527436acb0b5469adc
parent80269cc8c3f47c08b6d36f2a0b1298e0d088f27f (diff)
downloadrt.equinox.bundles-00920f9106e614eff9f89ff334ef0df1809fe88c.tar.gz
rt.equinox.bundles-00920f9106e614eff9f89ff334ef0df1809fe88c.tar.xz
rt.equinox.bundles-00920f9106e614eff9f89ff334ef0df1809fe88c.zip
Revert back to junit 4 style. Accidental usage of JUnit4TestAdapter came back.
-rw-r--r--bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/AllTests.java31
1 files changed, 17 insertions, 14 deletions
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/AllTests.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/AllTests.java
index c8317af1..1a128ac8 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/AllTests.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/AllTests.java
@@ -1,20 +1,23 @@
-
+/*******************************************************************************
+ * Copyright (c) 2016 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
package org.eclipse.equinox.http.servlet.testbase;
import org.eclipse.equinox.http.servlet.tests.DispatchingTest;
import org.eclipse.equinox.http.servlet.tests.ServletTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests extends TestSuite {
-
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new JUnit4TestAdapter(DispatchingTest.class));
- suite.addTest(new JUnit4TestAdapter(ServletTest.class));
- return suite;
- }
-
+@RunWith(Suite.class)
+@SuiteClasses({DispatchingTest.class,ServletTest.class})
+public class AllTests {
+ // see @SuiteClasses
}

Back to the top