Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXmlRpcClientTest.java523
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java18
-rw-r--r--org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java7
3 files changed, 397 insertions, 151 deletions
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXmlRpcClientTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXmlRpcClientTest.java
index 2f845bc54..59b2a789c 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXmlRpcClientTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXmlRpcClientTest.java
@@ -12,8 +12,8 @@
package org.eclipse.mylyn.bugzilla.tests.core;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
+import java.util.Map;
import junit.framework.TestCase;
@@ -24,6 +24,7 @@ import org.eclipse.mylyn.bugzilla.tests.support.BugzillaFixture;
import org.eclipse.mylyn.commons.net.AuthenticationType;
import org.eclipse.mylyn.commons.net.WebLocation;
import org.eclipse.mylyn.internal.bugzilla.core.AbstractBugzillaOperation;
+import org.eclipse.mylyn.internal.bugzilla.core.BugzillaVersion;
import org.eclipse.mylyn.internal.bugzilla.core.CustomTransitionManager;
import org.eclipse.mylyn.internal.bugzilla.core.service.BugzillaXmlRpcClient;
@@ -34,8 +35,256 @@ import org.eclipse.mylyn.internal.bugzilla.core.service.BugzillaXmlRpcClient;
*/
public class BugzillaXmlRpcClientTest extends TestCase {
+ private static final String BUGZILLA_LE_4_0 = "<4.0";
+
+ private static final String BUGZILLA_GE_4_0 = ">=4.0";
+
private BugzillaXmlRpcClient bugzillaClient;
+ @SuppressWarnings("serial")
+ private final Map<String, Map<String, ArrayList<String>>> fixtureTransitionsMap = new HashMap<String, Map<String, ArrayList<String>>>() {
+ {
+ put(BUGZILLA_LE_4_0, new HashMap<String, ArrayList<String>>() {
+ {
+ put("NEW", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("accept");
+ add("duplicate");
+ }
+ });
+ put("UNCONFIRMED", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("accept");
+ add("duplicate");
+ add("markNew");
+ }
+ });
+ put("ASSIGNED", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("duplicate");
+ add("markNew");
+ }
+ });
+ put("REOPENED", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("accept");
+ add("duplicate");
+ add("markNew");
+ }
+ });
+ put("RESOLVED", new ArrayList<String>() {
+ {
+ add("verify");
+ add("reopen");
+ add("close");
+ }
+ });
+ put("VERIFIED", new ArrayList<String>() {
+ {
+ add("reopen");
+ add("resolve");
+ add("duplicate");
+ add("close");
+ }
+ });
+ put("CLOSED", new ArrayList<String>() {
+ {
+ add("reopen");
+ add("resolve");
+ add("duplicate");
+ }
+ });
+ }
+ });
+ put(BUGZILLA_GE_4_0, new HashMap<String, ArrayList<String>>() {
+ {
+ put("UNCONFIRMED", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("CONFIRMED");
+ add("duplicate");
+ add("IN_PROGRESS");
+ }
+ });
+ put("IN_PROGRESS", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("duplicate");
+ add("CONFIRMED");
+ }
+ });
+ put("CONFIRMED", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("duplicate");
+ add("IN_PROGRESS");
+ }
+ });
+ put("RESOLVED", new ArrayList<String>() {
+ {
+ add("verify");
+ add("reopen");
+ add("CONFIRMED");
+ }
+ });
+ put("VERIFIED", new ArrayList<String>() {
+ {
+ add("reopen");
+ add("resolve");
+ add("duplicate");
+ add("CONFIRMED");
+ }
+ });
+ }
+ });
+ put(BugzillaFixture.CUSTOM_WF, new HashMap<String, ArrayList<String>>() {
+ {
+ put("NEW", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("accept");
+ add("duplicate");
+ add("close");
+ }
+ });
+ put("UNCONFIRMED", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("accept");
+ add("duplicate");
+ add("markNew");
+ }
+ });
+ put("ASSIGNED", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("duplicate");
+ add("markNew");
+ }
+ });
+ put("REOPENED", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("accept");
+ add("duplicate");
+ add("markNew");
+ add("reopen");
+ add("close");
+ add("verify");
+ }
+ });
+ put("RESOLVED", new ArrayList<String>() {
+ {
+ add("verify");
+ add("reopen");
+ add("close");
+ }
+ });
+ put("VERIFIED", new ArrayList<String>() {
+ {
+ add("reopen");
+ add("resolve");
+ add("duplicate");
+ add("close");
+ }
+ });
+ put("CLOSED", new ArrayList<String>() {
+ {
+ add("reopen");
+ add("resolve");
+ add("duplicate");
+ }
+ });
+ }
+ });
+ put(BugzillaFixture.CUSTOM_WF_AND_STATUS, new HashMap<String, ArrayList<String>>() {
+ {
+ put("NEW", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("accept");
+ add("duplicate");
+ add("close");
+ add("reopen");
+ }
+ });
+ put("UNCONFIRMED", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("accept");
+ add("duplicate");
+ add("markNew");
+ add("close");
+ }
+ });
+ put("ASSIGNED", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("duplicate");
+ add("markNew");
+ add("close");
+ }
+ });
+ put("REOPENED", new ArrayList<String>() {
+ {
+ add("resolve");
+ add("accept");
+ add("duplicate");
+ add("markNew");
+ add("reopen");
+ add("close");
+ }
+ });
+ put("RESOLVED", new ArrayList<String>() {
+ {
+ add("verify");
+ add("reopen");
+ add("close");
+ }
+ });
+ put("VERIFIED", new ArrayList<String>() {
+ {
+ add("reopen");
+ add("resolve");
+ add("duplicate");
+ add("close");
+ add("MODIFIED");
+ }
+ });
+ put("CLOSED", new ArrayList<String>() {
+ {
+ add("reopen");
+ add("resolve");
+ add("duplicate");
+ add("verify");
+ }
+ });
+ put("ON_DEV", new ArrayList<String>() {
+ {
+ add("close");
+ add("POST");
+ }
+ });
+ put("POST", new ArrayList<String>() {
+ {
+ add("close");
+ }
+ });
+ put("MODIFIED", new ArrayList<String>() {
+ {
+ add("close");
+ add("ON_DEV");
+ }
+ });
+ }
+ });
+ }
+ };
+
@Override
public void setUp() throws Exception {
WebLocation webLocation = new WebLocation(BugzillaFixture.current().getRepositoryUrl() + "/xmlrpc.cgi");
@@ -44,27 +293,108 @@ public class BugzillaXmlRpcClientTest extends TestCase {
bugzillaClient.setContentTypeCheckingEnabled(true);
}
- @SuppressWarnings("unused")
- public void testXmlRpc() throws Exception {
- if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_6_XML_RPC_DISABLED) {
+// @SuppressWarnings("unused")
+// only for local development work
+// public void testXmlRpc() throws Exception {
+// if (!BugzillaFixture.current().getDescription().equals(BugzillaFixture.XML_RPC_DISABLED)) {
+// IProgressMonitor monitor = new NullProgressMonitor();
+// HashMap<?, ?> x1 = bugzillaClient.getTime(monitor);
+// Date x2 = bugzillaClient.getDBTime(monitor);
+// Date x3 = bugzillaClient.getWebTime(monitor);
+// if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_4) {
+// Object[] xx3 = bugzillaClient.getAllFields(monitor);
+// Object[] xx4 = bugzillaClient.getFieldsWithNames(monitor, new String[] { "qa_contact" });
+// Object[] xx5 = bugzillaClient.getFieldsWithIDs(monitor, new Integer[] { 12, 18 });
+// }
+// }
+// }
+
+ public void testGetVersion() throws Exception {
+ if (BugzillaFixture.current().getDescription().equals(BugzillaFixture.XML_RPC_DISABLED)) {
+ return;
+ } else {
+ IProgressMonitor monitor = new NullProgressMonitor();
+ String version = bugzillaClient.getVersion(monitor);
+ assertEquals(BugzillaFixture.current().getVersion(), version);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testUserInfo() throws Exception {
+ if (BugzillaFixture.current().getDescription().equals(BugzillaFixture.XML_RPC_DISABLED)) {
+ return;
+ } else {
IProgressMonitor monitor = new NullProgressMonitor();
int uID = bugzillaClient.login(monitor);
- String x0 = bugzillaClient.getVersion(monitor);
- HashMap<?, ?> x1 = bugzillaClient.getTime(monitor);
- Date x2 = bugzillaClient.getDBTime(monitor);
- Date x3 = bugzillaClient.getWebTime(monitor);
- Object[] xx0 = bugzillaClient.getUserInfoFromIDs(monitor, new Integer[] { 1, 2 });
- Object[] xx1 = bugzillaClient.getUserInfoFromNames(monitor, new String[] { "tests@mylyn.eclipse.org" });
- Object[] xx2 = bugzillaClient.getUserInfoWithMatch(monitor, new String[] { "est" });
- if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_4) {
- Object[] xx3 = bugzillaClient.getAllFields(monitor);
- Object[] xx4 = bugzillaClient.getFieldsWithNames(monitor, new String[] { "qa_contact" });
- Object[] xx5 = bugzillaClient.getFieldsWithIDs(monitor, new Integer[] { 12, 18 });
- }
- Object[] xx6 = bugzillaClient.getSelectableProducts(monitor);
- Object[] xx7 = bugzillaClient.getEnterableProducts(monitor);
- Object[] xx8 = bugzillaClient.getAccessibleProducts(monitor);
- Object[] xx9 = bugzillaClient.getProducts(monitor, new Integer[] { 1, 3 });
+ assertEquals(2, uID);
+ Object[] userList0 = bugzillaClient.getUserInfoFromIDs(monitor, new Integer[] { 1, 2 });
+ assertNotNull(userList0);
+ assertEquals(2, userList0.length);
+ assertEquals(((Integer) 1), ((HashMap<String, Integer>) userList0[0]).get("id"));
+ assertEquals("admin@mylyn.eclipse.org", ((HashMap<String, String>) userList0[0]).get("email"));
+ assertEquals("admin@mylyn.eclipse.org", ((HashMap<String, String>) userList0[0]).get("name"));
+ assertEquals("Mylyn Admin", ((HashMap<String, String>) userList0[0]).get("real_name"));
+ assertEquals(((Boolean) true), ((HashMap<String, Boolean>) userList0[0]).get("can_login"));
+
+ assertEquals(((Integer) 2), ((HashMap<String, Integer>) userList0[1]).get("id"));
+ assertEquals("tests@mylyn.eclipse.org", ((HashMap<String, String>) userList0[1]).get("email"));
+ assertEquals("tests@mylyn.eclipse.org", ((HashMap<String, String>) userList0[1]).get("name"));
+ assertEquals("Mylyn Test", ((HashMap<String, String>) userList0[1]).get("real_name"));
+ assertEquals(((Boolean) true), ((HashMap<String, Boolean>) userList0[1]).get("can_login"));
+
+ Object[] userList1 = bugzillaClient.getUserInfoFromNames(monitor,
+ new String[] { "tests@mylyn.eclipse.org" });
+ assertNotNull(userList1);
+ assertEquals(1, userList1.length);
+ assertEquals(((Integer) 2), ((HashMap<String, Integer>) userList1[0]).get("id"));
+ assertEquals("tests@mylyn.eclipse.org", ((HashMap<String, String>) userList1[0]).get("email"));
+ assertEquals("tests@mylyn.eclipse.org", ((HashMap<String, String>) userList1[0]).get("name"));
+ assertEquals("Mylyn Test", ((HashMap<String, String>) userList1[0]).get("real_name"));
+ assertEquals(((Boolean) true), ((HashMap<String, Boolean>) userList1[0]).get("can_login"));
+
+ Object[] userList2 = bugzillaClient.getUserInfoWithMatch(monitor, new String[] { "est" });
+ assertEquals(2, userList2.length);
+ assertEquals(((Integer) 3), ((HashMap<String, Integer>) userList2[0]).get("id"));
+ assertEquals("guest@mylyn.eclipse.org", ((HashMap<String, String>) userList2[0]).get("email"));
+ assertEquals("guest@mylyn.eclipse.org", ((HashMap<String, String>) userList2[0]).get("name"));
+ assertEquals("Mylyn guest", ((HashMap<String, String>) userList2[0]).get("real_name"));
+ assertEquals(((Boolean) true), ((HashMap<String, Boolean>) userList2[0]).get("can_login"));
+
+ assertEquals(((Integer) 2), ((HashMap<String, Integer>) userList2[1]).get("id"));
+ assertEquals("tests@mylyn.eclipse.org", ((HashMap<String, String>) userList2[1]).get("email"));
+ assertEquals("tests@mylyn.eclipse.org", ((HashMap<String, String>) userList2[1]).get("name"));
+ assertEquals("Mylyn Test", ((HashMap<String, String>) userList2[1]).get("real_name"));
+ assertEquals(((Boolean) true), ((HashMap<String, Boolean>) userList2[1]).get("can_login"));
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testProductInfo() throws Exception {
+ if (BugzillaFixture.current().getDescription().equals(BugzillaFixture.XML_RPC_DISABLED)) {
+ return;
+ } else {
+ IProgressMonitor monitor = new NullProgressMonitor();
+ int uID = bugzillaClient.login(monitor);
+ assertEquals(2, uID);
+ Object[] selProductIDs = bugzillaClient.getSelectableProducts(monitor);
+ assertNotNull(selProductIDs);
+ assertEquals(3, selProductIDs.length);
+ Object[] enterProductIDs = bugzillaClient.getEnterableProducts(monitor);
+ assertNotNull(enterProductIDs);
+ assertEquals(3, enterProductIDs.length);
+ Object[] accessibleProductIDs = bugzillaClient.getAccessibleProducts(monitor);
+ assertNotNull(accessibleProductIDs);
+ assertEquals(3, accessibleProductIDs.length);
+ Object[] productDetails = bugzillaClient.getProducts(monitor, new Integer[] { 1, 3 });
+ assertNotNull(productDetails);
+ assertEquals(2, productDetails.length);
+ assertEquals(((Integer) 1), ((HashMap<String, Integer>) productDetails[0]).get("id"));
+ assertEquals(
+ "This is a test product. This ought to be blown away and replaced with real stuff in a finished installation of bugzilla.",
+ ((HashMap<String, String>) productDetails[0]).get("description"));
+ assertEquals(((Integer) 3), ((HashMap<String, Integer>) productDetails[1]).get("id"));
+ assertEquals("Product for manual testing", ((HashMap<String, String>) productDetails[1]).get("description"));
+
}
}
@@ -73,7 +403,7 @@ public class BugzillaXmlRpcClientTest extends TestCase {
int uID = -1;
IProgressMonitor monitor = new NullProgressMonitor();
BugzillaFixture a = BugzillaFixture.current();
- if (BugzillaFixture.current() == BugzillaFixture.BUGS_3_6_XML_RPC_DISABLED) {
+ if (BugzillaFixture.current().getDescription().equals(BugzillaFixture.XML_RPC_DISABLED)) {
try {
uID = bugzillaClient.login(monitor);
fail("Never reach this! We should get an XmlRpcException");
@@ -88,12 +418,17 @@ public class BugzillaXmlRpcClientTest extends TestCase {
}
public void testTransitionManagerWithXml() throws Exception {
- if (BugzillaFixture.current() == BugzillaFixture.BUGS_3_6) {
+
+ if (BugzillaFixture.current().getBugzillaVersion().isSmaller(BugzillaVersion.BUGZILLA_3_6)) {
+ return;
+ } else if (BugzillaFixture.current().getDescription().equals(BugzillaFixture.XML_RPC_DISABLED)) {
+ return;
+ } else {
CustomTransitionManager ctm = new CustomTransitionManager();
ctm.parse(new NullProgressMonitor(), bugzillaClient);
- String start;
ArrayList<String> transitions = new ArrayList<String>();
+ Map<String, ArrayList<String>> expectTransitions;
/*
* Copy and paste this block to test valid transitions for different start statuses
@@ -102,131 +437,29 @@ public class BugzillaXmlRpcClientTest extends TestCase {
* way to determine (using the operation 'reopen') whether "REOPEN" or "UNCONFIRMED"
* is valid.
*/
- start = "NEW";
- transitions.clear();
- for (AbstractBugzillaOperation s : ctm.getValidTransitions(start)) {
- String name = s.toString();
- if (name.equals("resolve")) {
- transitions.add(name);
- } else if (name.equals("accept")) {
- transitions.add(name);
- } else if (name.equals("duplicate")) {
- transitions.add(name);
- } else {
- fail("The status " + start + " is not expected to transition to " + name.toString());
- }
+ if (BugzillaFixture.current().getDescription().equals(BugzillaFixture.CUSTOM_WF)) {
+ expectTransitions = fixtureTransitionsMap.get(BugzillaFixture.CUSTOM_WF);
+ } else if (BugzillaFixture.current().getDescription().equals(BugzillaFixture.CUSTOM_WF_AND_STATUS)) {
+ expectTransitions = fixtureTransitionsMap.get(BugzillaFixture.CUSTOM_WF_AND_STATUS);
+ } else if (BugzillaFixture.current().getBugzillaVersion().isSmaller(BugzillaVersion.BUGZILLA_4_0)) {
+ expectTransitions = fixtureTransitionsMap.get(BUGZILLA_LE_4_0);
+ } else {
+ expectTransitions = fixtureTransitionsMap.get(BUGZILLA_GE_4_0);
}
- assertEquals("Missing transitions for " + start + ", only found " + transitions, transitions.size(),
- ctm.getValidTransitions(start).size());
-
- start = "UNCONFIRMED";
- transitions.clear();
- for (AbstractBugzillaOperation s : ctm.getValidTransitions(start)) {
- String name = s.toString();
- if (name.equals("resolve")) {
- transitions.add(name);
- } else if (name.equals("accept")) {
- transitions.add(name);
- } else if (name.equals("duplicate")) {
- transitions.add(name);
- } else if (name.equals("markNew")) {
- transitions.add(name);
- } else {
- fail("The status " + start + " was not expected to transition to " + name.toString());
+ for (String start : expectTransitions.keySet()) {
+ transitions.clear();
+ ArrayList<String> expectedStateTransition = expectTransitions.get(start);
+ for (AbstractBugzillaOperation s : ctm.getValidTransitions(start)) {
+ String end = s.toString();
+ if (expectedStateTransition.contains(end)) {
+ transitions.add(end);
+ } else {
+ fail("The status " + start + " is not expected to transition to " + end.toString());
+ }
}
+ assertEquals("Missing transitions for " + start + ", only found " + transitions, transitions.size(),
+ ctm.getValidTransitions(start).size());
}
- assertEquals("Unrecognized transitions for " + start + ", only found " + transitions, transitions.size(),
- ctm.getValidTransitions(start).size());
-
- start = "ASSIGNED";
- transitions.clear();
- for (AbstractBugzillaOperation s : ctm.getValidTransitions(start)) {
- String name = s.toString();
- if (name.equals("resolve")) {
- transitions.add(name);
- } else if (name.equals("duplicate")) {
- transitions.add(name);
- } else if (name.equals("markNew")) {
- transitions.add(name);
- } else {
- fail("The status " + start + " was not expected to transition to " + name.toString());
- }
- }
- assertEquals("Unrecognized transitions for " + start + ", only found " + transitions, transitions.size(),
- ctm.getValidTransitions(start).size());
-
- start = "REOPENED";
- transitions.clear();
- for (AbstractBugzillaOperation s : ctm.getValidTransitions(start)) {
- String name = s.toString();
- if (name.equals("resolve")) {
- transitions.add(name);
- } else if (name.equals("accept")) {
- transitions.add(name);
- } else if (name.equals("duplicate")) {
- transitions.add(name);
- } else if (name.equals("markNew")) {
- transitions.add(name);
- } else {
- fail("The status " + start + " was not expected to transition to " + name.toString());
- }
- }
- assertEquals("Unrecognized transitions for " + start + ", only found " + transitions, transitions.size(),
- ctm.getValidTransitions(start).size());
-
- start = "RESOLVED";
- transitions.clear();
- for (AbstractBugzillaOperation s : ctm.getValidTransitions(start)) {
- String name = s.toString();
- if (name.equals("verify")) {
- transitions.add(name);
- } else if (name.equals("reopen")) {
- transitions.add(name);
- } else if (name.equals("close")) {
- transitions.add(name);
- } else {
- fail("The status " + start + " was not expected to transition to " + name.toString());
- }
- }
- assertEquals("Unrecognized transitions for " + start + ", only found " + transitions, transitions.size(),
- ctm.getValidTransitions(start).size());
-
- start = "VERIFIED";
- transitions.clear();
- for (AbstractBugzillaOperation s : ctm.getValidTransitions(start)) {
- String name = s.toString();
- if (name.equals("reopen")) {
- transitions.add(name);
- } else if (name.equals("resolve")) {
- transitions.add(name);
- } else if (name.equals("duplicate")) {
- transitions.add(name);
- } else if (name.equals("close")) {
- transitions.add(name);
- } else {
- fail("The status " + start + " was not expected to transition to " + name.toString());
- }
- }
- assertEquals("Unrecognized transitions for " + start + ", only found " + transitions, transitions.size(),
- ctm.getValidTransitions(start).size());
-
- start = "CLOSED";
- transitions.clear();
- for (AbstractBugzillaOperation s : ctm.getValidTransitions(start)) {
- String name = s.toString();
- if (name.equals("reopen")) {
- transitions.add(name);
- } else if (name.equals("resolve")) {
- transitions.add(name);
- } else if (name.equals("duplicate")) {
- transitions.add(name);
- } else {
- fail("The status " + start + " was not expected to transition to " + name.toString());
- }
- }
- assertEquals("Unrecognized transitions for " + start + ", only found " + transitions, transitions.size(),
- ctm.getValidTransitions(start).size());
-
}
}
}
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 dd93cf1b7..7877fcea7 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
@@ -62,6 +62,12 @@ public class BugzillaFixture extends TestFixture {
return TestConfiguration.getRepositoryUrl(version);
}
+ public static final String CUSTOM_WF = "Custom Workflow";
+
+ public static final String CUSTOM_WF_AND_STATUS = "Custom Workflow and Status";
+
+ public static final String XML_RPC_DISABLED = "XML-RPC disabled";
+
private static BugzillaFixture current;
/**
@@ -75,20 +81,20 @@ public class BugzillaFixture extends TestFixture {
"3.6.6", "");
public static BugzillaFixture BUGS_3_6_CUSTOM_WF = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL
- + "-custom-wf", "3.6.6", "Custom Workflow");
+ + "-custom-wf", "3.6.6", CUSTOM_WF);
public static BugzillaFixture BUGS_3_6_CUSTOM_WF_AND_STATUS = new BugzillaFixture(
- BugzillaFixture.TEST_BUGZILLA_36_URL + "-custom-wf-and-status", "3.6.6", "Custom Workflow and Status");
+ BugzillaFixture.TEST_BUGZILLA_36_URL + "-custom-wf-and-status", "3.6.6", CUSTOM_WF_AND_STATUS);
public static BugzillaFixture BUGS_3_6_XML_RPC_DISABLED = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL
- + "-xml-rpc-disabled", "3.6.6", "XML-RPC disabled");
-
- public static BugzillaFixture BUGS_HEAD = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_HEAD_URL, //
- "4.3", "");
+ + "-xml-rpc-disabled", "3.6.6", XML_RPC_DISABLED);
public static BugzillaFixture BUGS_4_0 = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_40_URL, //
"4.0.2", "");
+ public static BugzillaFixture BUGS_HEAD = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_HEAD_URL, //
+ "4.3", "");
+
public static BugzillaFixture DEFAULT = BUGS_4_0;
public static final BugzillaFixture[] ALL = new BugzillaFixture[] { BUGS_3_4, BUGS_3_6, BUGS_3_6_XML_RPC_DISABLED,
diff --git a/org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java b/org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java
index 17c694f34..b2e1021d2 100644
--- a/org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java
+++ b/org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java
@@ -109,6 +109,8 @@ public abstract class TestFixture {
private String simpleInfo;
+ private String description;
+
private TestSuite suite;
public TestFixture(String connectorKind, String repositoryUrl) {
@@ -202,6 +204,7 @@ public abstract class TestFixture {
Assert.isNotNull(version);
this.repositoryName = repositoryName;
this.simpleInfo = version;
+ this.description = description;
if (description != null && description.length() > 0) {
this.simpleInfo += "/" + description;
}
@@ -245,4 +248,8 @@ public abstract class TestFixture {
return new HashSet<String>(Arrays.asList(excludeFixtureArray)).contains(getRepositoryUrl());
}
+ public String getDescription() {
+ return description;
+ }
+
}

Back to the top