Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2012-07-28 15:28:58 -0400
committerFrank Becker2012-07-28 15:28:58 -0400
commiteff09247f39e12c1aa0cc13a0f07c3ecb41e6a96 (patch)
tree52aa232577ed78c31a67d5aa56eed88ba8966a87 /org.eclipse.mylyn.bugzilla.tests/src
parent17ca9f7a4fce6a601da1ad7be38e4815e017899f (diff)
downloadorg.eclipse.mylyn.tasks-eff09247f39e12c1aa0cc13a0f07c3ecb41e6a96.tar.gz
org.eclipse.mylyn.tasks-eff09247f39e12c1aa0cc13a0f07c3ecb41e6a96.tar.xz
org.eclipse.mylyn.tasks-eff09247f39e12c1aa0cc13a0f07c3ecb41e6a96.zip
NEW - bug 386143: upgrade test servers to Bugzilla 4.2.2, 4.0.7, and
3.6.10 https://bugs.eclipse.org/bugs/show_bug.cgi?id=386143
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.tests/src')
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXmlRpcClientTest.java16
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java14
2 files changed, 19 insertions, 11 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 1fc0acf8f..a9800f2fd 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
@@ -722,12 +722,20 @@ public class BugzillaXmlRpcClientTest extends TestCase {
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"));
+ assertTrue(((HashMap<String, Integer>) productDetails[0]).get("id") == 1
+ || ((HashMap<String, Integer>) productDetails[1]).get("id") == 1);
+ assertTrue(((HashMap<String, Integer>) productDetails[0]).get("id") == 3
+ || ((HashMap<String, Integer>) productDetails[1]).get("id") == 3);
+ int idx = ((HashMap<String, Integer>) productDetails[0]).get("id") == 1 ? 0 : 1;
+
+ assertEquals(((Integer) 1), ((HashMap<String, Integer>) productDetails[idx]).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"));
+ ((HashMap<String, String>) productDetails[idx]).get("description"));
+ idx = (idx + 1) % 2;
+ assertEquals(((Integer) 3), ((HashMap<String, Integer>) productDetails[idx]).get("id"));
+ assertEquals("Product for manual testing",
+ ((HashMap<String, String>) productDetails[idx]).get("description"));
}
}
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 4ab00a749..1682854ba 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
@@ -79,25 +79,25 @@ public class BugzillaFixture extends TestFixture {
"3.4.14", "");
public static BugzillaFixture BUGS_3_6 = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL, //
- "3.6.9", "");
+ "3.6.10", "");
public static BugzillaFixture BUGS_3_6_CUSTOM_WF = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL
- + "-custom-wf", "3.6.9", CUSTOM_WF);
+ + "-custom-wf", "3.6.10", 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.9", CUSTOM_WF_AND_STATUS);
+ BugzillaFixture.TEST_BUGZILLA_36_URL + "-custom-wf-and-status", "3.6.10", 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.9", XML_RPC_DISABLED);
+ + "-xml-rpc-disabled", "3.6.10", XML_RPC_DISABLED);
public static BugzillaFixture BUGS_4_0 = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_40_URL, //
- "4.0.6", "");
+ "4.0.7", "");
public static BugzillaFixture BUGS_4_2 = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_42_URL, //
- "4.2.1", "");
+ "4.2.2", "");
public static BugzillaFixture BUGS_HEAD = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_HEAD_URL, //
- "4.3.1+", "");
+ "4.3.2+", "");
public static BugzillaFixture DEFAULT = BUGS_4_2;

Back to the top