Attachment 166121 Details for Bug 302654 – commited patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] commited patch

302654.txt (text/plain), 9.81 KB, created by Frank Becker

on 2010-04-26 15:21:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2010-04-26 15:21:52 EDT

Size: 9.81 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.core
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaVersion.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaVersion.java,v
>retrieving revision 1.10
>diff -u -r1.10 BugzillaVersion.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaVersion.java	23 Apr 2010 18:57:56 -0000	1.10
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaVersion.java	26 Apr 2010 19:16:18 -0000
>@@ -89,6 +89,10 @@
> 		return compareTo(v) <= 0;
> 	}
> 
>+	public boolean isSmaller(BugzillaVersion v) {
>+		return compareTo(v) < 0;
>+	}
>+
> 	public int compareTo(BugzillaVersion v) {
> 		if (major < v.major) {
> 			return -1;
>#P org.eclipse.mylyn.bugzilla.tests
>Index: src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java,v
>retrieving revision 1.53
>diff -u -r1.53 AllBugzillaTests.java
>--- src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java	17 Feb 2010 01:54:45 -0000	1.53
>+++ src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java	26 Apr 2010 19:16:21 -0000
>@@ -14,6 +14,7 @@
> import junit.framework.Test;
> import junit.framework.TestSuite;
> 
>+import org.eclipse.mylyn.bugzilla.tests.core.BugzillaXMLRPCTest;
> import org.eclipse.mylyn.bugzilla.tests.support.BugzillaFixture;
> import org.eclipse.mylyn.bugzilla.tests.ui.BugzillaRepositorySettingsPageTest;
> import org.eclipse.mylyn.bugzilla.tests.ui.BugzillaSearchPageTest;
>@@ -60,6 +61,10 @@
> 				}
> 				fixture.add(BugzillaAttachmentHandlerTest.class);
> 			}
>+			if (!fixture.getBugzillaVersion().isSmaller(BugzillaVersion.BUGZILLA_3_6)) {
>+				fixture.add(BugzillaXMLRPCTest.class);
>+			}
>+
> 			fixture.done();
> 		}
> 
>Index: src/org/eclipse/mylyn/bugzilla/tests/BugzillaTestConstants.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTestConstants.java,v
>retrieving revision 1.3
>diff -u -r1.3 BugzillaTestConstants.java
>--- src/org/eclipse/mylyn/bugzilla/tests/BugzillaTestConstants.java	13 Dec 2009 22:07:49 -0000	1.3
>+++ src/org/eclipse/mylyn/bugzilla/tests/BugzillaTestConstants.java	26 Apr 2010 19:16:21 -0000
>@@ -39,9 +39,11 @@
> 
> 	public static final String TEST_BUGZILLA_34_URL = getServerUrl("bugs34");
> 
>+	public static final String TEST_BUGZILLA_36_URL = getServerUrl("bugs36");
>+
> 	public static final String TEST_BUGZILLA_HEAD_URL = getServerUrl("bugshead");
> 
>-	public static final String TEST_BUGZILLA_LATEST_URL = TEST_BUGZILLA_34_URL;
>+	public static final String TEST_BUGZILLA_LATEST_URL = TEST_BUGZILLA_36_URL;
> 
> 	private static final String getServerUrl(String version) {
> 		return "http://" + SERVER + "/" + version;
>Index: src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaClientTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaClientTest.java,v
>retrieving revision 1.11
>diff -u -r1.11 BugzillaClientTest.java
>--- src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaClientTest.java	16 Apr 2010 21:06:47 -0000	1.11
>+++ src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaClientTest.java	26 Apr 2010 19:16:21 -0000
>@@ -188,13 +188,13 @@
> 	}
> 
> 	public void testLeadingZeros() throws Exception {
>-		String taskNumber = "0010";
>+		String taskNumber = "0002";
> 		TaskData taskData = BugzillaFixture.current().getTask(taskNumber, client);
> 		assertNotNull(taskData);
> 		assertNotNull(taskData);
> 		TaskAttribute idAttribute = taskData.getRoot().getAttribute(BugzillaAttribute.BUG_ID.getKey());
> 		assertNotNull(idAttribute);
>-		assertEquals("10", idAttribute.getValue());
>+		assertEquals("2", idAttribute.getValue());
> 	}
> 
> }
>Index: src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaCustomFieldsTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaCustomFieldsTest.java,v
>retrieving revision 1.1
>diff -u -r1.1 BugzillaCustomFieldsTest.java
>--- src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaCustomFieldsTest.java	29 Jan 2010 22:38:43 -0000	1.1
>+++ src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaCustomFieldsTest.java	26 Apr 2010 19:16:21 -0000
>@@ -50,7 +50,7 @@
> 
> 	public void testCustomAttributes() throws Exception {
> 
>-		String taskNumber = "1";
>+		String taskNumber = "2";
> 		TaskData taskData = BugzillaFixture.current().getTask(taskNumber, client);
> 		assertNotNull(taskData);
> 		TaskMapper mapper = new TaskMapper(taskData);
>Index: src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaFlagsTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaFlagsTest.java,v
>retrieving revision 1.1
>diff -u -r1.1 BugzillaFlagsTest.java
>--- src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaFlagsTest.java	29 Jan 2010 22:38:43 -0000	1.1
>+++ src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaFlagsTest.java	26 Apr 2010 19:16:21 -0000
>@@ -40,7 +40,7 @@
> 
> 	@SuppressWarnings("null")
> 	public void testFlags() throws Exception {
>-		String taskNumber = "10";
>+		String taskNumber = "2";
> 		TaskData taskData = BugzillaFixture.current().getTask(taskNumber, client);
> 		assertNotNull(taskData);
> 
>Index: src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXMLRPCTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXMLRPCTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 BugzillaXMLRPCTest.java
>--- src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXMLRPCTest.java	22 Apr 2010 16:57:03 -0000	1.4
>+++ src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXMLRPCTest.java	26 Apr 2010 19:16:21 -0000
>@@ -14,23 +14,32 @@
> import java.util.Date;
> import java.util.HashMap;
> 
>-import org.eclipse.mylyn.bugzilla.tests.BugzillaTestConstants;
>+import junit.framework.TestCase;
>+
>+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.service.BugzillaXmlRpcClient;
> 
>-public class BugzillaXMLRPCTest {
>+/**
>+ * Tests should be run against Bugzilla 3.6 or greater
>+ * 
>+ * @author Frank Becker
>+ */
>+
>+public class BugzillaXMLRPCTest extends TestCase {
> 	private BugzillaXmlRpcClient bugzillaClient;
> 
> //	private static String TEST_REPO = "http://.../Bugzilla36noRPC";
>+//	private static String TEST_REPO = "http://mylyn.eclipse.org/bugs36";
> 
>-//	private static String TEST_REPO = "http://.../Bugzilla36";
>-
>+	@Override
> 	public void setUp() throws Exception {
>-//		WebLocation webLocation = new WebLocation(TEST_REPO + "/xmlrpc.cgi");
> //		webLocation.setCredentials(AuthenticationType.REPOSITORY, "user", "password");
> //		webLocation.setCredentials(AuthenticationType.HTTP, "user", "password");
>-		WebLocation webLocation = new WebLocation(BugzillaTestConstants.TEST_BUGZILLA_HEAD_URL + "/xmlrpc.cgi");
>+//		WebLocation webLocation = new WebLocation(BugzillaTestConstants.TEST_BUGZILLA_HEAD_URL + "/xmlrpc.cgi");
>+
>+		WebLocation webLocation = new WebLocation(BugzillaFixture.current().getRepositoryUrl() + "/xmlrpc.cgi");
> 		webLocation.setCredentials(AuthenticationType.REPOSITORY, "tests@mylyn.eclipse.org", "mylyntest");
> 		bugzillaClient = new BugzillaXmlRpcClient(webLocation);
> 		bugzillaClient.setContentTypeCheckingEnabled(true);
>@@ -44,8 +53,8 @@
> 		Date x2 = bugzillaClient.getDBTime();
> 		Date x3 = bugzillaClient.getWebTime();
> 		Object[] xx0 = bugzillaClient.getUserInfoFromIDs(new Integer[] { 1, 2 });
>-		Object[] xx1 = bugzillaClient.getUserInfoFromNames(new String[] { "Frank@Frank-Becker.de" });
>-		Object[] xx2 = bugzillaClient.getUserInfoWithMatch(new String[] { "eck" });
>+		Object[] xx1 = bugzillaClient.getUserInfoFromNames(new String[] { "tests@mylyn.eclipse.org" });
>+		Object[] xx2 = bugzillaClient.getUserInfoWithMatch(new String[] { "est" });
> 		Object[] xx3 = bugzillaClient.getAllFields();
> 		Object[] xx4 = bugzillaClient.getFieldsWithNames(new String[] { "qa_contact" });
> 		Object[] xx5 = bugzillaClient.getFieldsWithIDs(new Integer[] { 12, 18 });
>Index: src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java,v
>retrieving revision 1.23
>diff -u -r1.23 BugzillaFixture.java
>--- src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java	11 Feb 2010 17:15:57 -0000	1.23
>+++ src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java	26 Apr 2010 19:16:21 -0000
>@@ -91,13 +91,16 @@
> 	public static BugzillaFixture BUGS_3_4 = new BugzillaFixture(BugzillaTestConstants.TEST_BUGZILLA_34_URL, //
> 			"3.4.4", "");
> 
>+	public static BugzillaFixture BUGS_3_6 = new BugzillaFixture(BugzillaTestConstants.TEST_BUGZILLA_36_URL, //
>+			"3.6", "");
>+
> 	public static BugzillaFixture BUGS_HEAD = new BugzillaFixture(BugzillaTestConstants.TEST_BUGZILLA_HEAD_URL, //
>-			"3.5.2+", "");
>+			"3.7", "");
> 
>-	public static BugzillaFixture DEFAULT = BUGS_3_4;
>+	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_HEAD };
>+			BUGS_3_6, BUGS_HEAD };
> 
> 	private final String version;
>

Actions: View | Diff

Attachments on bug 302654: 159063 | 159064 | 166121 | 166122 | 166129 | 166130 | 167561 | 167562 | 168437 | 168438