Attachment 105202 Details for Bug 237212 – patch

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

patch

clipboard.txt (text/plain), 10.79 KB, created by Frank Becker

on 2008-06-17 16:15:51 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2008-06-17 16:15:51 EDT

Size: 10.79 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.tests
>Index: src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java,v
>retrieving revision 1.156
>diff -u -r1.156 BugzillaRepositoryConnectorTest.java
>--- src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java	29 May 2008 00:33:02 -0000	1.156
>+++ src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java	17 Jun 2008 20:14:17 -0000
>@@ -58,113 +58,6 @@
> ////		}
> ////	}
> //
>-//	ITask fruitTask;
>-//
>-//	TaskData fruitTaskData;
>-//
>-//	private void setFruitValueTo(String newValue) throws CoreException {
>-//		Set<TaskAttribute> changed = new HashSet<TaskAttribute>();
>-//		TaskAttribute att = fruitTaskData.getRoot().createAttribute("cf_fruit");
>-//		att.setValue(newValue);
>-//		assertEquals(newValue, fruitTaskData.getRoot().getAttribute("cf_fruit").getValue());
>-//		changed.add(fruitTaskData.getRoot().getAttribute("cf_fruit"));
>-//		submit(fruitTask, fruitTaskData, changed);
>-//		TasksUiInternal.synchronizeTask(connector, fruitTask, true, null);
>-//		fruitTaskData = TasksUiPlugin.getTaskDataManager().getTaskData(repository, fruitTask.getTaskId());
>-//		assertEquals(newValue, fruitTaskData.getRoot().getAttribute("cf_fruit").getValue());
>-//
>-//	}
>-//
>-//	public void testCustomFields() throws Exception {
>-//		init(IBugzillaConstants.TEST_BUGZILLA_303_URL);
>-//
>-//		String taskNumber = "1";
>-//		TasksUiPlugin.getTaskDataStorageManager().clear();
>-//
>-//		// Get the task
>-//		fruitTask = generateLocalTaskAndDownload(taskNumber);
>-//
>-//		ITaskDataWorkingCopy working = TasksUiPlugin.getTaskDataManager().getWorkingCopy(fruitTask);
>-//		assertNotNull(working);
>-//
>-//		if (fruitTaskData.getRoot().getAttribute("cf_fruit").getValue().equals("---")) {
>-//			setFruitValueTo("apple");
>-//			setFruitValueTo("orange");
>-//			setFruitValueTo("---");
>-//		} else if (fruitTaskData.getRoot().getAttribute("cf_fruit").getValue().equals("apple")) {
>-//			setFruitValueTo("orange");
>-//			setFruitValueTo("apple");
>-//			setFruitValueTo("---");
>-//		} else if (fruitTaskData.getRoot().getAttribute("cf_fruit").getValue().equals("orange")) {
>-//			setFruitValueTo("apple");
>-//			setFruitValueTo("orange");
>-//			setFruitValueTo("---");
>-//		}
>-//		if (fruitTask != null) {
>-//			fruitTask = null;
>-//		}
>-//		if (fruitTaskData != null) {
>-//			fruitTaskData = null;
>-//		}
>-//	}
>-//
>-////	public void testMidAirCollision() throws Exception {
>-////		init30();
>-////		String taskNumber = "5";
>-////
>-////		TasksUiPlugin.getTaskDataStorageManager().clear();
>-////
>-////		// Get the task
>-////		ITask task = generateLocalTaskAndDownload(taskNumber);
>-////
>-////		TaskData taskData = TasksUiPlugin.getTaskDataManager().getTaskData(task);
>-////		assertNotNull(taskData);
>-////
>-////		TasksUiPlugin.getTaskList().addTask(task);
>-////
>-////		String newCommentText = "BugzillaRepositoryClientTest.testMidAirCollision(): test " + (new Date()).toString();
>-////		taskData.setNewComment(newCommentText);
>-////		Set<TaskAttribute> changed = new HashSet<TaskAttribute>();
>-////		changed.add(taskData.getAttribute(TaskAttribute.COMMENT_NEW));
>-////		taskData.setAttributeValue("delta_ts", "2007-01-01 00:00:00");
>-////		changed.add(taskData.getAttribute("delta_ts"));
>-////
>-////		TasksUiPlugin.getTaskDataStorageManager().saveEdits(task.getRepositoryUrl(), task.getTaskId(), changed);
>-////
>-////		try {
>-////			// Submit changes
>-////			submit(task, taskData, changed);
>-////			fail("Mid-air collision expected");
>-////		} catch (CoreException e) {
>-////			assertTrue(e.getStatus().getMessage().indexOf("Mid-air collision occurred while submitting") != -1);
>-////		}
>-////	}
>-//
>-////	public void testAuthenticationCredentials() throws Exception {
>-////		init218();
>-////		BugzillaTask task = this.generateLocalTaskAndDownload("3");
>-////		assertNotNull(task);
>-////		assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task.getRepositoryUrl(),
>-////				task.getTaskId()));
>-////		TasksUiPlugin.getTaskListManager().activateTask(task);
>-////		File sourceContextFile = ContextCorePlugin.getContextStore().getFileForContext(task.getHandleIdentifier());
>-////		assertEquals(SynchronizationState.SYNCHRONIZED, task.getSynchronizationState());
>-////		sourceContextFile.createNewFile();
>-////		sourceContextFile.deleteOnExit();
>-////
>-////		repository.setAuthenticationCredentials("wrong", "wrong");
>-////		TasksUiPlugin.getRepositoryManager().notifyRepositorySettingsChanged(repository);
>-////		try {
>-////			AttachmentUtil.attachContext(connector.getAttachmentHandler(), repository, task, "",
>-////					new NullProgressMonitor());
>-////		} catch (CoreException e) {
>-////			assertEquals(SynchronizationState.SYNCHRONIZED, task.getSynchronizationState());
>-////			assertTrue(e.getStatus().getMessage().indexOf("Invalid repository credentials.") != -1);
>-////			return;
>-////		}
>-////		fail("Should have failed due to invalid userid and password.");
>-////	}
>-//
> ////  testReassign Bugs
> ////	Version	BugNr	assigned				reporter
> ////	2.22	92		user@mylar.eclipse.org	tests@mylar.eclipse.org
>Index: src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java,v
>retrieving revision 1.60
>diff -u -r1.60 AbstractBugzillaTest.java
>--- src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java	30 May 2008 01:07:02 -0000	1.60
>+++ src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java	17 Jun 2008 20:14:16 -0000
>@@ -84,6 +84,10 @@
> 		init(IBugzillaConstants.TEST_BUGZILLA_30_URL);
> 	}
> 
>+	protected void init303() {
>+		init(IBugzillaConstants.TEST_BUGZILLA_303_URL);
>+	}
>+
> 	protected void init222() {
> 		init(IBugzillaConstants.TEST_BUGZILLA_222_URL);
> 	}
>Index: src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest2.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest2.java,v
>retrieving revision 1.12
>diff -u -r1.12 BugzillaRepositoryConnectorTest2.java
>--- src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest2.java	13 Jun 2008 23:26:37 -0000	1.12
>+++ src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest2.java	17 Jun 2008 20:14:17 -0000
>@@ -23,11 +23,11 @@
> import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttribute;
> import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClient;
> import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskAttachmentHandler;
>-import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
> import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
> import org.eclipse.mylyn.internal.tasks.core.data.FileTaskAttachmentSource;
> import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
> import org.eclipse.mylyn.internal.tasks.ui.util.AttachmentUtil;
>+import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
> import org.eclipse.mylyn.tasks.core.ITask;
> import org.eclipse.mylyn.tasks.core.ITask.PriorityLevel;
> import org.eclipse.mylyn.tasks.core.ITask.SynchronizationState;
>@@ -43,6 +43,60 @@
> 
> public class BugzillaRepositoryConnectorTest2 extends AbstractBugzillaTest {
> 
>+	private void setFruitValueTo(ITask task, String newFruit) {
>+		Set<TaskAttribute> changed = new HashSet<TaskAttribute>();
>+		TaskAttribute attrNewComment = fruitTaskData.getRoot().getAttribute("cf_fruit");
>+		attrNewComment.setValue(newFruit);
>+		changed.add(attrNewComment);
>+		try {
>+			submit(task, fruitTaskData, changed);
>+		} catch (CoreException e) {
>+			// TODO Auto-generated catch block
>+			e.printStackTrace();
>+		}
>+		TasksUiInternal.synchronizeTask(connector, task, true, null);
>+		TaskDataModel model;
>+		try {
>+			model = createModel(task);
>+			fruitTaskData = model.getTaskData();
>+		} catch (CoreException e) {
>+			// TODO Auto-generated catch block
>+			e.printStackTrace();
>+		}
>+		assertEquals(newFruit, fruitTaskData.getRoot().getAttribute("cf_fruit").getValue());
>+
>+	}
>+
>+	TaskDataModel fruitModel = null;
>+
>+	TaskData fruitTaskData = null;;
>+
>+	public void testCustomFields() throws Exception {
>+		init303();
>+		String taskNumber = "1";
>+		ITask task = generateLocalTaskAndDownload(taskNumber);
>+		assertNotNull(task);
>+		fruitModel = createModel(task);
>+		fruitTaskData = fruitModel.getTaskData();
>+		assertNotNull(fruitTaskData);
>+		String fruitValue = fruitTaskData.getRoot().getAttribute("cf_fruit").getValue();
>+
>+		if (fruitValue.equals("---")) {
>+			setFruitValueTo(task, "apple");
>+			setFruitValueTo(task, "orange");
>+			setFruitValueTo(task, "---");
>+		} else if (fruitValue.equals("apple")) {
>+			setFruitValueTo(task, "orange");
>+			setFruitValueTo(task, "---");
>+			setFruitValueTo(task, "apple");
>+		} else if (fruitValue.equals("orange")) {
>+			setFruitValueTo(task, "---");
>+			setFruitValueTo(task, "apple");
>+			setFruitValueTo(task, "orange");
>+		}
>+
>+	}
>+
> 	public void testAttachToExistingReport() throws Exception {
> 		init222();
> 		String taskNumber = "33";
>@@ -135,7 +189,7 @@
> 	}
> 
> 	public void testDataRetrieval() throws CoreException, ParseException {
>-		init(IBugzillaConstants.TEST_BUGZILLA_30_URL);
>+		init30();
> 		TaskData data = connector.getTaskData(repository, "2", new NullProgressMonitor());
> 		assertNotNull(data);
> 		TaskMapper mapper = new TaskMapper(data);
>@@ -159,11 +213,11 @@
> 		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(format2.parse("2008-05-28 17:17:21"), mapper.getModificationDate());
> 
>-		//assertEquals("", mapper.getTaskUrl());
>-		//assertEquals("bugzilla", mapper.getTaskKind());
>-		//assertEquals("", mapper.getTaskKey());
>+//		assertEquals(IBugzillaConstants.TEST_BUGZILLA_30_URL + "/", mapper.getTaskUrl());
>+//		assertEquals(BugzillaCorePlugin.CONNECTOR_KIND, mapper.getTaskKind());
>+//		assertEquals("2", mapper.getTaskKey());
> 
> 		// test comments
> 		List<TaskAttribute> comments = data.getAttributeMapper().getAttributesByType(data, TaskAttribute.TYPE_COMMENT);
>@@ -189,8 +243,6 @@
> 		TaskData taskData = workingCopy.getLocalData();
> 		assertNotNull(taskData);
> 
>-//		TasksUiPlugin.getTaskList().addTask(task);
>-
> 		String newCommentText = "BugzillaRepositoryClientTest.testMidAirCollision(): test " + (new Date()).toString();
> 		TaskAttribute attrNewComment = taskData.getRoot().getMappedAttribute(TaskAttribute.COMMENT_NEW);
> 		attrNewComment.setValue(newCommentText);

Actions: View

Attachments on bug 237212: 105202