Attachment #101414 for bug #229655

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

View | Details | Raw Unified | Return to bug 229655
Collapse All | Expand All




	@Override
	protected void setUp() throws Exception {
		super.setUp();
		repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL);

	}


		String stackTrace = "java.lang.NullPointerException\nat jeff.testing.stack.trace.functionality(jeff.java:481)";

		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(),
				BugzillaCorePlugin.CONNECTOR_KIND, repository.getRepositoryUrl(),
				TasksUiPlugin.getTaskDataStorageManager().getNewRepositoryTaskId());
		model.setDescription(stackTrace);
		model.setNew(true);

	public void testNoStackTrace() throws Exception {
		String fakeStackTrace = "this is not really a stacktrace";
		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(),
				BugzillaCorePlugin.CONNECTOR_KIND, repository.getRepositoryUrl(),
				TasksUiPlugin.getTaskDataStorageManager().getNewRepositoryTaskId());
		model.setDescription(fakeStackTrace);
		model.setNew(true);

		String extraText = "\nExtra text that isnt' part of the stack trace java:";

		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(),
				BugzillaCorePlugin.CONNECTOR_KIND, repository.getRepositoryUrl(),
				TasksUiPlugin.getTaskDataStorageManager().getNewRepositoryTaskId());

		model.setDescription(extraText + "\n" + stackTrace + "\n");

				+ "at org.eclipse.jdt.internal.core.JavaElement\n.getURLContents(JavaElement.java:734)";

		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(),
				BugzillaCorePlugin.CONNECTOR_KIND, repository.getRepositoryUrl(),
				TasksUiPlugin.getTaskDataStorageManager().getNewRepositoryTaskId());

		model.setDescription(stackTrace);

				+ "     at org.eclipse.jdt.internal.core.JavaElement.getURLContents(JavaElement.java:734)";

		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(),
				BugzillaCorePlugin.CONNECTOR_KIND, repository.getRepositoryUrl(),
				TasksUiPlugin.getTaskDataStorageManager().getNewRepositoryTaskId());

		model.setDescription(stackTrace);

				+ "	   at gnu.java.lang.MainThread.run() (/usr/lib/libgcj.so.6.0.0)";

		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(),
				BugzillaCorePlugin.CONNECTOR_KIND, repository.getRepositoryUrl(),
				TasksUiPlugin.getTaskDataStorageManager().getNewRepositoryTaskId());

		model.setDescription(stackTrace);

				+ "	at java.lang.reflect.Method.Invoke (Method.java)";

		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(),
				BugzillaCorePlugin.CONNECTOR_KIND, repository.getRepositoryUrl(),
				TasksUiPlugin.getTaskDataStorageManager().getNewRepositoryTaskId());

		model.setDescription(stackTrace);

				+ "	at java/util/logging/LogManager.readConfiguration(L:555)";

		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(),
				BugzillaCorePlugin.CONNECTOR_KIND, repository.getRepositoryUrl(),
				TasksUiPlugin.getTaskDataStorageManager().getNewRepositoryTaskId());

		model.setDescription(stackTrace);

				+ "	   at java.lang.VirtualMachine.main (VirtualMachine.java:108)";

		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(),
				BugzillaCorePlugin.CONNECTOR_KIND, repository.getRepositoryUrl(),
				TasksUiPlugin.getTaskDataStorageManager().getNewRepositoryTaskId());

		model.setDescription(stackTrace);




	public void testPlatformOptions() throws Exception {

		RepositoryTaskData newReport = new RepositoryTaskData(new BugzillaAttributeFactory(),
				BugzillaCorePlugin.CONNECTOR_KIND, IBugzillaConstants.TEST_BUGZILLA_220_URL, "1");

		TaskRepository repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND,
				IBugzillaConstants.TEST_BUGZILLA_220_URL);
		AbstractLegacyRepositoryConnector connector = (AbstractLegacyRepositoryConnector) TasksUiPlugin.getRepositoryManager()
				.getRepositoryConnector(repository.getConnectorKind());


		String os = Platform.getOS();
		if (os.equals("win32")) {
			assertEquals("Windows", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
		} else if (os.equals("solaris")) {
			assertEquals("Solaris", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
		} else if (os.equals("qnx")) {
			assertEquals("QNX-Photon", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
		} else if (os.equals("macosx")) {
			assertEquals("Mac OS", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
		} else if (os.equals("linux")) {
			assertEquals("Linux", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
		} else if (os.equals("hpux")) {
			assertEquals("HP-UX", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
		} else if (os.equals("aix")) {
			assertEquals("AIX", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
		}

		String platform = Platform.getOSArch();
		if (platform.equals("x86")) {
			if (os.equals("macosx")) {
				assertEquals("Macintosh", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey())
						.getValue());
			} else {
				assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey()).getValue());
			}
		} else if (platform.equals("x86_64")) {
			assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey()).getValue());
		} else if (platform.equals("ia64")) {
			assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey()).getValue());
		} else if (platform.equals("ia64_32")) {
			assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey()).getValue());
		} else if (platform.equals("sparc")) {
			assertEquals("Sun", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey()).getValue());
		} else if (platform.equals("ppc")) {
			if (os.equals("macosx")) {
				assertEquals("Macintosh", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey())
						.getValue());
			} else {
				assertEquals("Power", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey())
						.getValue());
			}
		}




		super.setUp();
		manager = TasksUiPlugin.getRepositoryManager();
		manager.clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath());
		repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL);
		Credentials credentials = TestUtil.readCredentials();
		repository.setAuthenticationCredentials(credentials.username, credentials.password);
		repository.setAnonymous(false);


	private BugzillaClient createClient(String hostUrl, String username, String password, String htAuthUser,
			String htAuthPass, String encoding) throws MalformedURLException {
		TaskRepository taskRepository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND, hostUrl);

		AuthenticationCredentials credentials = new AuthenticationCredentials(username, password);
		taskRepository.setCredentials(AuthenticationType.REPOSITORY, credentials, false);

		page.setUrl(IBugzillaConstants.TEST_BUGZILLA_218_URL);
		wizard.performFinish();
		assertEquals(1, manager.getAllRepositories().size());
		TaskRepository repositoryTest = manager.getRepository(BugzillaCorePlugin.CONNECTOR_KIND,
				IBugzillaConstants.TEST_BUGZILLA_218_URL);
		assertNotNull(repositoryTest);
		assertEquals(tempUid, repositoryTest.getUserName());

		page.setUserId("bogus");
		wizard.performFinish();
		assertEquals(1, manager.getAllRepositories().size());
		TaskRepository repositoryTest = manager.getRepository(BugzillaCorePlugin.CONNECTOR_KIND,
				IBugzillaConstants.TEST_BUGZILLA_222_URL);
		assertNotNull(repositoryTest);
		wizard = new EditRepositoryWizard(repositoryTest);

Lines 43-49 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/BugzillaProductParserTest.java (-1 / +1 lines)
43	}	43	}
44		44
45	private TaskRepository setRepository(String url) {	45	private TaskRepository setRepository(String url) {
46	repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, url);	46	repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND, url);
47	Credentials credentials = TestUtil.readCredentials();	47	Credentials credentials = TestUtil.readCredentials();
48	repository.setAuthenticationCredentials(credentials.username, credentials.password);	48	repository.setAuthenticationCredentials(credentials.username, credentials.password);
49	return repository;	49	return repository;




		super.setUp();
		TasksUiPlugin.getRepositoryManager().clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath());
		assertEquals(NUM_REPOSITORIES, TasksUiPlugin.getRepositoryManager().getRepositories(
				BugzillaCorePlugin.CONNECTOR_KIND).size());
	}

	@Override

// }

	public void testSearching218() throws Exception {
		TaskRepository repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND,
				IBugzillaConstants.TEST_BUGZILLA_218_URL);
		repository.setVersion(IBugzillaConstants.BugzillaServerVersion.SERVER_218.toString());
		TasksUiPlugin.getRepositoryManager().addRepository(repository);

	}

	public void testSearching220() throws Exception {
		TaskRepository repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND,
				IBugzillaConstants.TEST_BUGZILLA_220_URL);
		repository.setVersion(IBugzillaConstants.BugzillaServerVersion.SERVER_220.toString());
		TasksUiPlugin.getRepositoryManager().addRepository(repository);

	}

	public void testSearching2201() throws Exception {
		TaskRepository repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND,
				IBugzillaConstants.TEST_BUGZILLA_2201_URL);
		repository.setVersion(IBugzillaConstants.BugzillaServerVersion.SERVER_220.toString());
		TasksUiPlugin.getRepositoryManager().addRepository(repository);

	}

	public void testSearching222() throws Exception {
		TaskRepository repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND,
				IBugzillaConstants.TEST_BUGZILLA_222_URL);
		repository.setVersion(IBugzillaConstants.BugzillaServerVersion.SERVER_222.toString());
		TasksUiPlugin.getRepositoryManager().addRepository(repository);

	@SuppressWarnings("deprecation")
	private Set<AbstractTask> runQuery(String repositoryURL, String SearchString) throws Exception {
		TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
				BugzillaCorePlugin.CONNECTOR_KIND, repositoryURL);
		assertNotNull(repository);

		final BugzillaRepositoryQuery repositoryQuery = new BugzillaRepositoryQuery(repository.getRepositoryUrl(),
				repository.getRepositoryUrl() + BUG_DESC_SUBSTRING_SEARCH + SearchString, QUERY_NAME);

		AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
				BugzillaCorePlugin.CONNECTOR_KIND);
//		TaskList taskList = TasksUiPlugin.getTaskList();
		QueryHitCollector collector = new QueryHitCollector(new TaskFactory(repository));


