diff options
author | Thomas Watson | 2016-04-25 19:12:01 +0000 |
---|---|---|
committer | Thomas Watson | 2016-04-25 19:12:01 +0000 |
commit | 00920f9106e614eff9f89ff334ef0df1809fe88c (patch) | |
tree | f4dbff3d435b77f836deff527436acb0b5469adc | |
parent | 80269cc8c3f47c08b6d36f2a0b1298e0d088f27f (diff) | |
download | rt.equinox.bundles-00920f9106e614eff9f89ff334ef0df1809fe88c.tar.gz rt.equinox.bundles-00920f9106e614eff9f89ff334ef0df1809fe88c.tar.xz rt.equinox.bundles-00920f9106e614eff9f89ff334ef0df1809fe88c.zip |
Bug 490273 - Move tests to JUnit 4I20160426-1430I20160426-1245I20160426-1105I20160426-1045I20160426-1000I20160426-0800I20160426-0130I20160426-0030I20160425-2230I20160425-2000
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.java | 31 |
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 c8317af14..1a128ac8e 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 } |