diff options
author | fbecker | 2010-05-13 14:41:32 +0000 |
---|---|---|
committer | fbecker | 2010-05-13 14:41:32 +0000 |
commit | 194280f475c34d8023597471ed18be95ef45ccf5 (patch) | |
tree | 46e4ea6f137abe7114cc6ed3f42808fcd8a9820f /org.eclipse.mylyn.bugzilla.tests | |
parent | 7a3e010f15366bba2c0e011f4538f74ae4bfd4b5 (diff) | |
download | org.eclipse.mylyn.tasks-194280f475c34d8023597471ed18be95ef45ccf5.tar.gz org.eclipse.mylyn.tasks-194280f475c34d8023597471ed18be95ef45ccf5.tar.xz org.eclipse.mylyn.tasks-194280f475c34d8023597471ed18be95ef45ccf5.zip |
ASSIGNED - bug 302654: support for Bugzilla 3.6
https://bugs.eclipse.org/bugs/show_bug.cgi?id=302654
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.tests')
4 files changed, 19 insertions, 15 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 77acf8e81..f51fe9fc7 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 @@ -63,12 +63,14 @@ public class AllBugzillaTests { } fixture.add(BugzillaAttachmentHandlerTest.class); } - if (!fixture.getBugzillaVersion().isSmaller(BugzillaVersion.BUGZILLA_3_6)) { - fixture.add(BugzillaXMLRPCTest.class); - } fixture.done(); } + for (BugzillaFixture fixture : BugzillaFixture.ONLY_3_6_SPECIFIC) { + fixture.createSuite(suite); + fixture.add(BugzillaXMLRPCTest.class); + fixture.done(); + } return suite; } diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java index 463cf7392..77a3bdd36 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java @@ -344,7 +344,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { // } // public void testStdWorkflow32() throws Exception { - if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_6_CUSTOM) { + if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_6_CUSTOM_WF) { doStdWorkflow("3"); } } diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXMLRPCTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXMLRPCTest.java index 6f61155b7..b80332619 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXMLRPCTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXMLRPCTest.java @@ -41,7 +41,7 @@ public class BugzillaXMLRPCTest extends TestCase { @SuppressWarnings("unused") public void testxmlrpc() throws Exception { - if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_6_NO_XMLRPC) { + if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_6_XML_RPC_DISABLED) { int uID = bugzillaClient.login(); String x0 = bugzillaClient.getVersion(); HashMap<?, ?> x1 = bugzillaClient.getTime(); @@ -64,7 +64,7 @@ public class BugzillaXMLRPCTest extends TestCase { public void testxmlrpcInstalled() throws Exception { int uID = -1; BugzillaFixture a = BugzillaFixture.current(); - if (BugzillaFixture.current() == BugzillaFixture.BUGS_3_6_NO_XMLRPC) { + if (BugzillaFixture.current() == BugzillaFixture.BUGS_3_6_XML_RPC_DISABLED) { try { uID = bugzillaClient.login(); fail("Never reach this! We should get an XmlRpcException"); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java index efed936a2..c5e0b67cf 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java @@ -68,10 +68,6 @@ public class BugzillaFixture extends TestFixture { public static final String TEST_BUGZILLA_36_URL = getServerUrl("bugs36"); - public static final String TEST_BUGZILLA_36_CUSTOM_URL = getServerUrl("bugs36customWF"); - - public static final String TEST_BUGZILLA_36_NO_XMLRPC = getServerUrl("bugs36noxmlrpc"); - public static final String TEST_BUGZILLA_HEAD_URL = getServerUrl("bugshead"); public static final String TEST_BUGZILLA_LATEST_URL = TEST_BUGZILLA_36_URL; @@ -101,11 +97,14 @@ public class BugzillaFixture extends TestFixture { public static BugzillaFixture BUGS_3_6 = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL, // "3.6", ""); - public static BugzillaFixture BUGS_3_6_CUSTOM = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_CUSTOM_URL, // - "3.6", "CUSTOM-WF"); + public static BugzillaFixture BUGS_3_6_CUSTOM_WF = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL + + "-custom-wf", "3.6", "Custom Workflow"); - public static BugzillaFixture BUGS_3_6_NO_XMLRPC = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_NO_XMLRPC, // - "3.6", "NO-XMLRPC"); + public static BugzillaFixture BUGS_3_6_CUSTOM_WF_AND_STATUS = new BugzillaFixture( + BugzillaFixture.TEST_BUGZILLA_36_URL + "-custom-wf-and-status", "3.6", "Custom Workflow and Status"); + + public static BugzillaFixture BUGS_3_6_XML_RPC_DISABLED = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL + + "-xml-rpc-disabled", "3.6", "XML-RPC disabled"); public static BugzillaFixture BUGS_HEAD = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_HEAD_URL, // "3.7", ""); @@ -113,7 +112,10 @@ public class BugzillaFixture extends TestFixture { public static BugzillaFixture DEFAULT = BUGS_3_6; public static final BugzillaFixture[] ALL = new BugzillaFixture[] { BUGS_2_22, BUGS_3_0, BUGS_3_2, BUGS_3_4, - BUGS_3_6, BUGS_3_6_CUSTOM, BUGS_3_6_NO_XMLRPC, BUGS_HEAD }; + BUGS_3_6, BUGS_HEAD }; + + public static final BugzillaFixture[] ONLY_3_6_SPECIFIC = new BugzillaFixture[] { BUGS_3_6, + BUGS_3_6_XML_RPC_DISABLED, BUGS_3_6_CUSTOM_WF, BUGS_3_6_CUSTOM_WF_AND_STATUS }; private final String version; |