diff options
author | Frank Becker | 2012-09-07 20:03:58 +0000 |
---|---|---|
committer | Frank Becker | 2012-09-07 20:03:58 +0000 |
commit | 1b9aac0aa26a56dc4c6b8d4427ae6a89d9a63cf5 (patch) | |
tree | 5a0a48a49f52622b303c24a23f4d0f828f69bcaa | |
parent | 81dfe8be8d3ca8de7d2f410537001bc92677c2a7 (diff) | |
download | org.eclipse.mylyn.tasks-1b9aac0aa26a56dc4c6b8d4427ae6a89d9a63cf5.tar.gz org.eclipse.mylyn.tasks-1b9aac0aa26a56dc4c6b8d4427ae6a89d9a63cf5.tar.xz org.eclipse.mylyn.tasks-1b9aac0aa26a56dc4c6b8d4427ae6a89d9a63cf5.zip |
ASSIGNED - bug 388569: upgrade test servers to Bugzilla 4.2.3, 4.0.8,
and 3.6.11
https://bugs.eclipse.org/bugs/show_bug.cgi?id=388569
3 files changed, 15 insertions, 12 deletions
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaClientTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaClientTest.java index 5b1f3c8d6..10194713e 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaClientTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaClientTest.java @@ -64,9 +64,10 @@ public class BugzillaClientTest extends TestCase { public void testRDFProductConfig() throws Exception { RepositoryConfiguration config = client.getRepositoryConfiguration(); assertNotNull(config); - assertEquals(BugzillaFixture.current().getVersion().toUpperCase(), config.getInstallVersion() - .toString() - .toUpperCase()); + assertEquals( + 0, + config.getInstallVersion().compareMajorMinorOnly( + new BugzillaVersion(BugzillaFixture.current().getVersion()))); if (BugzillaFixture.current() == BugzillaFixture.BUGS_3_6_CUSTOM_WF_AND_STATUS) { assertEquals(10, config.getStatusValues().size()); } else if (BugzillaFixture.current().getBugzillaVersion().compareMajorMinorOnly(BugzillaVersion.BUGZILLA_4_0) < 0) { 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 a9800f2fd..3254f9700 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 @@ -647,7 +647,10 @@ public class BugzillaXmlRpcClientTest extends TestCase { } else { IProgressMonitor monitor = new NullProgressMonitor(); String version = bugzillaClient.getVersion(monitor); - assertEquals(BugzillaFixture.current().getVersion().toUpperCase(), version.toUpperCase()); + assertEquals( + 0, + new BugzillaVersion(BugzillaFixture.current().getVersion()).compareMajorMinorOnly(new BugzillaVersion( + version))); } } 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 6083cb62e..341297e35 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 @@ -80,22 +80,22 @@ public class BugzillaFixture extends TestFixture { "3.4.14", ""); public static BugzillaFixture BUGS_3_6 = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL, // - "3.6.11", ""); + "3.6", ""); public static BugzillaFixture BUGS_3_6_CUSTOM_WF = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL - + "-custom-wf", "3.6.11", CUSTOM_WF); + + "-custom-wf", "3.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.11", CUSTOM_WF_AND_STATUS); + BugzillaFixture.TEST_BUGZILLA_36_URL + "-custom-wf-and-status", "3.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.11", XML_RPC_DISABLED); + + "-xml-rpc-disabled", "3.6", XML_RPC_DISABLED); public static BugzillaFixture BUGS_4_0 = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_40_URL, // - "4.0.8", ""); + "4.0", ""); public static BugzillaFixture BUGS_4_2 = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_42_URL, // - "4.2.3", ""); + "4.2", ""); public static BugzillaFixture BUGS_HEAD = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_HEAD_URL, // "4.5", ""); @@ -103,7 +103,7 @@ public class BugzillaFixture extends TestFixture { public static BugzillaFixture DEFAULT = BUGS_4_2; public static final BugzillaFixture[] ALL = new BugzillaFixture[] { BUGS_3_4, BUGS_3_6, BUGS_3_6_XML_RPC_DISABLED, - BUGS_3_6_CUSTOM_WF, BUGS_3_6_CUSTOM_WF_AND_STATUS, BUGS_4_0, BUGS_4_2 /*, BUGS_HEAD*/}; + BUGS_3_6_CUSTOM_WF, BUGS_3_6_CUSTOM_WF_AND_STATUS, BUGS_4_0, BUGS_4_2, BUGS_HEAD }; private final String version; @@ -167,7 +167,6 @@ public class BugzillaFixture extends TestFixture { public BugzillaClient client(AbstractWebLocation location, String encoding) throws CoreException { TaskRepository taskRepository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND, location.getUrl()); - String repositoryURL = taskRepository.getUrl(); String filepath = "testdata/repository/" + getRepositoryName(location.getUrl()) + "/DesciptorFile.txt"; try { File file = BugzillaFixture.getFile(filepath); |