290465: fix Bugzilla test suite

https://bugs.eclipse.org/bugs/show_bug.cgi?id=290465

2 files changed, 30 insertions, 15 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaHeadlessStandaloneTests.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaHeadlessStandaloneTests.java
index fbd4754e9..d68814931 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaHeadlessStandaloneTests.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaHeadlessStandaloneTests.java
@@ -36,9 +36,16 @@ public class AllBugzillaHeadlessStandaloneTests {
 		suite.addTestSuite(BugzillaConfigurationTest.class);
 		suite.addTestSuite(BugzillaVersionTest.class);
 		suite.addTestSuite(BugzillaTaskCompletionTest.class);
+
 		for (BugzillaFixture fixture : BugzillaFixture.ALL) {
 			fixture.createSuite(suite);
-			// only run certain tests against head to avoid spurious failures 
+			// XXX: re-enable when webservice is used for retrieval of history
+			// fixture.add(fixtureSuite, BugzillaTaskHistoryTest.class); 
+			fixture.add(BugzillaRepositoryConnectorStandaloneTest.class);
+			fixture.add(BugzillaRepositoryConnectorConfigurationTest.class);
+
+			// Move any tests here that are resulting in spurious failures
+			// due to recent changes in Bugzilla Server head.
 			if (fixture != BugzillaFixture.BUGS_HEAD) {
 				fixture.add(BugzillaClientTest.class);
 
@@ -47,11 +54,9 @@ public class AllBugzillaHeadlessStandaloneTests {
 					fixture.add(BugzillaCustomFieldsTest.class);
 					fixture.add(BugzillaFlagsTest.class);
 				}
-				// XXX: re-enable when webservice is used for retrieval of history
-				// fixture.add(fixtureSuite, BugzillaTaskHistoryTest.class); 
-				fixture.add(BugzillaRepositoryConnectorStandaloneTest.class);
+
+				fixture.add(BugzillaClientTest.class);
 			}
-			fixture.add(BugzillaRepositoryConnectorConfigurationTest.class);
 			fixture.done();
 		}
 		return suite;
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 f4d5a39d1..837c8f2e8 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
@@ -28,27 +28,37 @@ public class AllBugzillaTests {
 
 	public static Test suite() {
 		TestSuite suite = new TestSuite("Tests for org.eclipse.mylyn.bugzilla.tests");
+
+		// Standalone tests (Don't require an instance of Eclipse)
 		suite.addTest(AllBugzillaHeadlessStandaloneTests.suite());
+
+		// Tests that only need to run once (i.e. no network io so doesn't matter which repository)
 		suite.addTestSuite(TaskEditorTest.class);
 		suite.addTestSuite(BugzillaRepositorySettingsPageTest.class);
 		suite.addTestSuite(BugzillaSearchPageTest.class);
+		suite.addTestSuite(BugzillaDateTimeTests.class);
+		suite.addTestSuite(BugzillaTaskHyperlinkDetectorTest.class);
 
+		// Each of these tests gets executed against every repo in BugzillaFixture.ALL
+		// unless otherwise excluded
 		for (BugzillaFixture fixture : BugzillaFixture.ALL) {
 			fixture.createSuite(suite);
-			// only run certain tests against head to avoid spurious failures 
+			fixture.add(RepositoryReportFactoryTest.class);
+			fixture.add(BugzillaTaskDataHandlerTest.class);
+			fixture.add(BugzillaSearchTest.class);
+			fixture.add(EncodingTest.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)) {
+			// 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.add(BugzillaTaskDataHandlerTest.class);
-				fixture.add(RepositoryReportFactoryTest.class);
-				fixture.add(BugzillaTaskHyperlinkDetectorTest.class);
-				fixture.add(BugzillaSearchTest.class);
-				fixture.add(EncodingTest.class);
-				fixture.add(BugzillaDateTimeTests.class);
+				fixture.add(BugzillaAttachmentHandlerTest.class);
 			}
 			fixture.done();
 		}