Lines 41-47 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java (-1 / +1 lines)
41	manager.readExistingOrCreateNewList();	41	manager.readExistingOrCreateNewList();
42	manager.resetTaskList();	42	manager.resetTaskList();
43	manager.saveTaskList();	43	manager.saveTaskList();
44	repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.ECLIPSE_BUGZILLA_URL);	44	repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND, IBugzillaConstants.ECLIPSE_BUGZILLA_URL);
45	TasksUiPlugin.getRepositoryManager().addRepository(repository);	45	TasksUiPlugin.getRepositoryManager().addRepository(repository);
46	assertEquals(0, manager.getTaskList().getAllTasks().size());	46	assertEquals(0, manager.getTaskList().getAllTasks().size());
47	}	47	}

Lines 49-55 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchDialogTest.java (-1 / +1 lines)
49	* @throws Exception	49	* @throws Exception
50	*/	50	*/
51	public void testSearchDialogInit() throws Exception {	51	public void testSearchDialogInit() throws Exception {
52	TaskRepository repo = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND,	52	TaskRepository repo = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND,
53	IBugzillaConstants.TEST_BUGZILLA_222_URL);	53	IBugzillaConstants.TEST_BUGZILLA_222_URL);
54	repo.setVersion(IBugzillaConstants.BugzillaServerVersion.SERVER_222.toString());	54	repo.setVersion(IBugzillaConstants.BugzillaServerVersion.SERVER_222.toString());
55	manager.addRepository(repo);	55	manager.addRepository(repo);





	private TaskRepository setRepository(String kind, String url) {
		connector = (BugzillaRepositoryConnector) TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
				BugzillaCorePlugin.CONNECTOR_KIND);
		repository = new TaskRepository(kind, url);
		Credentials credentials = TestUtil.readCredentials();
		repository.setAuthenticationCredentials(credentials.username, credentials.password);

	}

	private void testAttributesFromCloneBug(RepositoryTaskData repositoryTaskData, boolean valueFromBug9) {
		assertEquals("Clone Bug 1", repositoryTaskData.getAttribute(BugzillaReportElement.SHORT_DESC.getKey())
				.getValue());
		assertEquals("Clone Bug 1", repositoryTaskData.getSummary());
		assertEquals("This Bug is used to test the cloneTaskData", repositoryTaskData.getDescription());
		assertEquals("TestProduct", repositoryTaskData.getAttribute(BugzillaReportElement.PRODUCT.getKey())
				.getValue());
		assertEquals("TestProduct", repositoryTaskData.getProduct());
		assertEquals("TestComponent", repositoryTaskData.getAttribute(BugzillaReportElement.COMPONENT.getKey())
				.getValue());
		assertEquals("PC", repositoryTaskData.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey())
				.getValue());
		assertEquals("Windows", repositoryTaskData.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
		assertEquals("unspecified", repositoryTaskData.getAttribute(BugzillaReportElement.VERSION.getKey())
				.getValue());
		assertEquals("P3", repositoryTaskData.getAttribute(BugzillaReportElement.PRIORITY.getKey()).getValue());
		assertEquals("enhancement", repositoryTaskData.getAttribute(BugzillaReportElement.BUG_SEVERITY.getKey())
				.getValue());
		assertEquals("---", repositoryTaskData.getAttribute(BugzillaReportElement.TARGET_MILESTONE.getKey())
				.getValue());
		assertEquals("Unclassified", repositoryTaskData.getAttribute(
				BugzillaReportElement.CLASSIFICATION.getKey()).getValue());
		if (valueFromBug9) {
			assertEquals("9", repositoryTaskData.getAttribute(BugzillaReportElement.BUG_ID.getKey()).getValue());
			assertEquals("1.00", repositoryTaskData.getAttribute(BugzillaReportElement.REMAINING_TIME.getKey())
					.getValue());
			assertEquals("1.00", repositoryTaskData.getAttribute(BugzillaReportElement.ESTIMATED_TIME.getKey())
					.getValue());
			assertEquals("2007-12-12", repositoryTaskData.getAttribute(BugzillaReportElement.DEADLINE.getKey())
					.getValue());
			assertEquals("NEW", repositoryTaskData.getAttribute(BugzillaReportElement.BUG_STATUS.getKey())
					.getValue());
			assertEquals("2007-11-14 15:12", repositoryTaskData.getAttribute(
					BugzillaReportElement.CREATION_TS.getKey()).getValue());
			assertEquals("2007-11-14 15:14:46", repositoryTaskData.getAttribute(
					BugzillaReportElement.DELTA_TS.getKey()).getValue());
			assertEquals("tests@mylyn.eclipse.org", repositoryTaskData.getAttribute(
					BugzillaReportElement.REPORTER.getKey()).getValue());
			assertEquals("tests2@mylyn.eclipse.org", repositoryTaskData.getAttribute(
					BugzillaReportElement.ASSIGNED_TO.getKey()).getValue());
		} else {
			assertEquals("2.00", repositoryTaskData.getAttribute(BugzillaReportElement.REMAINING_TIME.getKey())
					.getValue());
			assertEquals("2.00", repositoryTaskData.getAttribute(BugzillaReportElement.ESTIMATED_TIME.getKey())
					.getValue());
			assertEquals("2008-01-01", repositoryTaskData.getAttribute(BugzillaReportElement.DEADLINE.getKey())
					.getValue());
			assertEquals("2007-11-14 15:30", repositoryTaskData.getAttribute(
					BugzillaReportElement.CREATION_TS.getKey()).getValue());
			assertEquals("2007-11-14 15:30:38", repositoryTaskData.getAttribute(
					BugzillaReportElement.DELTA_TS.getKey()).getValue());
			assertEquals("tests2@mylyn.eclipse.org", repositoryTaskData.getAttribute(
					BugzillaReportElement.REPORTER.getKey()).getValue());
			assertEquals("tests@mylyn.eclipse.org", repositoryTaskData.getAttribute(
					BugzillaReportElement.ASSIGNED_TO.getKey()).getValue());
		}
	}

	public void testCloneTaskData() throws Exception {
		String bugid = "9";
		setRepository(BugzillaCorePlugin.CONNECTOR_KIND, IBugzillaConstants.TEST_BUGZILLA_30_URL);
		RepositoryTaskData report1 = init(bugid);

		assertNotNull(report1);

		testAttributesFromCloneBug(report1, true);

		bugid = "10";
		setRepository(BugzillaCorePlugin.CONNECTOR_KIND, IBugzillaConstants.TEST_BUGZILLA_30_URL);
		RepositoryTaskData report2 = init(bugid);

		assertNotNull(report2);
		assertEquals("" + bugid, report2.getAttribute(BugzillaReportElement.BUG_ID.getKey()).getValue());
		assertEquals("2.00", report2.getAttribute(BugzillaReportElement.REMAINING_TIME.getKey()).getValue());
		assertEquals("2.00", report2.getAttribute(BugzillaReportElement.ESTIMATED_TIME.getKey()).getValue());
		assertEquals("2008-01-01", report2.getAttribute(BugzillaReportElement.DEADLINE.getKey()).getValue());

		assertEquals("Clone Bug 2", report2.getAttribute(BugzillaReportElement.SHORT_DESC.getKey()).getValue());
		assertEquals("Clone Bug 2", report2.getSummary());
		assertEquals("other Bug for cloneTaskData", report2.getDescription());
		assertEquals("TestProduct", report2.getAttribute(BugzillaReportElement.PRODUCT.getKey()).getValue());
		assertEquals("TestProduct", report2.getProduct());
		assertEquals("TestComponent", report2.getAttribute(BugzillaReportElement.COMPONENT.getKey()).getValue());
		assertEquals("PC", report2.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey()).getValue());
		assertEquals("Mac OS", report2.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
		assertEquals("unspecified", report2.getAttribute(BugzillaReportElement.VERSION.getKey()).getValue());
		assertEquals("P2", report2.getAttribute(BugzillaReportElement.PRIORITY.getKey()).getValue());
		assertEquals("critical", report2.getAttribute(BugzillaReportElement.BUG_SEVERITY.getKey()).getValue());
		assertEquals("ASSIGNED", report2.getAttribute(BugzillaReportElement.BUG_STATUS.getKey()).getValue());
		assertEquals("2007-11-14 15:30", report2.getAttribute(BugzillaReportElement.CREATION_TS.getKey())
				.getValue());
		assertEquals("2007-11-14 15:30:38", report2.getAttribute(BugzillaReportElement.DELTA_TS.getKey())
				.getValue());
		assertEquals("---", report2.getAttribute(BugzillaReportElement.TARGET_MILESTONE.getKey()).getValue());
		assertEquals("tests2@mylyn.eclipse.org", report2.getAttribute(BugzillaReportElement.REPORTER.getKey())
				.getValue());
		assertEquals("tests@mylyn.eclipse.org", report2.getAttribute(BugzillaReportElement.ASSIGNED_TO.getKey())
				.getValue());

		AbstractTaskDataHandler handler = connector.getLegacyTaskDataHandler();


	public void testCharacterEscaping() throws CoreException {
		String bugid = "17";
		setRepository(BugzillaCorePlugin.CONNECTOR_KIND, IBugzillaConstants.TEST_BUGZILLA_30_URL);
		RepositoryTaskData report1 = init(bugid);
		assertEquals("Testing! \"&@ $\" &amp;", report1.getSummary());
	}

Added Link Here

(-).refactorings/2008/5/21/refactorings.index (+1 lines)
1	1211341606664 Change method 'submit'




/*******************************************************************************
 * Copyright (c) 2004, 2007 Mylyn project committers and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *******************************************************************************/

package org.eclipse.mylyn.bugzilla.tests;

import java.text.ParseException;
import java.text.SimpleDateFormat;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.tasks.core.ITask.PriorityLevel;
import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
import org.eclipse.mylyn.tasks.core.data.TaskCommentMapper;
import org.eclipse.mylyn.tasks.core.data.TaskData;
import org.eclipse.mylyn.tasks.core.data.TaskMapper;

public class BugzillaRepositoryConnectorTest2 extends AbstractBugzillaTest {

	public void testDataRetrieval() throws CoreException, ParseException {
		init(IBugzillaConstants.TEST_BUGZILLA_30_URL);
		TaskData data = connector.getTaskData(repository, "2", new NullProgressMonitor());
		assertNotNull(data);
		TaskMapper mapper = new TaskMapper(data);
		assertEquals("2", data.getTaskId());
		assertEquals("New bug submit", mapper.getSummary());
		assertEquals("Test new bug submission", mapper.getDescription());
		assertEquals(PriorityLevel.P2, mapper.getPriority());
		assertEquals("TestComponent", mapper.getComponent());
		assertEquals("nhapke@cs.ubc.ca", mapper.getOwner());
		assertEquals("TestProduct", mapper.getProduct());
		assertEquals("PC", mapper.getValue(BugzillaReportElement.REP_PLATFORM.getKey()));
		assertEquals("Windows", mapper.getValue(BugzillaReportElement.OP_SYS.getKey()));
		assertEquals("ASSIGNED", mapper.getValue(BugzillaReportElement.BUG_STATUS.getKey()));
		SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
		SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
		assertEquals(format1.parse("2007-03-20 16:37"), mapper.getCreationDate());
		assertEquals(format2.parse("2007-12-06 20:50:00"), mapper.getModificationDate());

		//assertEquals("", mapper.getTaskUrl());
		//assertEquals("bugzilla", mapper.getTaskKind());
		//assertEquals("", mapper.getTaskKey());

		// test comments
		TaskAttribute comments = data.getMappedAttribute(TaskAttribute.CONTAINER_COMMENTS);
		assertEquals(12, comments.getAttributes().size());
		TaskCommentMapper commentMap = TaskCommentMapper.createFrom(comments.getAttribute("0"));
		assertEquals("Rob Elves", commentMap.getAuthor().getName());
		assertEquals("Test new bug submission", commentMap.getText());
		commentMap = TaskCommentMapper.createFrom(comments.getAttribute("1"));
		assertEquals("Rob Elves", commentMap.getAuthor().getName());
		assertEquals("Created an attachment (id=1)\ntest\n\ntest attachments", commentMap.getText());
		commentMap = TaskCommentMapper.createFrom(comments.getAttribute("11"));
		assertEquals("Tests", commentMap.getAuthor().getName());
		assertEquals("test", commentMap.getText());
	}
}

Lines 24-29 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataState.java (-4 / +4 lines)
24	*/	24	*/
25	public class TaskDataState implements ITaskDataWorkingCopy {	25	public class TaskDataState implements ITaskDataWorkingCopy {
26		26
		27	private final String repositoryUrl;
		28
27	private final String connectorKind;	29	private final String connectorKind;
28		30
29	private TaskData editsTaskData;	31	private TaskData editsTaskData;
Lines 32-47 Link Here
32		34
33	private TaskData localTaskData;	35	private TaskData localTaskData;
34		36
35	private boolean saved;
36
37	private TaskData repositoryTaskData;	37	private TaskData repositoryTaskData;
38		38
39	private final String repositoryUrl;
40
41	private ITask task;	39	private ITask task;
42		40
43	private final String taskId;	41	private final String taskId;
44		42
		43	private boolean saved;
		44
45	private TaskDataManager taskDataManager;	45	private TaskDataManager taskDataManager;
46		46
47	public TaskDataState(String connectorKind, String repositoryUrl, String taskId) {	47	public TaskDataState(String connectorKind, String repositoryUrl, String taskId) {




import java.util.Locale;
import java.util.Map;

import org.eclipse.mylyn.tasks.core.data.TaskAttachmentMapper;
import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
import org.eclipse.mylyn.tasks.core.data.TaskData;
import org.eclipse.mylyn.tasks.core.data.TaskDataCollector;
import org.eclipse.mylyn.internal.tasks.core.deprecated.TaskComment;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;


	private StringBuffer characters;

	private TaskAttribute taskComment;

	private Map<String, TaskAttribute> attachIdToComment = new HashMap<String, TaskAttribute>();

	private int commentNum = 0;

	private int attachmentNum = 0;

	private TaskAttribute attachment;

	private final Map<String, TaskData> taskDataMap;

	private TaskData repositoryTaskData;

	private List<TaskAttribute> longDescs;

	private String errorMessage = null;

	private final TaskAttributeMapper attributeMapper;

	private final List<BugzillaCustomField> customFields;

	private final TaskDataCollector collector;

	private TaskAttribute commentContainer;

	private TaskAttribute attachmentContainer;

	private boolean isDeprecated = false;

	private boolean isPatch = false;

	//private int retrieved = 1;

	public SaxMultiBugReportContentHandler(TaskAttributeMapper mapper, TaskDataCollector collector,
			Map<String, TaskData> taskDataMap, List<BugzillaCustomField> customFields) {

		this.attributeMapper = mapper;
		this.taskDataMap = taskDataMap;
		this.customFields = customFields;
		this.collector = collector;

			if (attributes != null && (attributes.getValue("error") != null)) {
				errorMessage = attributes.getValue("error");
			}
			attachIdToComment = new HashMap<String, TaskAttribute>();
			commentNum = 0;
			attachmentNum = 0;
			taskComment = null;
			longDescs = new ArrayList<TaskAttribute>();
			break;
		case LONG_DESC:
			taskComment = commentContainer.createAttribute("" + commentNum++);
			break;
		case WHO:
			if (taskComment != null) {
				if (attributes != null && attributes.getLength() > 0) {
					String name = attributes.getValue(ATTRIBUTE_NAME);
					if (name != null) {
						taskComment.createAttribute(BugzillaReportElement.WHO_NAME.getKey()).setValue(name);
					}
				}
			}

			if (attributes != null && attributes.getLength() > 0) {
				String name = attributes.getValue(ATTRIBUTE_NAME);
				if (name != null) {
					repositoryTaskData.getRoot()
							.createAttribute(BugzillaReportElement.REPORTER_NAME.getKey())
							.setValue(name);
				}
			}
			break;

			if (attributes != null && attributes.getLength() > 0) {
				String name = attributes.getValue(ATTRIBUTE_NAME);
				if (name != null) {
					repositoryTaskData.getRoot()
							.createAttribute(BugzillaReportElement.ASSIGNED_TO_NAME.getKey())
							.setValue(name);
				}
			}
			break;
		case ATTACHMENT:
			attachment = new RepositoryAttachment(attributeFactory);
			if (attributes != null) {
				isDeprecated = "1".equals(attributes.getValue(BugzillaReportElement.IS_OBSOLETE.getKey()));
				isPatch = "1".equals(attributes.getValue(BugzillaReportElement.IS_PATCH.getKey()));
							attributeFactory.createAttribute(BugzillaReportElement.IS_OBSOLETE.getKeyString()));
					attachment.setObsolete(true);
				}
				if ("1".equals(attributes.getValue(BugzillaReportElement.IS_PATCH.getKeyString()))) {
					attachment.setPatch(true);
				}
			}
			break;
		}

		String parsedText = characters.toString();

		if (localName.startsWith(BugzillaCustomField.CUSTOM_FIELD_PREFIX)) {
			TaskAttribute attribute = repositoryTaskData.getRoot().getAttribute(localName);
			if (attribute == null) {
				String desc = "???";
				for (BugzillaCustomField bugzillaCustomField : customFields) {

						desc = bugzillaCustomField.getDescription();
					}
				}
				TaskAttribute atr = repositoryTaskData.getRoot().createAttribute(localName);
				atr.putMetaDataValue(TaskAttribute.META_READ_ONLY, Boolean.toString(false));
				atr.setValue(parsedText);
				repositoryTaskData.addAttribute(localName, newattribute);
			} else {
				attribute.addValue(parsedText);
			}

				errorMessage = "Bug id from server did not match requested id.";
			}

			TaskAttribute attr = repositoryTaskData.getMappedAttribute(tag.getKey());
			if (attr == null) {
				attr = BugzillaTaskDataHandler.createAttribute(repositoryTaskData, BugzillaReportElement.BUG_ID);
				repositoryTaskData.addAttribute(tag.getKeyString(), attr);
			}
			attr.setValue(parsedText);

			commentContainer = repositoryTaskData.getRoot().createAttribute(TaskAttribute.CONTAINER_COMMENTS);
			attachmentContainer = repositoryTaskData.getRoot().createAttribute(TaskAttribute.CONTAINER_ATTACHMENTS);

			break;
		}

			// Comment attributes
		case WHO:
			if (taskComment != null) {
				RepositoryTaskAttribute attr = attributeFactory.createAttribute(tag.getKeyString());
				attr.setValue(parsedText);
				taskComment.addAttribute(tag.getKeyString(), attr);
			}
			break;
		case BUG_WHEN:
			if (taskComment != null) {
				BugzillaTaskDataHandler.createAttribute(taskComment, tag).setValue(parsedText);
				attr.setValue(parsedText);
				taskComment.addAttribute(tag.getKeyString(), attr);
			}
			break;
		case THETEXT:
			if (taskComment != null) {
				BugzillaTaskDataHandler.createAttribute(taskComment, tag).setValue(parsedText);
				attr.setValue(parsedText);
				taskComment.addAttribute(tag.getKeyString(), attr);

				// Check for attachment
				parseAttachment(taskComment, parsedText);


		// Attachment attributes
		case ATTACHID:
			attachment = attachmentContainer.createAttribute(parsedText);
			attributeMapper.setBooleanValue(attachment.createAttribute(TaskAttribute.ATTACHMENT_IS_PATCH), isPatch);
			attributeMapper.setBooleanValue(attachment.createAttribute(TaskAttribute.ATTACHMENT_IS_DEPRECATED),
					isDeprecated);
			break;

		case DATE:
		case DESC:
		case FILENAME:

		case TYPE:
		case SIZE:
			if (attachment != null) {
				attachment.createAttribute(tag.getKey()).setValue(parsedText);
				attr.setValue(parsedText);
				attachment.addAttribute(tag.getKeyString(), attr);
			}
			break;
		case DATA:
			break;
		case ATTACHMENT:
			isPatch = false;
			isDeprecated = false;
			attachment = null;
			break;

		// IGNORED ELEMENTS

			// comments
			int longDescsSize = longDescs.size() - 1;
			if (longDescsSize == 0) {
				//Description = comment 0
				repositoryTaskData.getRoot().createAttribute(TaskAttribute.DESCRIPTION).setValue(
						longDescs.get(0).getMappedAttribute(BugzillaReportElement.THETEXT.getKey()).getValue());
			} else if (longDescsSize == 1) {
				String val0 = longDescs.get(0).getMappedAttribute(BugzillaReportElement.BUG_WHEN.getKey()).getValue();
				String val1 = longDescs.get(1).getMappedAttribute(BugzillaReportElement.BUG_WHEN.getKey()).getValue();

				if (val0.compareTo(val1) <= 0) {
					// if created_0 is equal to created_1 we assume that longDescs at index 0 is the description.
					repositoryTaskData.getRoot().createAttribute(TaskAttribute.DESCRIPTION).setValue(
							longDescs.get(0).getMappedAttribute(BugzillaReportElement.THETEXT.getKey()).getValue());
					repositoryTaskData.addComment(longDescs.get(1));
				} else {
					repositoryTaskData.getRoot().createAttribute(TaskAttribute.DESCRIPTION).setValue(
							longDescs.get(1).getMappedAttribute(BugzillaReportElement.THETEXT.getKey()).getValue());
					commentNum = 1;
					longDescs.get(0).setNumber(commentNum);
					repositoryTaskData.addComment(longDescs.get(0));
				}
			} else if (longDescsSize > 1) {
				String val0 = longDescs.get(0).getMappedAttribute(BugzillaReportElement.BUG_WHEN.getKey()).getValue();
				String val1 = longDescs.get(1).getMappedAttribute(BugzillaReportElement.BUG_WHEN.getKey()).getValue();

				String created_0 = val0;
				String created_1 = val1;
				String created_n = longDescs.get(longDescsSize).getMappedAttribute(
						BugzillaReportElement.BUG_WHEN.getKey()).getValue();
				commentNum = 1;
				if (created_0.compareTo(created_1) <= 0 && created_0.compareTo(created_n) < 0) {
					// if created_0 is equal to created_1 we assume that longDescs at index 0 is the description.
					repositoryTaskData.getRoot().createAttribute(TaskAttribute.DESCRIPTION).setValue(
							longDescs.get(0).getMappedAttribute(BugzillaReportElement.THETEXT.getKey()).getValue());

// TODO: move into presentation?
//					if (created_1.compareTo(created_n) < 0) {
//						for (int i = 1; i <= longDescsSize; i++) {
//							longDescs.get(i).setNumber(commentNum++);
//							repositoryTaskData.addComment(longDescs.get(i));
//						}
//					} else {
//						for (int i = longDescsSize; i > 0; i--) {
//							longDescs.get(i).setNumber(commentNum++);
//							repositoryTaskData.addComment(longDescs.get(i));
//						}
//					}
				} else {
					repositoryTaskData.getRoot().createAttribute(TaskAttribute.DESCRIPTION).setValue(
							longDescs.get(longDescsSize)
									.getMappedAttribute(BugzillaReportElement.THETEXT.getKey())
									.getValue());
//					if (created_0.compareTo(created_1) < 0) {
//						for (int i = 0; i < longDescsSize; i++) {
//							longDescs.get(i).setNumber(commentNum++);
//							repositoryTaskData.addComment(longDescs.get(i));
//						}
//					} else {
//						for (int i = longDescsSize - 1; i >= 0; i--) {
//							longDescs.get(i).setNumber(commentNum++);
//							repositoryTaskData.addComment(longDescs.get(i));
//						}
//					}
				}
			}

			TaskAttribute container = repositoryTaskData.getMappedAttribute(TaskAttribute.CONTAINER_COMMENTS);
			TaskAttribute numCommentsAttribute = repositoryTaskData.getMappedAttribute(BugzillaReportElement.LONGDESCLENGTH.getKey());
			if (numCommentsAttribute == null) {
				numCommentsAttribute = BugzillaTaskDataHandler.createAttribute(repositoryTaskData,
						BugzillaReportElement.LONGDESCLENGTH);
				numCommentsAttribute.setValue("" + container.getAttributes().size());
						numCommentsAttribute);
			} else {
				numCommentsAttribute.setValue(""
						+ repositoryTaskData.getMappedAttribute(BugzillaReportElement.LONGDESCLENGTH.getKey())
								.getValue());
			}

			// Set the creator name on all attachments
			for (TaskAttribute attachment : container.getAttributes().values()) {
				TaskAttachmentMapper attachmentMapper = TaskAttachmentMapper.createFrom(attachment);
				TaskAttribute taskComment = attachIdToComment.get(attachment.getId());
				if (taskComment != null) {
					String commentAuthor = taskComment.getMappedAttribute(TaskAttribute.COMMENT_AUTHOR).getValue();
					attachmentMapper.setAuthor(repositoryTaskData.getAttributeMapper()
							.getTaskRepository()
							.createPerson(commentAuthor));
				}
				attachmentMapper.setUrl(repositoryTaskData.getRepositoryUrl()
						+ IBugzillaConstants.URL_GET_ATTACHMENT_SUFFIX + attachment.getId());
//				attachment.setRepositoryKind(repositoryTaskData.getConnectorKind());
//				attachment.setRepositoryUrl(repositoryTaskData.getRepositoryUrl());
//				attachment.setTaskId(repositoryTaskData.getTaskId());
			}
			collector.accept(repositoryTaskData);
			break;

		case BLOCKED:
		case DEPENDSON:
			TaskAttribute dependancyAttribute = repositoryTaskData.getMappedAttribute(tag.getKey());
			if (dependancyAttribute == null) {
				BugzillaTaskDataHandler.createAttribute(repositoryTaskData, BugzillaReportElement.DEPENDSON).setValue(
						parsedText);
				repositoryTaskData.addAttribute(tag.getKeyString(), dependancyAttribute);
			} else {
				if (dependancyAttribute.getValue().equals("")) {
					dependancyAttribute.setValue(parsedText);

			break;
		// All others added as report attribute
		default:
			TaskAttribute attribute = repositoryTaskData.getMappedAttribute(tag.getKey());
			if (attribute == null) {
				attribute = BugzillaTaskDataHandler.createAttribute(repositoryTaskData, tag);
				attribute.setValue(parsedText);
				repositoryTaskData.addAttribute(tag.getKeyString(), attribute);
			} else {
				attribute.addValue(parsedText);
			}

	}

	/** determines attachment id from comment */
	private void parseAttachment(TaskAttribute taskComment, String commentText) {

		String attachmentID = "";


			if (endIndex > 0 && endIndex < commentText.length()) {
				attachmentID = commentText.substring(COMMENT_ATTACHMENT_STRING.length(), endIndex);
				if (!attachmentID.equals("")) {
					TaskAttribute attachmentContainer = taskComment.getMappedAttribute(TaskAttribute.CONTAINER_ATTACHMENTS);
					if (attachmentContainer == null) {
						attachmentContainer = taskComment.createAttribute(TaskAttribute.CONTAINER_ATTACHMENTS);
					}
					attachmentContainer.createAttribute(attachmentID);
					attachIdToComment.put(attachmentID, taskComment);
				}
			}




/**
 * @author Mik Kersten
 * @author Rob Elves
 * @deprecated
 */
@Deprecated
public class BugzillaTask extends AbstractTask {

	private String severity;


	@Override
	public String getConnectorKind() {
		return BugzillaCorePlugin.CONNECTOR_KIND;
	}

	public String getSeverity() {




import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;

import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_OPERATION;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_REPORT_STATUS;
import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
import org.eclipse.mylyn.tasks.core.data.TaskData;
import org.eclipse.mylyn.tasks.core.data.TaskOperation;

/**
 * Class describing the configuration of products and components for a given Bugzilla installation.

		return customFields;
	}

	public void configureTaskData(TaskData taskData) {
		updateAttributeOptions(taskData);
		addValidOperations(taskData);
	}

	public void updateAttributeOptions(TaskData existingReport) {
		TaskAttribute attributeProduct = existingReport.getMappedAttribute(BugzillaReportElement.PRODUCT.getKey());
		if (attributeProduct == null) {
			return;
		}
		String product = attributeProduct.getValue();
		for (TaskAttribute attribute : new HashSet<TaskAttribute>(existingReport.getRoot().getAttributes().values())) {
			if (attribute.getId().startsWith(BugzillaCustomField.CUSTOM_FIELD_PREFIX)) {
				attribute.clearOptions();
				List<BugzillaCustomField> customFields = getCustomFields();

					if (bugzillaCustomField.getName().equals(attribute.getId())) {
						List<String> optionList = bugzillaCustomField.getOptions();
						for (String option : optionList) {
							attribute.putOption(option, option);
						}
					}
				}
			} else {

				BugzillaReportElement element;
				try {
					element = BugzillaReportElement.valueOf(attribute.getId().trim().toUpperCase(Locale.ENGLISH));
				} catch (RuntimeException e) {
					if (e instanceof IllegalArgumentException) {
						// ignore unrecognized tags
						continue;
					}
					throw e;
				}
				attribute.clearOptions();
				List<String> optionValues = getOptionValues(element, product);
				if (element != BugzillaReportElement.OP_SYS && element != BugzillaReportElement.BUG_SEVERITY

				}
				if (element == BugzillaReportElement.TARGET_MILESTONE && optionValues.isEmpty()) {

					existingReport.getRoot().removeAttribute(BugzillaReportElement.TARGET_MILESTONE.getKey());
					continue;
				}
				attribute.clearOptions();
				for (String option : optionValues) {
					attribute.putOption(option, option);
				}

				// TODO: bug#162428, bug#150680 - something along the lines of...


	}

	private void addValidOperations(TaskData bugReport) {
		TaskAttribute attributeStatus = bugReport.getMappedAttribute(TaskAttribute.STATUS);
		BUGZILLA_REPORT_STATUS status = BUGZILLA_REPORT_STATUS.NEW;
		try {
			if (attributeStatus == null) {
				StatusHandler.log(new Status(IStatus.WARNING, BugzillaCorePlugin.PLUGIN_ID,
						"Status not found for task.  Synchronize task to correct."));
			} else {
				status = BUGZILLA_REPORT_STATUS.valueOf(attributeStatus.getValue());
			}
		} catch (RuntimeException e) {
			StatusHandler.log(new Status(IStatus.INFO, BugzillaCorePlugin.PLUGIN_ID, "Unrecognized status: "
					+ attributeStatus.getValue(), e));
			status = BUGZILLA_REPORT_STATUS.NEW;
		}
		switch (status) {

		}
	}

	private void addOperation(TaskData bugReport, BUGZILLA_OPERATION opcode) {
		TaskAttribute attribute;
		TaskOperation newOperation = null;
		TaskAttribute operationAttribute = bugReport.getRoot().createAttribute(TaskAttribute.OPERATION);
		TaskAttribute operationContainer = bugReport.getRoot().createAttribute(TaskAttribute.CONTAINER_OPERATIONS);
		TaskOperation defaultOperation;

		switch (opcode) {
		case none:
			attribute = operationContainer.createAttribute(opcode.toString());
			attribute.setValue(opcode.toString());
			newOperation = TaskOperation.createFrom(attribute);

			TaskAttribute attributeStatus = bugReport.getMappedAttribute(TaskAttribute.STATUS);
			TaskAttribute attributeResolution = bugReport.getMappedAttribute(TaskAttribute.RESOLUTION);

			newOperation.setLabel("Leave as " + attributeStatus.getValue() + " " + attributeResolution.getValue());
			newOperation.applyTo(attribute);

			// set as default
			newOperation.applyTo(operationAttribute);
			break;
		case accept:
			attribute = operationContainer.createAttribute(opcode.toString());
			attribute.setValue(opcode.toString());
			newOperation = TaskOperation.createFrom(attribute);
			newOperation.setLabel(OPERATION_LABEL_ACCEPT);
			break;
		case resolve:
			attribute = operationContainer.createAttribute(opcode.toString());
			attribute.setValue(opcode.toString());
			newOperation = TaskOperation.createFrom(attribute);
			newOperation.setLabel(OPERATION_LABEL_RESOLVE);

			//TaskAttribute.META_ASSOCIATED_ATTRIBUTE_ID
			for (String resolution : getResolutions()) {
				// DUPLICATE and MOVED have special meanings so do not show as resolution

				if (resolution.compareTo("DUPLICATE") != 0 && resolution.compareTo("MOVED") != 0) {
					attribute.putOption(resolution, resolution);
				}
			}
			break;
		case duplicate:
			attribute = operationContainer.createAttribute(OPERATION_INPUT_DUP_ID);
			attribute.setValue(opcode.toString());
			newOperation = TaskOperation.createFrom(attribute);
			newOperation.setLabel(OPERATION_LABEL_DUPLICATE);
			// TODO: Specify short text input
			break;
		case reassign:
			attribute = operationContainer.createAttribute(OPERATION_INPUT_ASSIGNED_TO);
			attribute.setValue(OPERATION_INPUT_ASSIGNED_TO);
			newOperation = TaskOperation.createFrom(attribute);
			newOperation.setLabel(OPERATION_LABEL_REASSIGN);
			break;
		case reassignbycomponent:
			attribute = operationContainer.createAttribute(opcode.toString());
			attribute.setValue(opcode.toString());
			newOperation = TaskOperation.createFrom(attribute);
			newOperation.setLabel(OPERATION_LABEL_REASSIGN_DEFAULT);
			break;
		case reopen:
			attribute = operationContainer.createAttribute(opcode.toString());
			attribute.setValue(opcode.toString());
			newOperation = TaskOperation.createFrom(attribute);
			newOperation.setLabel(OPERATION_LABEL_REOPEN);
			break;
		case verify:
			attribute = operationContainer.createAttribute(opcode.toString());
			attribute.setValue(opcode.toString());
			newOperation = TaskOperation.createFrom(attribute);
			newOperation.setLabel(OPERATION_LABEL_VERIFY);
			break;
		case close:
			attribute = operationContainer.createAttribute(opcode.toString());
			attribute.setValue(opcode.toString());
			newOperation = TaskOperation.createFrom(attribute);
			newOperation.setLabel(OPERATION_LABEL_CLOSE);
			break;
		default:
			break;
		}
		if (newOperation != null) {
			bugReport.addOperation(newOperation);
		}
	}

	/**

Line 1 Link Here

(-).refactorings/2008/5/20/refactorings.index (+3 lines)
1	1210734328587 Rename type 'StackTraceDuplicateDetector'	1	1210734328587 Rename type 'StackTraceDuplicateDetector'
		2	1210971188860 Rename field 'REPOSITORY_KIND'
		3	1210973071627 Delete element
		4	1210976615822 Rename method 'getKeyString'

Lines 1-4 Link Here

(-).refactorings/2008/5/20/refactorings.history (-2 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<session version="1.0">	2	<session version="1.0"> <refactoring comment="Rename type 'org.eclipse.mylyn.internal.bugzilla.core.StackTraceDuplicateDetector' to 'BugzillaStackTraceDuplicateDetector' - Original project: 'org.eclipse.mylyn.bugzilla.core' - Original element: 'org.eclipse.mylyn.internal.bugzilla.core.StackTraceDuplicateDetector' - Renamed element: 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaStackTraceDuplicateDetector' - Update references to refactored element - Update fully qualified names in 'plugin.xml,MANIFEST.MF' files - Update textual occurrences in comments and strings" description="Rename type 'StackTraceDuplicateDetector'" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/src<org.eclipse.mylyn.internal.bugzilla.core{StackTraceDuplicateDetector.java[StackTraceDuplicateDetector" matchStrategy="1" name="BugzillaStackTraceDuplicateDetector" patterns="plugin.xml,MANIFEST.MF" qualified="true" references="true" similarDeclarations="false" stamp="1210734328587" textual="false" version="1.0"/> <refactoring comment="Rename field 'REPOSITORY_KIND' in 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin' to 'CONNECTOR_KIND' - Original project: 'org.eclipse.mylyn.bugzilla.core' - Original element: 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin.REPOSITORY_KIND' - Renamed element: 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin.CONNECTOR_KIND' - Update references to refactored element - Update textual occurrences in comments and strings" delegate="false" deprecate="false" description="Rename field 'REPOSITORY_KIND'" flags="589830" getter="false" id="org.eclipse.jdt.ui.rename.field" input="/src<org.eclipse.mylyn.internal.bugzilla.core{BugzillaCorePlugin.java[BugzillaCorePlugin^REPOSITORY_KIND" name="CONNECTOR_KIND" references="true" setter="false" stamp="1210971188860" textual="false" version="1.0"/> <refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.bugzilla.core' - Original project: 'org.eclipse.mylyn.bugzilla.core' - Original element: 'BugzillaRepositoryConnector.java.rej'" description="Delete element" element1="src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java.rej" elements="0" flags="589830" id="org.eclipse.jdt.ui.delete" resources="1" stamp="1210973071627" subPackages="false" version="1.0"/> <refactoring comment="Rename method 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement.getKeyString()' to 'getKey' - Original project: 'org.eclipse.mylyn.bugzilla.core' - Original element: 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement.getKeyString()' - Renamed element: 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement.getKey()' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'getKeyString'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.internal.bugzilla.core{BugzillaReportElement.java[BugzillaReportElement~getKeyString" name="getKey" references="true" stamp="1210976615822" version="1.0"/>
3	<refactoring comment="Rename type 'org.eclipse.mylyn.internal.bugzilla.core.StackTraceDuplicateDetector' to 'BugzillaStackTraceDuplicateDetector' - Original project: 'org.eclipse.mylyn.bugzilla.core' - Original element: 'org.eclipse.mylyn.internal.bugzilla.core.StackTraceDuplicateDetector' - Renamed element: 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaStackTraceDuplicateDetector' - Update references to refactored element - Update fully qualified names in 'plugin.xml,MANIFEST.MF' files - Update textual occurrences in comments and strings" description="Rename type 'StackTraceDuplicateDetector'" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/src<org.eclipse.mylyn.internal.bugzilla.core{StackTraceDuplicateDetector.java[StackTraceDuplicateDetector" matchStrategy="1" name="BugzillaStackTraceDuplicateDetector" patterns="plugin.xml,MANIFEST.MF" qualified="true" references="true" similarDeclarations="false" stamp="1210734328587" textual="false" version="1.0"/>
4	</session>	3	</session>

Lines 199-205 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java (-2 / +2 lines)
199		199
200	@Override	200	@Override
201	public String getConnectorKind() {	201	public String getConnectorKind() {
202	return BugzillaCorePlugin.REPOSITORY_KIND;	202	return BugzillaCorePlugin.CONNECTOR_KIND;
203	}	203	}
204		204
205	@SuppressWarnings("restriction")	205	@SuppressWarnings("restriction")
Lines 210-216 Link Here
210	// we wouldn't have to get the task data this way from here	210	// we wouldn't have to get the task data this way from here
211	RepositoryTaskData taskData = TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(	211	RepositoryTaskData taskData = TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(
212	task.getRepositoryUrl(), task.getTaskId());	212	task.getRepositoryUrl(), task.getTaskId());
213	if (taskData != null && taskData.getAttribute(BugzillaReportElement.ESTIMATED_TIME.getKeyString()) != null) {	213	if (taskData != null && taskData.getAttribute(BugzillaReportElement.ESTIMATED_TIME.getKey()) != null) {
214	return true;	214	return true;
215	}	215	}
216	}	216	}

Added Link Here

(-).refactorings/2008/5/20/refactorings.history (+4 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<session version="1.0">
3	<refactoring comment="Move 1 elements(s) to 'org.eclipse.mylyn.bugzilla.ui/src/org.eclipse.mylyn.internal.bugzilla.ui.tasklist' - Original project: 'org.eclipse.mylyn.bugzilla.ui' - Destination element: 'org.eclipse.mylyn.bugzilla.ui/src/org.eclipse.mylyn.internal.bugzilla.ui.tasklist' - Original element: 'org.eclipse.mylyn.internal.bugzilla.ui.BugzillaTaskListMigrator.java' - Update references to refactored element" description="Move compilation unit" destination="/src<org.eclipse.mylyn.internal.bugzilla.ui.tasklist" element1="/src<org.eclipse.mylyn.internal.bugzilla.ui{BugzillaTaskListMigrator.java" files="0" flags="589830" folders="0" id="org.eclipse.jdt.ui.move" policy="org.eclipse.jdt.ui.moveResources" qualified="false" references="true" stamp="1210972267786" units="1" version="1.0"/>
4	</session>

Return to bug 229655

Lines 12-17 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java (-38 / +92 lines)
12	import java.util.ArrayList;	12	import java.util.ArrayList;
13	import java.util.Collections;	13	import java.util.Collections;
14	import java.util.HashMap;	14	import java.util.HashMap;
		15	import java.util.HashSet;
15	import java.util.List;	16	import java.util.List;
16	import java.util.Locale;	17	import java.util.Locale;
17	import java.util.Map;	18	import java.util.Map;
Lines 21-29 Link Here
21	import org.eclipse.mylyn.commons.core.StatusHandler;	22	import org.eclipse.mylyn.commons.core.StatusHandler;
22	import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_OPERATION;	23	import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_OPERATION;
23	import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_REPORT_STATUS;	24	import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_REPORT_STATUS;
24	import org.eclipse.mylyn.internal.tasks.core.deprecated.RepositoryOperation;	25	import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
25	import org.eclipse.mylyn.internal.tasks.core.deprecated.RepositoryTaskAttribute;	26	import org.eclipse.mylyn.tasks.core.data.TaskData;
26	import org.eclipse.mylyn.internal.tasks.core.deprecated.RepositoryTaskData;	27	import org.eclipse.mylyn.tasks.core.data.TaskOperation;
27		28
28	/**	29	/**
29	* Class describing the configuration of products and components for a given Bugzilla installation.	30	* Class describing the configuration of products and components for a given Bugzilla installation.
Lines 432-445 Link Here
432	return customFields;	433	return customFields;
433	}	434	}
434		435
435	public void configureTaskData(RepositoryTaskData taskData) {	436	public void configureTaskData(TaskData taskData) {
436	updateAttributeOptions(taskData);	437	updateAttributeOptions(taskData);
437	addValidOperations(taskData);	438	addValidOperations(taskData);
438	}	439	}
439		440
440	public void updateAttributeOptions(RepositoryTaskData existingReport) {	441	public void updateAttributeOptions(TaskData existingReport) {
441	String product = existingReport.getAttributeValue(BugzillaReportElement.PRODUCT.getKeyString());	442	TaskAttribute attributeProduct = existingReport.getMappedAttribute(BugzillaReportElement.PRODUCT.getKey());
442	for (RepositoryTaskAttribute attribute : existingReport.getAttributes()) {	443	if (attributeProduct == null) {
		444	return;
		445	}
		446	String product = attributeProduct.getValue();
		447	for (TaskAttribute attribute : new HashSet<TaskAttribute>(existingReport.getRoot().getAttributes().values())) {
443	if (attribute.getId().startsWith(BugzillaCustomField.CUSTOM_FIELD_PREFIX)) {	448	if (attribute.getId().startsWith(BugzillaCustomField.CUSTOM_FIELD_PREFIX)) {
444	attribute.clearOptions();	449	attribute.clearOptions();
445	List<BugzillaCustomField> customFields = getCustomFields();	450	List<BugzillaCustomField> customFields = getCustomFields();
Lines 448-460 Link Here
448	if (bugzillaCustomField.getName().equals(attribute.getId())) {	453	if (bugzillaCustomField.getName().equals(attribute.getId())) {
449	List<String> optionList = bugzillaCustomField.getOptions();	454	List<String> optionList = bugzillaCustomField.getOptions();
450	for (String option : optionList) {	455	for (String option : optionList) {
451	attribute.addOption(option, option);	456	attribute.putOption(option, option);
452	}	457	}
453	}	458	}
454	}	459	}
455	} else {	460	} else {
456	BugzillaReportElement element = BugzillaReportElement.valueOf(attribute.getId().trim().toUpperCase(	461
457	Locale.ENGLISH));	462	BugzillaReportElement element;
		463	try {
		464	element = BugzillaReportElement.valueOf(attribute.getId().trim().toUpperCase(Locale.ENGLISH));
		465	} catch (RuntimeException e) {
		466	if (e instanceof IllegalArgumentException) {
		467	// ignore unrecognized tags
		468	continue;
		469	}
		470	throw e;
		471	}
458	attribute.clearOptions();	472	attribute.clearOptions();
459	List<String> optionValues = getOptionValues(element, product);	473	List<String> optionValues = getOptionValues(element, product);
460	if (element != BugzillaReportElement.OP_SYS && element != BugzillaReportElement.BUG_SEVERITY	474	if (element != BugzillaReportElement.OP_SYS && element != BugzillaReportElement.BUG_SEVERITY
Lines 463-474 Link Here
463	}	477	}
464	if (element == BugzillaReportElement.TARGET_MILESTONE && optionValues.isEmpty()) {	478	if (element == BugzillaReportElement.TARGET_MILESTONE && optionValues.isEmpty()) {
465		479
466	existingReport.removeAttribute(BugzillaReportElement.TARGET_MILESTONE);	480	existingReport.getRoot().removeAttribute(BugzillaReportElement.TARGET_MILESTONE.getKey());
467	continue;	481	continue;
468	}	482	}
469	attribute.clearOptions();	483	attribute.clearOptions();
470	for (String option : optionValues) {	484	for (String option : optionValues) {
471	attribute.addOption(option, option);	485	attribute.putOption(option, option);
472	}	486	}
473		487
474	// TODO: bug#162428, bug#150680 - something along the lines of...	488	// TODO: bug#162428, bug#150680 - something along the lines of...
Lines 484-496 Link Here
484		498
485	}	499	}
486		500
487	private void addValidOperations(RepositoryTaskData bugReport) {	501	private void addValidOperations(TaskData bugReport) {
488	BUGZILLA_REPORT_STATUS status;	502	TaskAttribute attributeStatus = bugReport.getMappedAttribute(TaskAttribute.STATUS);
		503	BUGZILLA_REPORT_STATUS status = BUGZILLA_REPORT_STATUS.NEW;
489	try {	504	try {
490	status = BUGZILLA_REPORT_STATUS.valueOf(bugReport.getStatus());	505	if (attributeStatus == null) {
		506	StatusHandler.log(new Status(IStatus.WARNING, BugzillaCorePlugin.PLUGIN_ID,
		507	"Status not found for task. Synchronize task to correct."));
		508	} else {
		509	status = BUGZILLA_REPORT_STATUS.valueOf(attributeStatus.getValue());
		510	}
491	} catch (RuntimeException e) {	511	} catch (RuntimeException e) {
492	StatusHandler.log(new Status(IStatus.INFO, BugzillaCorePlugin.PLUGIN_ID, "Unrecognized status: "	512	StatusHandler.log(new Status(IStatus.INFO, BugzillaCorePlugin.PLUGIN_ID, "Unrecognized status: "
493	+ bugReport.getStatus(), e));	513	+ attributeStatus.getValue(), e));
494	status = BUGZILLA_REPORT_STATUS.NEW;	514	status = BUGZILLA_REPORT_STATUS.NEW;
495	}	515	}
496	switch (status) {	516	switch (status) {
Lines 535-589 Link Here
535	}	555	}
536	}	556	}
537		557
538	private void addOperation(RepositoryTaskData bugReport, BUGZILLA_OPERATION opcode) {	558	private void addOperation(TaskData bugReport, BUGZILLA_OPERATION opcode) {
539	RepositoryOperation newOperation = null;	559	TaskAttribute attribute;
		560	TaskOperation newOperation = null;
		561	TaskAttribute operationAttribute = bugReport.getRoot().createAttribute(TaskAttribute.OPERATION);
		562	TaskAttribute operationContainer = bugReport.getRoot().createAttribute(TaskAttribute.CONTAINER_OPERATIONS);
		563	TaskOperation defaultOperation;
		564
540	switch (opcode) {	565	switch (opcode) {
541	case none:	566	case none:
542	newOperation = new RepositoryOperation(opcode.toString(), "Leave as " + bugReport.getStatus() + " "	567	attribute = operationContainer.createAttribute(opcode.toString());
543	+ bugReport.getResolution());	568	attribute.setValue(opcode.toString());
544	newOperation.setChecked(true);	569	newOperation = TaskOperation.createFrom(attribute);
		570
		571	TaskAttribute attributeStatus = bugReport.getMappedAttribute(TaskAttribute.STATUS);
		572	TaskAttribute attributeResolution = bugReport.getMappedAttribute(TaskAttribute.RESOLUTION);
		573
		574	newOperation.setLabel("Leave as " + attributeStatus.getValue() + " " + attributeResolution.getValue());
		575	newOperation.applyTo(attribute);
		576
		577	// set as default
		578	newOperation.applyTo(operationAttribute);
545	break;	579	break;
546	case accept:	580	case accept:
547	newOperation = new RepositoryOperation(opcode.toString(), OPERATION_LABEL_ACCEPT);	581	attribute = operationContainer.createAttribute(opcode.toString());
		582	attribute.setValue(opcode.toString());
		583	newOperation = TaskOperation.createFrom(attribute);
		584	newOperation.setLabel(OPERATION_LABEL_ACCEPT);
548	break;	585	break;
549	case resolve:	586	case resolve:
550	newOperation = new RepositoryOperation(opcode.toString(), OPERATION_LABEL_RESOLVE);	587	attribute = operationContainer.createAttribute(opcode.toString());
551	newOperation.setUpOptions(OPERATION_OPTION_RESOLUTION);	588	attribute.setValue(opcode.toString());
		589	newOperation = TaskOperation.createFrom(attribute);
		590	newOperation.setLabel(OPERATION_LABEL_RESOLVE);
		591
		592	//TaskAttribute.META_ASSOCIATED_ATTRIBUTE_ID
552	for (String resolution : getResolutions()) {	593	for (String resolution : getResolutions()) {
553	// DUPLICATE and MOVED have special meanings so do not show as resolution	594	// DUPLICATE and MOVED have special meanings so do not show as resolution
		595
554	if (resolution.compareTo("DUPLICATE") != 0 && resolution.compareTo("MOVED") != 0) {	596	if (resolution.compareTo("DUPLICATE") != 0 && resolution.compareTo("MOVED") != 0) {
555	newOperation.addOption(resolution, resolution);	597	attribute.putOption(resolution, resolution);
556	}	598	}
557	}	599	}
558	break;	600	break;
559	case duplicate:	601	case duplicate:
560	newOperation = new RepositoryOperation(opcode.toString(), OPERATION_LABEL_DUPLICATE);	602	attribute = operationContainer.createAttribute(OPERATION_INPUT_DUP_ID);
561	newOperation.setInputName(OPERATION_INPUT_DUP_ID);	603	attribute.setValue(opcode.toString());
562	newOperation.setInputValue("");	604	newOperation = TaskOperation.createFrom(attribute);
		605	newOperation.setLabel(OPERATION_LABEL_DUPLICATE);
		606	// TODO: Specify short text input
563	break;	607	break;
564	case reassign:	608	case reassign:
565	newOperation = new RepositoryOperation(opcode.toString(), OPERATION_LABEL_REASSIGN);	609	attribute = operationContainer.createAttribute(OPERATION_INPUT_ASSIGNED_TO);
566	newOperation.setInputName(OPERATION_INPUT_ASSIGNED_TO);	610	attribute.setValue(OPERATION_INPUT_ASSIGNED_TO);
567	newOperation.setInputValue("");	611	newOperation = TaskOperation.createFrom(attribute);
		612	newOperation.setLabel(OPERATION_LABEL_REASSIGN);
568	break;	613	break;
569	case reassignbycomponent:	614	case reassignbycomponent:
570	newOperation = new RepositoryOperation(opcode.toString(), OPERATION_LABEL_REASSIGN_DEFAULT);	615	attribute = operationContainer.createAttribute(opcode.toString());
		616	attribute.setValue(opcode.toString());
		617	newOperation = TaskOperation.createFrom(attribute);
		618	newOperation.setLabel(OPERATION_LABEL_REASSIGN_DEFAULT);
571	break;	619	break;
572	case reopen:	620	case reopen:
573	newOperation = new RepositoryOperation(opcode.toString(), OPERATION_LABEL_REOPEN);	621	attribute = operationContainer.createAttribute(opcode.toString());
		622	attribute.setValue(opcode.toString());
		623	newOperation = TaskOperation.createFrom(attribute);
		624	newOperation.setLabel(OPERATION_LABEL_REOPEN);
574	break;	625	break;
575	case verify:	626	case verify:
576	newOperation = new RepositoryOperation(opcode.toString(), OPERATION_LABEL_VERIFY);	627	attribute = operationContainer.createAttribute(opcode.toString());
		628	attribute.setValue(opcode.toString());
		629	newOperation = TaskOperation.createFrom(attribute);
		630	newOperation.setLabel(OPERATION_LABEL_VERIFY);
577	break;	631	break;
578	case close:	632	case close:
579	newOperation = new RepositoryOperation(opcode.toString(), OPERATION_LABEL_CLOSE);	633	attribute = operationContainer.createAttribute(opcode.toString());
		634	attribute.setValue(opcode.toString());
		635	newOperation = TaskOperation.createFrom(attribute);
		636	newOperation.setLabel(OPERATION_LABEL_CLOSE);
580	break;	637	break;
581	default:	638	default:
582	break;	639	break;
583	}	640	}
584	if (newOperation != null) {
585	bugReport.addOperation(newOperation);
586	}
587	}	641	}
588		642
589	/**	643	/**

Lines 30-38 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/NewBugWizardTest.java (-17 / +17 lines)
30	public void testPlatformOptions() throws Exception {	30	public void testPlatformOptions() throws Exception {
31		31
32	RepositoryTaskData newReport = new RepositoryTaskData(new BugzillaAttributeFactory(),	32	RepositoryTaskData newReport = new RepositoryTaskData(new BugzillaAttributeFactory(),
33	BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_220_URL, "1");	33	BugzillaCorePlugin.CONNECTOR_KIND, IBugzillaConstants.TEST_BUGZILLA_220_URL, "1");
34		34
35	TaskRepository repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND,	35	TaskRepository repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND,
36	IBugzillaConstants.TEST_BUGZILLA_220_URL);	36	IBugzillaConstants.TEST_BUGZILLA_220_URL);
37	AbstractLegacyRepositoryConnector connector = (AbstractLegacyRepositoryConnector) TasksUiPlugin.getRepositoryManager()	37	AbstractLegacyRepositoryConnector connector = (AbstractLegacyRepositoryConnector) TasksUiPlugin.getRepositoryManager()
38	.getRepositoryConnector(repository.getConnectorKind());	38	.getRepositoryConnector(repository.getConnectorKind());
Lines 44-86 Link Here
44		44
45	String os = Platform.getOS();	45	String os = Platform.getOS();
46	if (os.equals("win32")) {	46	if (os.equals("win32")) {
47	assertEquals("Windows", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKeyString()).getValue());	47	assertEquals("Windows", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
48	} else if (os.equals("solaris")) {	48	} else if (os.equals("solaris")) {
49	assertEquals("Solaris", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKeyString()).getValue());	49	assertEquals("Solaris", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
50	} else if (os.equals("qnx")) {	50	} else if (os.equals("qnx")) {
51	assertEquals("QNX-Photon", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKeyString()).getValue());	51	assertEquals("QNX-Photon", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
52	} else if (os.equals("macosx")) {	52	} else if (os.equals("macosx")) {
53	assertEquals("Mac OS", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKeyString()).getValue());	53	assertEquals("Mac OS", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
54	} else if (os.equals("linux")) {	54	} else if (os.equals("linux")) {
55	assertEquals("Linux", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKeyString()).getValue());	55	assertEquals("Linux", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
56	} else if (os.equals("hpux")) {	56	} else if (os.equals("hpux")) {
57	assertEquals("HP-UX", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKeyString()).getValue());	57	assertEquals("HP-UX", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
58	} else if (os.equals("aix")) {	58	} else if (os.equals("aix")) {
59	assertEquals("AIX", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKeyString()).getValue());	59	assertEquals("AIX", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKey()).getValue());
60	}	60	}
61		61
62	String platform = Platform.getOSArch();	62	String platform = Platform.getOSArch();
63	if (platform.equals("x86")) {	63	if (platform.equals("x86")) {
64	if (os.equals("macosx")) {	64	if (os.equals("macosx")) {
65	assertEquals("Macintosh", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString())	65	assertEquals("Macintosh", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey())
66	.getValue());	66	.getValue());
67	} else {	67	} else {
68	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());	68	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey()).getValue());
69	}	69	}
70	} else if (platform.equals("x86_64")) {	70	} else if (platform.equals("x86_64")) {
71	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());	71	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey()).getValue());
72	} else if (platform.equals("ia64")) {	72	} else if (platform.equals("ia64")) {
73	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());	73	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey()).getValue());
74	} else if (platform.equals("ia64_32")) {	74	} else if (platform.equals("ia64_32")) {
75	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());	75	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey()).getValue());
76	} else if (platform.equals("sparc")) {	76	} else if (platform.equals("sparc")) {
77	assertEquals("Sun", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());	77	assertEquals("Sun", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey()).getValue());
78	} else if (platform.equals("ppc")) {	78	} else if (platform.equals("ppc")) {
79	if (os.equals("macosx")) {	79	if (os.equals("macosx")) {
80	assertEquals("Macintosh", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString())	80	assertEquals("Macintosh", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey())
81	.getValue());	81	.getValue());
82	} else {	82	} else {
83	assertEquals("Power", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString())	83	assertEquals("Power", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKey())
84	.getValue());	84	.getValue());
85	}	85	}
86	}	86	}

Lines 44-50 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java (-4 / +4 lines)
44	super.setUp();	44	super.setUp();
45	manager = TasksUiPlugin.getRepositoryManager();	45	manager = TasksUiPlugin.getRepositoryManager();
46	manager.clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath());	46	manager.clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath());
47	repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL);	47	repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL);
48	Credentials credentials = TestUtil.readCredentials();	48	Credentials credentials = TestUtil.readCredentials();
49	repository.setAuthenticationCredentials(credentials.username, credentials.password);	49	repository.setAuthenticationCredentials(credentials.username, credentials.password);
50	repository.setAnonymous(false);	50	repository.setAnonymous(false);
Lines 53-59 Link Here
53		53
54	private BugzillaClient createClient(String hostUrl, String username, String password, String htAuthUser,	54	private BugzillaClient createClient(String hostUrl, String username, String password, String htAuthUser,
55	String htAuthPass, String encoding) throws MalformedURLException {	55	String htAuthPass, String encoding) throws MalformedURLException {
56	TaskRepository taskRepository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, hostUrl);	56	TaskRepository taskRepository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND, hostUrl);
57		57
58	AuthenticationCredentials credentials = new AuthenticationCredentials(username, password);	58	AuthenticationCredentials credentials = new AuthenticationCredentials(username, password);
59	taskRepository.setCredentials(AuthenticationType.REPOSITORY, credentials, false);	59	taskRepository.setCredentials(AuthenticationType.REPOSITORY, credentials, false);
Lines 149-155 Link Here
149	page.setUrl(IBugzillaConstants.TEST_BUGZILLA_218_URL);	149	page.setUrl(IBugzillaConstants.TEST_BUGZILLA_218_URL);
150	wizard.performFinish();	150	wizard.performFinish();
151	assertEquals(1, manager.getAllRepositories().size());	151	assertEquals(1, manager.getAllRepositories().size());
152	TaskRepository repositoryTest = manager.getRepository(BugzillaCorePlugin.REPOSITORY_KIND,	152	TaskRepository repositoryTest = manager.getRepository(BugzillaCorePlugin.CONNECTOR_KIND,
153	IBugzillaConstants.TEST_BUGZILLA_218_URL);	153	IBugzillaConstants.TEST_BUGZILLA_218_URL);
154	assertNotNull(repositoryTest);	154	assertNotNull(repositoryTest);
155	assertEquals(tempUid, repositoryTest.getUserName());	155	assertEquals(tempUid, repositoryTest.getUserName());
Lines 168-174 Link Here
168	page.setUserId("bogus");	168	page.setUserId("bogus");
169	wizard.performFinish();	169	wizard.performFinish();
170	assertEquals(1, manager.getAllRepositories().size());	170	assertEquals(1, manager.getAllRepositories().size());
171	TaskRepository repositoryTest = manager.getRepository(BugzillaCorePlugin.REPOSITORY_KIND,	171	TaskRepository repositoryTest = manager.getRepository(BugzillaCorePlugin.CONNECTOR_KIND,
172	IBugzillaConstants.TEST_BUGZILLA_222_URL);	172	IBugzillaConstants.TEST_BUGZILLA_222_URL);
173	assertNotNull(repositoryTest);	173	assertNotNull(repositoryTest);
174	wizard = new EditRepositoryWizard(repositoryTest);	174	wizard = new EditRepositoryWizard(repositoryTest);

Lines 14-29 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java (-10 / +13 lines)
14		14
15	import org.eclipse.core.runtime.CoreException;	15	import org.eclipse.core.runtime.CoreException;
16	import org.eclipse.core.runtime.NullProgressMonitor;	16	import org.eclipse.core.runtime.NullProgressMonitor;
		17	import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
		18	import org.eclipse.mylyn.commons.net.AuthenticationType;
17	import org.eclipse.mylyn.context.tests.support.TestUtil;	19	import org.eclipse.mylyn.context.tests.support.TestUtil;
18	import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;	20	import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
19	import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;	21	import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
20	import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;	22	import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
21	import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
22	import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;	23	import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
23	import org.eclipse.mylyn.internal.tasks.core.AbstractTask;	24	import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
24	import org.eclipse.mylyn.internal.tasks.core.TaskList;	25	import org.eclipse.mylyn.internal.tasks.core.TaskList;
25	import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;	26	import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
26	import org.eclipse.mylyn.internal.tasks.core.deprecated.RepositoryTaskData;
27	import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;	27	import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
28	import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;	28	import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
29	import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;	29	import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
Lines 31-36 Link Here
31	import org.eclipse.mylyn.tasks.core.ITask;	31	import org.eclipse.mylyn.tasks.core.ITask;
32	import org.eclipse.mylyn.tasks.core.TaskRepository;	32	import org.eclipse.mylyn.tasks.core.TaskRepository;
33	import org.eclipse.mylyn.tasks.core.ITask.SynchronizationState;	33	import org.eclipse.mylyn.tasks.core.ITask.SynchronizationState;
		34	import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
		35	import org.eclipse.mylyn.tasks.core.data.TaskData;
34		36
35	/**	37	/**
36	* @author Mik Kersten	38	* @author Mik Kersten
Lines 39-45 Link Here
39	*/	41	*/
40	public abstract class AbstractBugzillaTest extends TestCase {	42	public abstract class AbstractBugzillaTest extends TestCase {
41		43
42	static final String DEFAULT_KIND = BugzillaCorePlugin.REPOSITORY_KIND;	44	static final String DEFAULT_KIND = BugzillaCorePlugin.CONNECTOR_KIND;
43		45
44	protected BugzillaRepositoryConnector connector;	46	protected BugzillaRepositoryConnector connector;
45		47
Lines 58-64 Link Here
58	super.setUp();	60	super.setUp();
59	TasksUiPlugin.getDefault().getPreferenceStore().setValue(	61	TasksUiPlugin.getDefault().getPreferenceStore().setValue(
60	ITasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED, false);	62	ITasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED, false);
61	TasksUiPlugin.getTaskDataStorageManager().clear();	63	//TasksUiPlugin.getTaskDataManager().clear();
62	manager = TasksUiPlugin.getRepositoryManager();	64	manager = TasksUiPlugin.getRepositoryManager();
63	TasksUiPlugin.getDefault().reloadDataDirectory();	65	TasksUiPlugin.getDefault().reloadDataDirectory();
64	manager.clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath());	66	manager.clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath());
Lines 99-105 Link Here
99	protected void init(String url) {	101	protected void init(String url) {
100	repository = new TaskRepository(DEFAULT_KIND, url);	102	repository = new TaskRepository(DEFAULT_KIND, url);
101	Credentials credentials = TestUtil.readCredentials();	103	Credentials credentials = TestUtil.readCredentials();
102	repository.setAuthenticationCredentials(credentials.username, credentials.password);	104	repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials(credentials.username,
		105	credentials.password), false);
103		106
104	repository.setTimeZoneId("Canada/Eastern");	107	repository.setTimeZoneId("Canada/Eastern");
105	assertNotNull(manager);	108	assertNotNull(manager);
Lines 114-130 Link Here
114	connector = (BugzillaRepositoryConnector) abstractRepositoryClient;	117	connector = (BugzillaRepositoryConnector) abstractRepositoryClient;
115	}	118	}
116		119
117	protected BugzillaTask generateLocalTaskAndDownload(String taskNumber) throws CoreException {	120	protected ITask generateLocalTaskAndDownload(String taskNumber) throws CoreException {
118	BugzillaTask task = (BugzillaTask) TasksUiInternal.createTask(repository, taskNumber, new NullProgressMonitor());	121	ITask task = TasksUiInternal.createTask(repository, taskNumber, new NullProgressMonitor());
119	TasksUiPlugin.getTaskDataManager().setTaskRead(task, true);	122	TasksUiPlugin.getTaskDataManager().setTaskRead(task, true);
120	assertNotNull(task);	123	assertNotNull(task);
121	TasksUiPlugin.getTaskList().addTask(task, TasksUiPlugin.getTaskList().getDefaultCategory());	124	//TasksUiPlugin.getTaskList().addTask(task, TasksUiPlugin.getTaskList().getDefaultCategory());
122		125
123	return task;	126	return task;
124	}	127	}
125		128
126	protected void submit(ITask task, RepositoryTaskData taskData) throws CoreException {	129	protected void submit(ITask task, TaskData taskData, Set<TaskAttribute> changedAttributes) throws CoreException {
127	connector.getLegacyTaskDataHandler().postTaskData(repository, taskData, new NullProgressMonitor());	130	connector.getTaskDataHandler().postTaskData(repository, taskData, changedAttributes, new NullProgressMonitor());
128	((AbstractTask) task).setSubmitting(true);	131	((AbstractTask) task).setSubmitting(true);
129	}	132	}
130		133

Added Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest2.java (+63 lines)
1	/*******************************************************************************
2	* Copyright (c) 2004, 2007 Mylyn project committers and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*******************************************************************************/
8
9	package org.eclipse.mylyn.bugzilla.tests;
10
11	import java.text.ParseException;
12	import java.text.SimpleDateFormat;
13
14	import org.eclipse.core.runtime.CoreException;
15	import org.eclipse.core.runtime.NullProgressMonitor;
16	import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement;
17	import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
18	import org.eclipse.mylyn.tasks.core.ITask.PriorityLevel;
19	import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
20	import org.eclipse.mylyn.tasks.core.data.TaskCommentMapper;
21	import org.eclipse.mylyn.tasks.core.data.TaskData;
22	import org.eclipse.mylyn.tasks.core.data.TaskMapper;
23
24	public class BugzillaRepositoryConnectorTest2 extends AbstractBugzillaTest {
25
26	public void testDataRetrieval() throws CoreException, ParseException {
27	init(IBugzillaConstants.TEST_BUGZILLA_30_URL);
28	TaskData data = connector.getTaskData(repository, "2", new NullProgressMonitor());
29	assertNotNull(data);
30	TaskMapper mapper = new TaskMapper(data);
31	assertEquals("2", data.getTaskId());
32	assertEquals("New bug submit", mapper.getSummary());
33	assertEquals("Test new bug submission", mapper.getDescription());
34	assertEquals(PriorityLevel.P2, mapper.getPriority());
35	assertEquals("TestComponent", mapper.getComponent());
36	assertEquals("nhapke@cs.ubc.ca", mapper.getOwner());
37	assertEquals("TestProduct", mapper.getProduct());
38	assertEquals("PC", mapper.getValue(BugzillaReportElement.REP_PLATFORM.getKey()));
39	assertEquals("Windows", mapper.getValue(BugzillaReportElement.OP_SYS.getKey()));
40	assertEquals("ASSIGNED", mapper.getValue(BugzillaReportElement.BUG_STATUS.getKey()));
41	SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
42	SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
43	assertEquals(format1.parse("2007-03-20 16:37"), mapper.getCreationDate());
44	assertEquals(format2.parse("2007-12-06 20:50:00"), mapper.getModificationDate());
45
46	//assertEquals("", mapper.getTaskUrl());
47	//assertEquals("bugzilla", mapper.getTaskKind());
48	//assertEquals("", mapper.getTaskKey());
49
50	// test comments
51	TaskAttribute comments = data.getMappedAttribute(TaskAttribute.CONTAINER_COMMENTS);
52	assertEquals(12, comments.getAttributes().size());
53	TaskCommentMapper commentMap = TaskCommentMapper.createFrom(comments.getAttribute("0"));
54	assertEquals("Rob Elves", commentMap.getAuthor().getName());
55	assertEquals("Test new bug submission", commentMap.getText());
56	commentMap = TaskCommentMapper.createFrom(comments.getAttribute("1"));
57	assertEquals("Rob Elves", commentMap.getAuthor().getName());
58	assertEquals("Created an attachment (id=1)\ntest\n\ntest attachments", commentMap.getText());
59	commentMap = TaskCommentMapper.createFrom(comments.getAttribute("11"));
60	assertEquals("Tests", commentMap.getAuthor().getName());
61	assertEquals("test", commentMap.getText());
62	}
63	}