diff options
Diffstat (limited to 'org.eclipse.mylyn.trac.tests')
3 files changed, 27 insertions, 15 deletions
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracHeadlessStandaloneTests.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracHeadlessStandaloneTests.java index c9ceeecdf..1376db8c1 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracHeadlessStandaloneTests.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracHeadlessStandaloneTests.java @@ -31,6 +31,10 @@ import org.eclipse.mylyn.trac.tests.support.TracFixture; public class AllTracHeadlessStandaloneTests { public static Test suite() { + return suite(false); + } + + public static Test suite(boolean defaultOnly) { TestSuite suite = new TestSuite("Headless Standalone Tests for org.eclipse.mylyn.trac.tests"); // client tests suite.addTestSuite(TracSearchTest.class); @@ -40,22 +44,30 @@ public class AllTracHeadlessStandaloneTests { suite.addTestSuite(TracClientProxyTest.class); // core tests suite.addTestSuite(TracClientManagerTest.class); - // network tests - for (TracFixture fixture : TracFixture.ALL) { - fixture.createSuite(suite); - fixture.add(TracClientTest.class); - if (fixture.getAccessMode() == Version.XML_RPC) { - fixture.add(TracXmlRpcClientTest.class); + if (defaultOnly) { + addTests(suite, TracFixture.DEFAULT); + } else { + // network tests + for (TracFixture fixture : TracFixture.ALL) { + addTests(suite, fixture); + } + // validation tests + for (TracFixture fixture : TracFixture.MISC) { + fixture.createSuite(suite); + fixture.add(TracClientTest.class); + fixture.done(); } - fixture.done(); - } - // validation tests - for (TracFixture fixture : TracFixture.MISC) { - fixture.createSuite(suite); - fixture.add(TracClientTest.class); - fixture.done(); } return suite; } + private static void addTests(TestSuite suite, TracFixture fixture) { + fixture.createSuite(suite); + fixture.add(TracClientTest.class); + if (fixture.getAccessMode() == Version.XML_RPC) { + fixture.add(TracXmlRpcClientTest.class); + } + fixture.done(); + } + }
\ No newline at end of file diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java index 973fcc4fd..020d54cd8 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java @@ -37,7 +37,7 @@ public class AllTracTests { public static Test suite(boolean defaultOnly) { TestSuite suite = new TestSuite("Tests for org.eclipse.mylyn.trac.tests"); - suite.addTest(AllTracHeadlessStandaloneTests.suite()); + suite.addTest(AllTracHeadlessStandaloneTests.suite(defaultOnly)); suite.addTestSuite(TracUtilTest.class); suite.addTestSuite(TracRepositoryQueryTest.class); // XXX fails when run from continuous build: suite.addTestSuite(TracTaskEditorTest.class); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracFixture.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracFixture.java index 9ac49b79d..f6053e511 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracFixture.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracFixture.java @@ -77,7 +77,7 @@ public class TracFixture extends TestFixture { public static TracFixture TRAC_TRUNK_XML_RPC = new TracFixture(Version.XML_RPC, TracTestConstants.TEST_TRAC_TRUNK_URL, "0.12dev-r0", "XML-RPC"); - public static TracFixture DEFAULT = TRAC_0_11_XML_RPC; + public static TracFixture DEFAULT = TRAC_0_12_XML_RPC; //public static TracFixture DEFAULT = TRAC_0_11_WEB; |