Attachment 168437 Details for Bug 302654 – corrections

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

[patch] corrections

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

on 2010-05-13 14:43:33 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2010-05-13 14:43:33 EDT

Size: 5.64 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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.55
>diff -u -r1.55 AllBugzillaTests.java
>--- src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java	11 May 2010 20:54:30 -0000	1.55
>+++ src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java	13 May 2010 14:41:18 -0000
>@@ -63,12 +63,14 @@
> 				}
> 				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;
> 	}
>Index: src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java,v
>retrieving revision 1.193
>diff -u -r1.193 BugzillaRepositoryConnectorTest.java
>--- src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java	7 May 2010 20:20:51 -0000	1.193
>+++ src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java	13 May 2010 14:41:18 -0000
>@@ -344,7 +344,7 @@
> //	}
> //
> 	public void testStdWorkflow32() throws Exception {
>-		if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_6_CUSTOM) {
>+		if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_6_CUSTOM_WF) {
> 			doStdWorkflow("3");
> 		}
> 	}
>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.7
>diff -u -r1.7 BugzillaXMLRPCTest.java
>--- src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXMLRPCTest.java	7 May 2010 20:20:50 -0000	1.7
>+++ src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXMLRPCTest.java	13 May 2010 14:41:18 -0000
>@@ -41,7 +41,7 @@
> 
> 	@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 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");
>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.27
>diff -u -r1.27 BugzillaFixture.java
>--- src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java	7 May 2010 20:20:50 -0000	1.27
>+++ src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java	13 May 2010 14:41:18 -0000
>@@ -68,10 +68,6 @@
> 
> 	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 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 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;
>

Actions: View | Diff

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