NEW - bug 165498: [api] Create unified abstract support for task submission to repository

https://bugs.eclipse.org/bugs/show_bug.cgi?id=165498

6 files changed, 53 insertions, 49 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
index 7c2323778..25a3284c1 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
@@ -23,21 +23,17 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.security.auth.login.LoginException;
-
 import org.apache.commons.httpclient.params.HttpConnectionParams;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.mylar.context.core.ContextCorePlugin;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaClient;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin;
-import org.eclipse.mylar.internal.bugzilla.core.BugzillaException;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaQueryHit;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaReportElement;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryQuery;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaTask;
 import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants;
-import org.eclipse.mylar.internal.bugzilla.core.PossibleBugzillaFailureException;
 import org.eclipse.mylar.internal.bugzilla.core.RepositoryConfiguration;
 import org.eclipse.mylar.internal.tasks.core.SslProtocolSocketFactory;
 import org.eclipse.mylar.tasks.core.AbstractQueryHit;
@@ -140,8 +136,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
 		fail("Should have failed due to invalid userid and password.");
 	}
 
-	public void testSynchronize() throws InterruptedException, LoginException, BugzillaException,
-			PossibleBugzillaFailureException, CoreException {
+	public void testSynchronize() throws CoreException {
 		init222();
 
 		// Get the task
@@ -287,7 +282,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
 
 	public void testAttachToExistingReport() throws Exception {
 		init222();
-		int bugId = 31;
+		int bugId = 32;
 		String taskNumber = "" + bugId;
 		BugzillaTask task = (BugzillaTask) connector.createTaskFromExistingKey(repository, taskNumber);
 		TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null);
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
index a628fba39..2b61a8080 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
@@ -49,6 +49,7 @@ public class DuplicateDetetionTest extends TestCase {
 				.getTaskDataManager().getNewRepositoryTaskId());
 		model.setDescription(stackTrace);
 		model.setHasLocalChanges(true);
+		model.setNew(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
 		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
@@ -67,6 +68,7 @@ public class DuplicateDetetionTest extends TestCase {
 				.getTaskDataManager().getNewRepositoryTaskId());
 		model.setDescription(fakeStackTrace);
 		model.setHasLocalChanges(true);
+		model.setNew(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
 		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
@@ -89,6 +91,7 @@ public class DuplicateDetetionTest extends TestCase {
 
 		model.setDescription(extraText + "\n" + stackTrace + "\n");
 		model.setHasLocalChanges(true);
+		model.setNew(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
 		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
@@ -119,6 +122,7 @@ public class DuplicateDetetionTest extends TestCase {
 
 		model.setDescription(stackTrace);
 		model.setHasLocalChanges(true);
+		model.setNew(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
 		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
@@ -148,6 +152,7 @@ public class DuplicateDetetionTest extends TestCase {
 
 		model.setDescription(stackTrace);
 		model.setHasLocalChanges(true);
+		model.setNew(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
 		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
@@ -173,6 +178,7 @@ public class DuplicateDetetionTest extends TestCase {
 
 		model.setDescription(stackTrace);
 		model.setHasLocalChanges(true);
+		model.setNew(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
 		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
@@ -197,6 +203,7 @@ public class DuplicateDetetionTest extends TestCase {
 
 		model.setDescription(stackTrace);
 		model.setHasLocalChanges(true);
+		model.setNew(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
 		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
@@ -223,6 +230,7 @@ public class DuplicateDetetionTest extends TestCase {
 
 		model.setDescription(stackTrace);
 		model.setHasLocalChanges(true);
+		model.setNew(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
 		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
@@ -248,6 +256,7 @@ public class DuplicateDetetionTest extends TestCase {
 
 		model.setDescription(stackTrace);
 		model.setHasLocalChanges(true);
+		model.setNew(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
 		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java
index a27cf7480..a6a66fcf2 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java
@@ -11,26 +11,17 @@
 
 package org.eclipse.mylar.bugzilla.tests;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.security.GeneralSecurityException;
-import java.text.ParseException;
-
-import javax.security.auth.login.LoginException;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaClient;
-import org.eclipse.mylar.internal.bugzilla.core.BugzillaException;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaReportElement;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaTask;
-import org.eclipse.mylar.internal.bugzilla.core.PossibleBugzillaFailureException;
 
 /**
  * @author Mik Kersten
  */
 public class EncodingTest extends AbstractBugzillaTest {
 
-	public void testEncodingSetting() throws LoginException, IOException, ParseException {
+	public void testEncodingSetting()  {
 
 		String charset = BugzillaClient.getCharsetFromString("text/html; charset=UTF-8");
 		assertEquals("UTF-8", charset);
@@ -69,7 +60,7 @@ public class EncodingTest extends AbstractBugzillaTest {
 		assertFalse(task.getSummary().equals("\u05D0"));
 	}
 	
-	public void testProperEncodingUponPost() throws MalformedURLException, IOException, BugzillaException, PossibleBugzillaFailureException, GeneralSecurityException, CoreException {
+	public void testProperEncodingUponPost() throws CoreException {
 		init222();
 		repository.setCharacterEncoding("UTF-8");
 		BugzillaTask task = (BugzillaTask) connector.createTaskFromExistingKey(repository, "57");
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java
index da58b598c..a6b04baab 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java
@@ -13,16 +13,15 @@ package org.eclipse.mylar.bugzilla.tests;
 
 import java.net.UnknownHostException;
 
-import javax.security.auth.login.LoginException;
-
 import junit.framework.TestCase;
 
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.mylar.context.tests.support.MylarTestUtils;
 import org.eclipse.mylar.context.tests.support.MylarTestUtils.Credentials;
+import org.eclipse.mylar.internal.bugzilla.core.BugzillaClient;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaClientFactory;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin;
-import org.eclipse.mylar.internal.bugzilla.core.BugzillaClient;
 import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylar.internal.bugzilla.ui.tasklist.BugzillaRepositorySettingsPage;
 import org.eclipse.mylar.internal.tasks.ui.wizards.EditRepositoryWizard;
@@ -67,9 +66,10 @@ public class RepositoryEditorWizardTest extends TestCase {
 		page.setPassword("bogus");
 		try {
 			BugzillaClient client = BugzillaClientFactory.createClient(page.getServerUrl(), page.getUserName(), page
-					.getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil.getSystemProxy(), page.getCharacterEncoding());
+					.getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil
+					.getSystemProxy(), page.getCharacterEncoding());
 			client.validate();
-		} catch (LoginException e) {
+		} catch (CoreException e) {
 			return;
 		}
 		fail("LoginException didn't occur!");
@@ -83,9 +83,10 @@ public class RepositoryEditorWizardTest extends TestCase {
 		page.setUserId("bogus");
 		try {
 			BugzillaClient client = BugzillaClientFactory.createClient(page.getServerUrl(), page.getUserName(), page
-					.getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil.getSystemProxy(), page.getCharacterEncoding());
+					.getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil
+					.getSystemProxy(), page.getCharacterEncoding());
 			client.validate();
-		} catch (LoginException e) {
+		} catch (CoreException e) {
 			return;
 		}
 		fail("LoginException didn't occur!");
@@ -99,7 +100,8 @@ public class RepositoryEditorWizardTest extends TestCase {
 		page.setUrl("http://invalid");
 		try {
 			BugzillaClient client = BugzillaClientFactory.createClient(page.getServerUrl(), page.getUserName(), page
-					.getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil.getSystemProxy(), page.getCharacterEncoding());
+					.getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil
+					.getSystemProxy(), page.getCharacterEncoding());
 			client.validate();
 		} catch (UnknownHostException e) {
 			return;
@@ -108,18 +110,22 @@ public class RepositoryEditorWizardTest extends TestCase {
 	}
 
 	// TODO: Test locking up?
-//	public void testAutoVersion() throws Exception {		
-//		repository.setVersion(BugzillaRepositorySettingsPage.LABEL_AUTOMATIC_VERSION);
-//		EditRepositoryWizard wizard = new EditRepositoryWizard(repository);
-//		WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getDisplay().getActiveShell(), wizard);
-//		dialog.create();
-//		BugzillaRepositorySettingsPage page = (BugzillaRepositorySettingsPage) wizard.getSettingsPage();
-//		page.setTesting(true);
-//		assertEquals(BugzillaRepositorySettingsPage.LABEL_AUTOMATIC_VERSION, page.getVersion());
-//		page.validateSettings();
-//		assertEquals("2.22", page.getVersion());
-//	}
-	
+	// public void testAutoVersion() throws Exception {
+	// repository.setVersion(BugzillaRepositorySettingsPage.LABEL_AUTOMATIC_VERSION);
+	// EditRepositoryWizard wizard = new EditRepositoryWizard(repository);
+	// WizardDialog dialog = new
+	// WizardDialog(PlatformUI.getWorkbench().getDisplay().getActiveShell(),
+	// wizard);
+	// dialog.create();
+	// BugzillaRepositorySettingsPage page = (BugzillaRepositorySettingsPage)
+	// wizard.getSettingsPage();
+	// page.setTesting(true);
+	// assertEquals(BugzillaRepositorySettingsPage.LABEL_AUTOMATIC_VERSION,
+	// page.getVersion());
+	// page.validateSettings();
+	// assertEquals("2.22", page.getVersion());
+	// }
+
 	public void testPersistChangeOfUrl() throws Exception {
 		assertEquals(1, manager.getAllRepositories().size());
 		String tempUid = repository.getUserName();
@@ -129,7 +135,8 @@ public class RepositoryEditorWizardTest extends TestCase {
 		dialog.create();
 		BugzillaRepositorySettingsPage page = (BugzillaRepositorySettingsPage) wizard.getSettingsPage();
 		BugzillaClient client = BugzillaClientFactory.createClient(page.getServerUrl(), page.getUserName(), page
-				.getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil.getSystemProxy(), page.getCharacterEncoding());
+				.getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil.getSystemProxy(),
+				page.getCharacterEncoding());
 		client.validate();
 		page.setUrl(IBugzillaConstants.TEST_BUGZILLA_218_URL);
 		wizard.performFinish();
@@ -148,7 +155,8 @@ public class RepositoryEditorWizardTest extends TestCase {
 		dialog.create();
 		BugzillaRepositorySettingsPage page = (BugzillaRepositorySettingsPage) wizard.getSettingsPage();
 		BugzillaClient client = BugzillaClientFactory.createClient(page.getServerUrl(), page.getUserName(), page
-				.getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil.getSystemProxy(), page.getCharacterEncoding());
+				.getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil.getSystemProxy(),
+				page.getCharacterEncoding());
 		client.validate();
 		page.setUserId("bogus");
 		wizard.performFinish();
@@ -162,9 +170,10 @@ public class RepositoryEditorWizardTest extends TestCase {
 		page = (BugzillaRepositorySettingsPage) wizard.getSettingsPage();
 		try {
 			client = BugzillaClientFactory.createClient(page.getServerUrl(), page.getUserName(), page.getPassword(),
-					page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil.getSystemProxy(), page.getCharacterEncoding());
+					page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil.getSystemProxy(), page
+							.getCharacterEncoding());
 			client.validate();
-		} catch (LoginException e) {
+		} catch (CoreException e) {
 			return;
 		}
 		fail("LoginException didn't occur!");
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java
index e40ebc135..11daebc91 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java
@@ -11,7 +11,6 @@
 
 package org.eclipse.mylar.bugzilla.tests;
 
-
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.CoreException;
@@ -64,9 +63,9 @@ public class RepositoryReportFactoryTest extends TestCase {
 			repository.setAuthenticationCredentials("invalid", "invalid");
 			init(bugid);
 		} catch (CoreException e) {
-			errorMessage = e.getStatus().getException().getMessage();
+			errorMessage = e.getStatus().getMessage();
 		}
-		assertEquals("Invalid credentials.", errorMessage);
+		assertTrue(errorMessage.startsWith("Unable to login"));
 		repository.flushAuthenticationCredentials();
 	}
 
@@ -83,9 +82,9 @@ public class RepositoryReportFactoryTest extends TestCase {
 			connector.getClientManager().repositoryAdded(repository);
 			init(bugid);
 		} catch (CoreException e) {
-			errorMessage = e.getStatus().getException().getMessage();
+			errorMessage = e.getStatus().getMessage();
 		}
-		assertEquals(IBugzillaConstants.ERROR_MSG_INVALID_BUG_ID, errorMessage);
+		assertTrue(errorMessage.startsWith("Repository error from"));
 	}
 
 	// public void testReadingReport() throws Exception {
@@ -372,7 +371,7 @@ public class RepositoryReportFactoryTest extends TestCase {
 
 	public void testTimeTracking222() throws Exception {
 		setRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL);
-		RepositoryTaskData report = init("11");		
+		RepositoryTaskData report = init("11");
 		assertEquals("7.50", report.getAttribute(BugzillaReportElement.ESTIMATED_TIME.getKeyString()).getValue());
 		assertEquals("4.00", report.getAttribute(BugzillaReportElement.ACTUAL_TIME.getKeyString()).getValue());
 		assertEquals("3.00", report.getAttribute(BugzillaReportElement.REMAINING_TIME.getKeyString()).getValue());
@@ -409,7 +408,7 @@ public class RepositoryReportFactoryTest extends TestCase {
 
 	public void testTimeTracking218() throws Exception {
 		setRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_218_URL);
-		RepositoryTaskData report = init("19");		
+		RepositoryTaskData report = init("19");
 		assertEquals("7.50", report.getAttribute(BugzillaReportElement.ESTIMATED_TIME.getKeyString()).getValue());
 		assertEquals("1.00", report.getAttribute(BugzillaReportElement.ACTUAL_TIME.getKeyString()).getValue());
 		assertEquals("3.00", report.getAttribute(BugzillaReportElement.REMAINING_TIME.getKeyString()).getValue());
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
index 431175152..2437dd3b0 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
@@ -59,6 +59,7 @@ public class TaskEditorTest extends TestCase {
 
 		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
 				.getTaskDataManager().getNewRepositoryTaskId());
+		model.setNew(true);
 		
 		NewTaskEditorInput editorInput = new NewTaskEditorInput(repository, model);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();