Attachment #168437 for bug #302654




				}
				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;
	}

Lines 344-350 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java (-1 / +1 lines)
344	// }	344	// }
345	//	345	//
346	public void testStdWorkflow32() throws Exception {	346	public void testStdWorkflow32() throws Exception {
347	if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_6_CUSTOM) {	347	if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_6_CUSTOM_WF) {
348	doStdWorkflow("3");	348	doStdWorkflow("3");
349	}	349	}
350	}	350	}

Lines 68-77 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java (-9 / +11 lines)
68		68
69	public static final String TEST_BUGZILLA_36_URL = getServerUrl("bugs36");	69	public static final String TEST_BUGZILLA_36_URL = getServerUrl("bugs36");
70		70
71	public static final String TEST_BUGZILLA_36_CUSTOM_URL = getServerUrl("bugs36customWF");
72
73	public static final String TEST_BUGZILLA_36_NO_XMLRPC = getServerUrl("bugs36noxmlrpc");
74
75	public static final String TEST_BUGZILLA_HEAD_URL = getServerUrl("bugshead");	71	public static final String TEST_BUGZILLA_HEAD_URL = getServerUrl("bugshead");
76		72
77	public static final String TEST_BUGZILLA_LATEST_URL = TEST_BUGZILLA_36_URL;	73	public static final String TEST_BUGZILLA_LATEST_URL = TEST_BUGZILLA_36_URL;
Lines 101-111 Link Here
101	public static BugzillaFixture BUGS_3_6 = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL, //	97	public static BugzillaFixture BUGS_3_6 = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL, //
102	"3.6", "");	98	"3.6", "");
103		99
104	public static BugzillaFixture BUGS_3_6_CUSTOM = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_CUSTOM_URL, //	100	public static BugzillaFixture BUGS_3_6_CUSTOM_WF = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL
105	"3.6", "CUSTOM-WF");	101	+ "-custom-wf", "3.6", "Custom Workflow");
106		102
107	public static BugzillaFixture BUGS_3_6_NO_XMLRPC = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_NO_XMLRPC, //	103	public static BugzillaFixture BUGS_3_6_CUSTOM_WF_AND_STATUS = new BugzillaFixture(
108	"3.6", "NO-XMLRPC");	104	BugzillaFixture.TEST_BUGZILLA_36_URL + "-custom-wf-and-status", "3.6", "Custom Workflow and Status");
		105
		106	public static BugzillaFixture BUGS_3_6_XML_RPC_DISABLED = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_36_URL
		107	+ "-xml-rpc-disabled", "3.6", "XML-RPC disabled");
109		108
110	public static BugzillaFixture BUGS_HEAD = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_HEAD_URL, //	109	public static BugzillaFixture BUGS_HEAD = new BugzillaFixture(BugzillaFixture.TEST_BUGZILLA_HEAD_URL, //
111	"3.7", "");	110	"3.7", "");
Lines 113-119 Link Here
113	public static BugzillaFixture DEFAULT = BUGS_3_6;	112	public static BugzillaFixture DEFAULT = BUGS_3_6;
114		113
115	public static final BugzillaFixture[] ALL = new BugzillaFixture[] { BUGS_2_22, BUGS_3_0, BUGS_3_2, BUGS_3_4,	114	public static final BugzillaFixture[] ALL = new BugzillaFixture[] { BUGS_2_22, BUGS_3_0, BUGS_3_2, BUGS_3_4,
116	BUGS_3_6, BUGS_3_6_CUSTOM, BUGS_3_6_NO_XMLRPC, BUGS_HEAD };	115	BUGS_3_6, BUGS_HEAD };
		116
		117	public static final BugzillaFixture[] ONLY_3_6_SPECIFIC = new BugzillaFixture[] { BUGS_3_6,
		118	BUGS_3_6_XML_RPC_DISABLED, BUGS_3_6_CUSTOM_WF, BUGS_3_6_CUSTOM_WF_AND_STATUS };
117		119
118	private final String version;	120	private final String version;
119		121

Return to bug 302654

Lines 63-74 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/AllBugzillaTests.java (-3 / +5 lines)
63	}	63	}
64	fixture.add(BugzillaAttachmentHandlerTest.class);	64	fixture.add(BugzillaAttachmentHandlerTest.class);
65	}	65	}
66	if (!fixture.getBugzillaVersion().isSmaller(BugzillaVersion.BUGZILLA_3_6)) {
67	fixture.add(BugzillaXMLRPCTest.class);
68	}
69		66
70	fixture.done();	67	fixture.done();
71	}	68	}
		69	for (BugzillaFixture fixture : BugzillaFixture.ONLY_3_6_SPECIFIC) {
		70	fixture.createSuite(suite);
		71	fixture.add(BugzillaXMLRPCTest.class);
		72	fixture.done();
		73	}
72		74
73	return suite;	75	return suite;
74	}	76	}

Lines 41-47 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaXMLRPCTest.java (-2 / +2 lines)
41		41
42	@SuppressWarnings("unused")	42	@SuppressWarnings("unused")
43	public void testxmlrpc() throws Exception {	43	public void testxmlrpc() throws Exception {
44	if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_6_NO_XMLRPC) {	44	if (BugzillaFixture.current() != BugzillaFixture.BUGS_3_6_XML_RPC_DISABLED) {
45	int uID = bugzillaClient.login();	45	int uID = bugzillaClient.login();
46	String x0 = bugzillaClient.getVersion();	46	String x0 = bugzillaClient.getVersion();
47	HashMap<?, ?> x1 = bugzillaClient.getTime();	47	HashMap<?, ?> x1 = bugzillaClient.getTime();
Lines 64-70 Link Here
64	public void testxmlrpcInstalled() throws Exception {	64	public void testxmlrpcInstalled() throws Exception {
65	int uID = -1;	65	int uID = -1;
66	BugzillaFixture a = BugzillaFixture.current();	66	BugzillaFixture a = BugzillaFixture.current();
67	if (BugzillaFixture.current() == BugzillaFixture.BUGS_3_6_NO_XMLRPC) {	67	if (BugzillaFixture.current() == BugzillaFixture.BUGS_3_6_XML_RPC_DISABLED) {
68	try {	68	try {
69	uID = bugzillaClient.login();	69	uID = bugzillaClient.login();
70	fail("Never reach this! We should get an XmlRpcException");	70	fail("Never reach this! We should get an XmlRpcException");