diff options
| -rw-r--r-- | org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java | 54 | ||||
| -rw-r--r-- | org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java | 30 |
2 files changed, 54 insertions, 30 deletions
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java index 3d3379798..fd63cc805 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java @@ -30,6 +30,10 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaVersion; public class AllBugzillaTests { public static Test suite() { + return suite(false); + } + + public static Test suite(boolean defaultOnly) { TestSuite suite = new TestSuite("Tests for org.eclipse.mylyn.bugzilla.tests"); // Standalone tests (Don't require an instance of Eclipse) @@ -45,28 +49,12 @@ public class AllBugzillaTests { // Each of these tests gets executed against every repo in BugzillaFixture.ALL // unless otherwise excluded - for (BugzillaFixture fixture : BugzillaFixture.ALL) { - fixture.createSuite(suite); - fixture.add(RepositoryReportFactoryTest.class); - fixture.add(BugzillaTaskDataHandlerTest.class); - fixture.add(BugzillaSearchTest.class); - fixture.add(EncodingTest.class); - fixture.add(BugzillaPriorityTest.class); - - // Move any tests here that are resulting in spurious failures - // due to recent changes in Bugzilla Server head. - if (fixture != BugzillaFixture.BUGS_HEAD) { + if (defaultOnly) { + addTests(suite, BugzillaFixture.DEFAULT); + } else { + for (BugzillaFixture fixture : BugzillaFixture.ALL) { + addTests(suite, fixture); } - - // Only run these tests on > 3.2 repositories - if (!fixture.getBugzillaVersion().isSmallerOrEquals(BugzillaVersion.BUGZILLA_3_2)) { - if (fixture != BugzillaFixture.BUGS_HEAD) { - fixture.add(BugzillaRepositoryConnectorTest.class); - } - fixture.add(BugzillaAttachmentHandlerTest.class); - } - - fixture.done(); } for (BugzillaFixture fixture : BugzillaFixture.ONLY_3_6_SPECIFIC) { @@ -81,4 +69,28 @@ public class AllBugzillaTests { return suite; } + private static void addTests(TestSuite suite, BugzillaFixture fixture) { + fixture.createSuite(suite); + fixture.add(RepositoryReportFactoryTest.class); + fixture.add(BugzillaTaskDataHandlerTest.class); + fixture.add(BugzillaSearchTest.class); + fixture.add(EncodingTest.class); + fixture.add(BugzillaPriorityTest.class); + + // Move any tests here that are resulting in spurious failures + // due to recent changes in Bugzilla Server head. + if (fixture != BugzillaFixture.BUGS_HEAD) { + } + + // Only run these tests on > 3.2 repositories + if (!fixture.getBugzillaVersion().isSmallerOrEquals(BugzillaVersion.BUGZILLA_3_2)) { + if (fixture != BugzillaFixture.BUGS_HEAD) { + fixture.add(BugzillaRepositoryConnectorTest.class); + } + fixture.add(BugzillaAttachmentHandlerTest.class); + } + + fixture.done(); + } + } 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 e6104c62e..973fcc4fd 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 @@ -32,6 +32,10 @@ import org.eclipse.mylyn.trac.tests.ui.TracRepositorySettingsPageTest; public class AllTracTests { public static Test suite() { + return suite(false); + } + + public static Test suite(boolean defaultOnly) { TestSuite suite = new TestSuite("Tests for org.eclipse.mylyn.trac.tests"); suite.addTest(AllTracHeadlessStandaloneTests.suite()); suite.addTestSuite(TracUtilTest.class); @@ -40,18 +44,26 @@ public class AllTracTests { suite.addTestSuite(TracRepositorySettingsPageTest.class); suite.addTestSuite(TracHyperlinkUtilTest.class); // network tests - for (TracFixture fixture : TracFixture.ALL) { - fixture.createSuite(suite); - fixture.add(TracRepositoryConnectorTest.class); - if (fixture.getAccessMode() == Version.XML_RPC) { - fixture.add(TracTaskDataHandlerXmlRpcTest.class); - fixture.add(TracAttachmentHandlerTest.class); - } else { - fixture.add(TracRepositoryConnectorWebTest.class); + if (defaultOnly) { + addTests(suite, TracFixture.DEFAULT); + } else { + for (TracFixture fixture : TracFixture.ALL) { + addTests(suite, fixture); } - fixture.done(); } return suite; } + protected static void addTests(TestSuite suite, TracFixture fixture) { + fixture.createSuite(suite); + fixture.add(TracRepositoryConnectorTest.class); + if (fixture.getAccessMode() == Version.XML_RPC) { + fixture.add(TracTaskDataHandlerXmlRpcTest.class); + fixture.add(TracAttachmentHandlerTest.class); + } else { + fixture.add(TracRepositoryConnectorWebTest.class); + } + fixture.done(); + } + }
\ No newline at end of file |