diff options
Diffstat (limited to 'org.eclipse.mylyn.tasks.tests')
11 files changed, 220 insertions, 164 deletions
diff --git a/org.eclipse.mylyn.tasks.tests/TaskAttachmentActionsTest.testfile b/org.eclipse.mylyn.tasks.tests/TaskAttachmentActionsTest.testfile new file mode 100644 index 000000000..2ced879fe --- /dev/null +++ b/org.eclipse.mylyn.tasks.tests/TaskAttachmentActionsTest.testfile @@ -0,0 +1,11 @@ +public class BugzillaContextLabelProvider extends AbstractContextLabelProvider { + + @Override + protected Image getImage(IMylarElement node) { + return TaskListImages.getImage(TaskListImages.TASK_REMOTE); + } + + @Override + protected Image getImage(IMylarRelation edge) { + return MylarImages.getImage(MylarBugsPlugin.EDGE_REF_BUGZILLA); + }
\ No newline at end of file diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/CopyDetailsActionTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/CopyDetailsActionTest.java index de4dec441..0247580bc 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/CopyDetailsActionTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/CopyDetailsActionTest.java @@ -19,9 +19,9 @@ import org.eclipse.mylar.tasks.tests.connector.MockRepositoryTask; public class CopyDetailsActionTest extends TestCase { public void testIdLabelIncluded() { - MockRepositoryTask task = new MockRepositoryTask("repo-123"); + MockRepositoryTask task = new MockRepositoryTask("123"); String text = CopyTaskDetailsAction.getTextForTask(task); - assertTrue(text.startsWith(task.getIdLabel())); + assertTrue(text.startsWith(task.getIdentifyingLabel())); } } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java index a4189dbdb..bbc0f0a5f 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java @@ -306,10 +306,10 @@ public class RepositoryTaskSynchronizationTest extends TestCase { AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED, RepositoryTaskSyncState.SYNCHRONIZED); RepositoryTaskData taskData1 = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1"); - TasksUiPlugin.getDefault().getTaskDataManager().push(taskData1); + TasksUiPlugin.getDefault().getTaskDataManager().push(task.getHandleIdentifier(), taskData1); RepositoryTaskData taskData2 = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1"); taskData2.setNewComment("new comment"); - TasksUiPlugin.getDefault().getTaskDataManager().push(taskData2); + TasksUiPlugin.getDefault().getTaskDataManager().push(task.getHandleIdentifier(), taskData2); List<ITaskListElement> tasks = new ArrayList<ITaskListElement>(); tasks.add(task); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java index 4af817d0b..b1c67a86c 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java @@ -16,8 +16,8 @@ import java.util.Set; import junit.framework.TestCase; import org.eclipse.core.runtime.CoreException; +import org.eclipse.mylar.internal.tasks.core.RepositoryTaskHandleUtil; import org.eclipse.mylar.internal.tasks.core.TaskDataManager; -import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylar.tasks.core.RepositoryTaskData; import org.eclipse.mylar.tasks.tests.connector.MockAttributeFactory; @@ -50,26 +50,36 @@ public class TaskDataManagerTest extends TestCase { public void testAdd() throws CoreException { RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1"); - offlineTaskDataManager.push(taskData); - assertNotNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1")); + offlineTaskDataManager.push(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"), + taskData); + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); } public void testSave() throws CoreException, IOException, ClassNotFoundException { RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1"); - offlineTaskDataManager.push(taskData); + offlineTaskDataManager.push(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"), + taskData); taskData = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "2"); - offlineTaskDataManager.push(taskData); - assertNotNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1")); - assertNotNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "2")); + offlineTaskDataManager.push(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "2"), + taskData); + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "2"))); offlineTaskDataManager.save(); offlineTaskDataManager.clear(); - assertNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1")); - assertNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "2")); + assertNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); + assertNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "2"))); offlineTaskDataManager.readOfflineData(); - assertNotNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1")); - assertNotNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "2")); + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "2"))); } public void testGetNextOfflineBugId() throws IOException, ClassNotFoundException { @@ -85,162 +95,191 @@ public class TaskDataManagerTest extends TestCase { RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1"); taskData.setNewComment("version 1"); - offlineTaskDataManager.push(taskData); - assertNotNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1")); + offlineTaskDataManager.push(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"), + taskData); + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); taskData = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1"); taskData.setNewComment("version 2"); - offlineTaskDataManager.push(taskData); + offlineTaskDataManager.push(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"), + taskData); offlineTaskDataManager.save(); offlineTaskDataManager.clear(); offlineTaskDataManager.readOfflineData(); - assertEquals("version 2", offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1") - .getNewComment()); - assertEquals("version 1", offlineTaskDataManager.getOldRepositoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1") - .getNewComment()); + assertEquals("version 2", offlineTaskDataManager.getRepositoryTaskData( + RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1")).getNewComment()); + assertEquals("version 1", offlineTaskDataManager.getOldRepositoryTaskData( + RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1")).getNewComment()); } - public void testUniqueCopy() throws Exception { RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1"); - offlineTaskDataManager.push(taskData); - RepositoryTaskData taskData2 = offlineTaskDataManager.getEditableCopy(MockRepositoryConnector.REPOSITORY_URL, "1"); + offlineTaskDataManager.push(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"), + taskData); + RepositoryTaskData taskData2 = offlineTaskDataManager.getEditableCopy(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1")); assertNotNull(taskData2); taskData2.setNewComment("test"); taskData = null; - taskData = offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1"); + taskData = offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1")); assertFalse(taskData.getNewComment().equals("test")); taskData = null; - taskData = offlineTaskDataManager.getOldRepositoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1"); - assertFalse(taskData.getNewComment().equals("test")); + taskData = offlineTaskDataManager.getOldRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1")); + assertFalse(taskData.getNewComment().equals("test")); } - + public void testRemoveRepositoryTaskData() throws CoreException, IOException, ClassNotFoundException { RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1"); - offlineTaskDataManager.push(taskData); + offlineTaskDataManager.push(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"), + taskData); taskData = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "2"); - offlineTaskDataManager.push(taskData); + offlineTaskDataManager.push(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "2"), + taskData); offlineTaskDataManager.save(); - assertNotNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1")); - assertNotNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "2")); - offlineTaskDataManager.remove(taskData); - assertNotNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1")); - assertNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "2")); + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "2"))); + offlineTaskDataManager.remove(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "2")); + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); + assertNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "2"))); offlineTaskDataManager.save(); offlineTaskDataManager.clear(); offlineTaskDataManager.readOfflineData(); - assertNotNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1")); - assertNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "2")); + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); + assertNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "2"))); } public void testRemoveListOfRepositoryTaskData() throws CoreException, IOException, ClassNotFoundException { RepositoryTaskData taskData1 = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1"); - offlineTaskDataManager.push(taskData1); + offlineTaskDataManager.push(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"), + taskData1); RepositoryTaskData taskData2 = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "2"); - offlineTaskDataManager.push(taskData2); + offlineTaskDataManager.push(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "2"), + taskData2); offlineTaskDataManager.save(); - assertNotNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1")); - assertNotNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "2")); - ArrayList<RepositoryTaskData> list = new ArrayList<RepositoryTaskData>(); - list.add(taskData1); - list.add(taskData2); + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "2"))); + ArrayList<String> list = new ArrayList<String>(); + list.add(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1")); + list.add(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "2")); offlineTaskDataManager.remove(list); - assertNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1")); - assertNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "2")); + assertNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); + assertNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "2"))); offlineTaskDataManager.save(); offlineTaskDataManager.clear(); offlineTaskDataManager.readOfflineData(); - assertNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "1")); - assertNull(offlineTaskDataManager.getRepsitoryTaskData(MockRepositoryConnector.REPOSITORY_URL, "2")); + assertNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); + assertNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "2"))); } public void testEditing() { RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), - MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1"); - offlineTaskDataManager.push(taskData); - - assertNotNull(offlineTaskDataManager.getRepositoryTaskData( AbstractRepositoryTask.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"))); - assertNotNull(offlineTaskDataManager.getOldRepositoryTaskData(AbstractRepositoryTask.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"))); - - RepositoryTaskData editData = offlineTaskDataManager.getEditableCopy(AbstractRepositoryTask.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1")); + MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1"); + offlineTaskDataManager.push(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"), + taskData); + + assertNotNull(offlineTaskDataManager.getRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); + assertNotNull(offlineTaskDataManager.getOldRepositoryTaskData(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1"))); + + RepositoryTaskData editData = offlineTaskDataManager.getEditableCopy(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1")); assertNotNull(editData); editData.setAttributeFactory(new MockAttributeFactory()); editData.setAttributeValue(RepositoryTaskAttribute.COMMENT_NEW, "new comment"); -// for (RepositoryTaskAttribute attribute: editData.getAttributes()) { -// assertTrue(taskData.getAttribute(attribute.getID()).equals(attribute)); -// } - + // for (RepositoryTaskAttribute attribute: editData.getAttributes()) { + // assertTrue(taskData.getAttribute(attribute.getID()).equals(attribute)); + // } + Set<RepositoryTaskAttribute> attSave = new HashSet<RepositoryTaskAttribute>(); attSave.add(editData.getAttribute(RepositoryTaskAttribute.COMMENT_NEW)); - offlineTaskDataManager.saveEdits(AbstractRepositoryTask.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"), attSave); - + offlineTaskDataManager.saveEdits(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"), + attSave); + editData = null; - editData = offlineTaskDataManager.getEditableCopy(AbstractRepositoryTask.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1")); + editData = offlineTaskDataManager.getEditableCopy(RepositoryTaskHandleUtil.getHandle( + MockRepositoryConnector.REPOSITORY_URL, "1")); assertNotNull(editData); assertEquals("new comment", editData.getAttributeValue(RepositoryTaskAttribute.COMMENT_NEW)); - - - - + } - -// /** DND -// * As is will write 81481326 bytes. -// * -// * @throws Exception -// */ -// public void testLargeDataSet() throws Exception { -// RepositoryTaskData taskData; -// for (int x = 1; x < 500; x++) { -// taskData = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, -// MockRepositoryConnector.REPOSITORY_URL, "" + x); -// -// for (int y = 1; y < 60; y++) { -// RepositoryTaskAttribute attribute = new RepositoryTaskAttribute("" + y, "" + y, false); -// for (int z = 1; z < 10; z++) { -// attribute.addOption("" + z, "" + z); -// attribute.addValue("" + z); -// } -// taskData.addAttribute("" + y, attribute); -// } -// -// for (int y = 1; y < 5; y++) { -// RepositoryOperation op = new RepositoryOperation("" + y, "" + y); -// taskData.addOperation(op); -// } -// -// try { -// for (int y = 1; y < 1000; y++) { -// TaskComment comment = new TaskComment(new MockAttributeFactory(), y); -// comment.setAttributeValue(RepositoryTaskAttribute.COMMENT_TEXT, "Testing \u05D0"); -// taskData.addComment(comment); -// } -// } catch (StackOverflowError e) { -// e.printStackTrace(); -// } -// -// // for(int y = 1; y < 1000; y++) { -// // RepositoryAttachment attachment = new -// // RepositoryAttachment(repository, new MockAttributeFactory()); -// // taskData.addAttachment(attachment); -// // } -// -// offlineTaskDataManager.put(taskData); -// offlineTaskDataManager.put(taskData); -// } -// System.err.println("done Building"); -// offlineTaskDataManager.save(); -// System.err.println("Saved"); -// File file = TasksUiPlugin.getDefault().getOfflineReportsFilePath().toFile(); -// System.err.println(file.length()); -// offlineTaskDataManager.clear(); -// offlineTaskDataManager.readOfflineData(); -// assertNotNull(offlineTaskDataManager.getOldTaskData(AbstractRepositoryTask.getHandle( -// MockRepositoryConnector.REPOSITORY_URL, 400))); -// } + + // /** DND + // * As is will write 81481326 bytes. + // * + // * @throws Exception + // */ + // public void testLargeDataSet() throws Exception { + // RepositoryTaskData taskData; + // for (int x = 1; x < 500; x++) { + // taskData = new RepositoryTaskData(new MockAttributeFactory(), + // MockRepositoryConnector.REPOSITORY_KIND, + // MockRepositoryConnector.REPOSITORY_URL, "" + x); + // + // for (int y = 1; y < 60; y++) { + // RepositoryTaskAttribute attribute = new RepositoryTaskAttribute("" + y, + // "" + y, false); + // for (int z = 1; z < 10; z++) { + // attribute.addOption("" + z, "" + z); + // attribute.addValue("" + z); + // } + // taskData.addAttribute("" + y, attribute); + // } + // + // for (int y = 1; y < 5; y++) { + // RepositoryOperation op = new RepositoryOperation("" + y, "" + y); + // taskData.addOperation(op); + // } + // + // try { + // for (int y = 1; y < 1000; y++) { + // TaskComment comment = new TaskComment(new MockAttributeFactory(), y); + // comment.setAttributeValue(RepositoryTaskAttribute.COMMENT_TEXT, "Testing + // \u05D0"); + // taskData.addComment(comment); + // } + // } catch (StackOverflowError e) { + // e.printStackTrace(); + // } + // + // // for(int y = 1; y < 1000; y++) { + // // RepositoryAttachment attachment = new + // // RepositoryAttachment(repository, new MockAttributeFactory()); + // // taskData.addAttachment(attachment); + // // } + // + // offlineTaskDataManager.put(taskData); + // offlineTaskDataManager.put(taskData); + // } + // System.err.println("done Building"); + // offlineTaskDataManager.save(); + // System.err.println("Saved"); + // File file = + // TasksUiPlugin.getDefault().getOfflineReportsFilePath().toFile(); + // System.err.println(file.length()); + // offlineTaskDataManager.clear(); + // offlineTaskDataManager.readOfflineData(); + // assertNotNull(offlineTaskDataManager.getOldTaskData(AbstractRepositoryTask.getHandle( + // MockRepositoryConnector.REPOSITORY_URL, 400))); + // } } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java index 268e7e802..63a5f448f 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java @@ -69,7 +69,7 @@ public class TaskListDnDTest extends TestCase { Set<ITask> tasks = manager.getTaskList().getRootTasks(); assertNotNull(tasks); assertEquals(1, tasks.size()); - assertEquals(url, tasks.iterator().next().getUrl()); + assertEquals(url, tasks.iterator().next().getTaskUrl()); // TODO: Failing due to asynchronous retrieval of title from url // assertEquals(title, tasks.get(0).getDescription(false)); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java index bb23c0cf6..8cb2ff717 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java @@ -25,6 +25,7 @@ import java.util.Set; import junit.framework.TestCase; import org.eclipse.mylar.context.core.ContextCorePlugin; +import org.eclipse.mylar.internal.tasks.core.RepositoryTaskHandleUtil; import org.eclipse.mylar.internal.tasks.ui.ScheduledTaskListSynchJob; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.internal.tasks.ui.TaskListSynchronizationScheduler; @@ -107,7 +108,7 @@ public class TaskListManagerTest extends TestCase { } public void testSingleTaskDeletion() { - MockRepositoryTask task = new MockRepositoryTask("mock-1"); + MockRepositoryTask task = new MockRepositoryTask("1"); manager.getTaskList().moveToRoot(task); manager.saveTaskList(); @@ -167,7 +168,7 @@ public class TaskListManagerTest extends TestCase { } public void testMigrateTaskHandles() { - AbstractRepositoryTask task = new MockRepositoryTask("http://a-123"); + AbstractRepositoryTask task = new MockRepositoryTask("http://a", "123"); manager.getTaskList().addTask(task); manager.refactorRepositoryUrl("http://a", "http://b"); assertNull(manager.getTaskList().getTask("http://a-123")); @@ -175,13 +176,13 @@ public class TaskListManagerTest extends TestCase { } public void testMigrateTaskHandlesWithExplicitSet() { - AbstractRepositoryTask task = new MockRepositoryTask("http://a-123"); - task.setUrl("http://a/task/123"); + AbstractRepositoryTask task = new MockRepositoryTask("http://a", "123"); + task.setTaskUrl("http://a/task/123"); manager.getTaskList().addTask(task); manager.refactorRepositoryUrl("http://a", "http://b"); assertNull(manager.getTaskList().getTask("http://a-123")); assertNotNull(manager.getTaskList().getTask("http://b-123")); - assertEquals("http://b/task/123", task.getUrl()); + assertEquals("http://b/task/123", task.getTaskUrl()); } public void testIsActiveToday() { @@ -230,18 +231,18 @@ public class TaskListManagerTest extends TestCase { } public void testIsCompletedToday() { - ITask task = new Task("1", "task-1", true); + ITask task = new Task("1", "task 1", true); task.setCompleted(true); task.setCompletionDate(new Date()); assertTrue(manager.isCompletedToday(task)); - MockRepositoryTask mockTask = new MockRepositoryTask(MOCK_REPOSITORY_URL + "-1"); + MockRepositoryTask mockTask = new MockRepositoryTask("1"); manager.getTaskList().addTask(mockTask); mockTask.setCompleted(true); mockTask.setCompletionDate(new Date()); - assertFalse(manager.isCompletedToday(mockTask)); + assertFalse("completed: " + mockTask.getCompletionDate(), manager.isCompletedToday(mockTask)); - mockTask = new MockRepositoryTask(MOCK_REPOSITORY_URL + "-2"); + mockTask = new MockRepositoryTask("2"); manager.getTaskList().addTask(mockTask); mockTask.setCompleted(true); mockTask.setCompletionDate(new Date()); @@ -297,7 +298,7 @@ public class TaskListManagerTest extends TestCase { } public void testCategoryPersistance() { - MockRepositoryTask task = new MockRepositoryTask("bug-1"); + MockRepositoryTask task = new MockRepositoryTask("1"); TaskCategory category = new TaskCategory("cat", manager.getTaskList()); manager.getTaskList().addCategory(category); manager.getTaskList().moveToContainer(category, task); @@ -322,8 +323,8 @@ public class TaskListManagerTest extends TestCase { } public void testDeleteCategoryMovesTasksToRoot() { - ITask task = new MockRepositoryTask("mock-delete"); - TaskCategory category = new TaskCategory("mock-cat", manager.getTaskList()); + ITask task = new MockRepositoryTask("delete"); + TaskCategory category = new TaskCategory("cat", manager.getTaskList()); manager.getTaskList().addTask(task, category); manager.getTaskList().addCategory(category); assertEquals(0, manager.getTaskList().getRootCategory().getChildren().size()); @@ -413,7 +414,7 @@ public class TaskListManagerTest extends TestCase { repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, repositoryUrl); TasksUiPlugin.getRepositoryManager().addRepository(repository, TasksUiPlugin.getDefault().getRepositoriesFilePath()); - MockRepositoryTask task = new MockRepositoryTask(repositoryUrl + "-1"); + MockRepositoryTask task = new MockRepositoryTask(repositoryUrl, "1"); TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); taskList.moveToRoot(task); MockRepositoryQuery query = new MockRepositoryQuery("query", taskList); @@ -429,7 +430,7 @@ public class TaskListManagerTest extends TestCase { } public void testArchiveRepositoryTaskExternalization() { - MockRepositoryTask repositoryTask = new MockRepositoryTask("bug-1"); + MockRepositoryTask repositoryTask = new MockRepositoryTask("1"); repositoryTask.setKind("kind"); manager.getTaskList().addTask(repositoryTask); assertEquals(1, manager.getTaskList().getArchiveContainer().getChildren().size()); @@ -446,7 +447,7 @@ public class TaskListManagerTest extends TestCase { TaskCategory cat1 = new TaskCategory("Category 1", manager.getTaskList()); manager.getTaskList().addCategory(cat1); - MockRepositoryTask reportInCat1 = new MockRepositoryTask("task-123"); + MockRepositoryTask reportInCat1 = new MockRepositoryTask("123"); manager.getTaskList().moveToContainer(cat1, reportInCat1); assertEquals(cat1, reportInCat1.getContainer()); @@ -510,12 +511,12 @@ public class TaskListManagerTest extends TestCase { manager.getTaskList().moveToContainer(cat1, task4); cat1Contents.add(task4); - MockRepositoryTask reportInCat1 = new MockRepositoryTask("task-123"); + MockRepositoryTask reportInCat1 = new MockRepositoryTask("123"); manager.getTaskList().moveToContainer(cat1, reportInCat1); assertEquals(cat1, reportInCat1.getContainer()); cat1Contents.add(reportInCat1); - MockRepositoryTask reportInRoot = new MockRepositoryTask("task-124"); + MockRepositoryTask reportInRoot = new MockRepositoryTask("124"); manager.getTaskList().moveToRoot(reportInRoot); rootTasks.add(reportInRoot); @@ -554,8 +555,8 @@ public class TaskListManagerTest extends TestCase { public void testExternalizationOfHandlesWithDash() { Set<ITask> rootTasks = new HashSet<ITask>(); - String handle = AbstractRepositoryTask.getHandle("http://url/repo-location", 1); - Task task1 = new Task(handle, "task 1", true); +// String handle = AbstractRepositoryTask.getHandle("http://url/repo-location", 1); + Task task1 = new Task("http://url/repo-location-1", "task 1", true); manager.getTaskList().moveToRoot(task1); rootTasks.add(task1); @@ -613,15 +614,15 @@ public class TaskListManagerTest extends TestCase { manager.getTaskList().addQuery(query1); manager.getTaskList().addQuery(query2); - Set<AbstractRepositoryQuery> queriesReturned = taskList.getQueriesForHandle(AbstractRepositoryTask.getHandle( - "repositoryURL", 1)); + Set<AbstractRepositoryQuery> queriesReturned = taskList.getQueriesForHandle(RepositoryTaskHandleUtil.getHandle( + "repositoryURL", "1")); assertNotNull(queriesReturned); assertEquals(2, queriesReturned.size()); assertTrue(queriesReturned.contains(query1)); assertTrue(queriesReturned.contains(query2)); Set<String> handles = new HashSet<String>(); - handles.add(AbstractRepositoryTask.getHandle("repositoryURL", 2)); + handles.add(RepositoryTaskHandleUtil.getHandle("repositoryURL", "2")); Set<AbstractQueryHit> hitsReturned = taskList.getQueryHits(handles); assertNotNull(hitsReturned); assertEquals(1, hitsReturned.size()); @@ -691,10 +692,10 @@ public class TaskListManagerTest extends TestCase { String bugNumber = "106939"; - MockRepositoryTask task1 = new MockRepositoryTask(repositoryUrl + "-" + bugNumber); + MockRepositoryTask task1 = new MockRepositoryTask(repositoryUrl, bugNumber); manager.getTaskList().addTask(task1); - MockRepositoryTask task2 = new MockRepositoryTask("https://unresolved-" + bugNumber); + MockRepositoryTask task2 = new MockRepositoryTask("https://unresolved", bugNumber); manager.getTaskList().addTask(task2); TaskList taskList = manager.getTaskList(); @@ -722,8 +723,8 @@ public class TaskListManagerTest extends TestCase { public void testMarkTaskRead() { String repositoryUrl = "http://mylar.eclipse.org/bugs222"; - MockRepositoryTask task1 = new MockRepositoryTask(repositoryUrl + "-1"); - MockRepositoryTask task2 = new MockRepositoryTask(repositoryUrl + "-2"); + MockRepositoryTask task1 = new MockRepositoryTask(repositoryUrl, "1"); + MockRepositoryTask task2 = new MockRepositoryTask(repositoryUrl, "2"); task1.setSyncState(RepositoryTaskSyncState.INCOMING); task2.setSyncState(RepositoryTaskSyncState.INCOMING); List<ITaskListElement> elements = new ArrayList<ITaskListElement>(); @@ -758,8 +759,8 @@ public class TaskListManagerTest extends TestCase { public void testMarkUnRead() { String repositoryUrl = "http://mylar.eclipse.org/bugs222"; - MockRepositoryTask task1 = new MockRepositoryTask(repositoryUrl + "-1"); - MockRepositoryTask task2 = new MockRepositoryTask(repositoryUrl + "-2"); + MockRepositoryTask task1 = new MockRepositoryTask(repositoryUrl, "1"); + MockRepositoryTask task2 = new MockRepositoryTask(repositoryUrl, "2"); assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task1.getSyncState()); assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task2.getSyncState()); List<ITaskListElement> elements = new ArrayList<ITaskListElement>(); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java index b71562cfa..7955e3acc 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java @@ -18,8 +18,8 @@ import java.util.List; import junit.framework.TestCase; +import org.eclipse.mylar.internal.tasks.core.RepositoryTaskHandleUtil; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; -import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.core.TaskRepositoryManager; import org.eclipse.mylar.tasks.tests.connector.MockRepositoryConnector; @@ -58,9 +58,9 @@ public class TaskRepositoryManagerTest extends TestCase { public void testHandles() { String url = "http://foo.bar"; String id = "123"; - String handle = AbstractRepositoryTask.getHandle(url, id); - assertEquals(url, AbstractRepositoryTask.getRepositoryUrl(handle)); - assertEquals(id, AbstractRepositoryTask.getTaskId(handle)); + String handle = RepositoryTaskHandleUtil.getHandle(url, id); + assertEquals(url, RepositoryTaskHandleUtil.getRepositoryUrl(handle)); + assertEquals(id, RepositoryTaskHandleUtil.getTaskId(handle)); // assertEquals(123, AbstractRepositoryTask.getTaskIdAsInt(handle)); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTest.java index 10b418aea..6e883600e 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTest.java @@ -33,19 +33,19 @@ public class TaskTest extends TestCase { public void testUrl() { Task task = new Task("handle", "label", true); - task.setUrl("http://eclipse.org/mylar/doc.php"); + task.setTaskUrl("http://eclipse.org/mylar/doc.php"); assertTrue(task.hasValidUrl()); - task.setUrl("http://"); + task.setTaskUrl("http://"); assertFalse(task.hasValidUrl()); - task.setUrl("https://"); + task.setTaskUrl("https://"); assertFalse(task.hasValidUrl()); - task.setUrl(""); + task.setTaskUrl(""); assertFalse(task.hasValidUrl()); - task.setUrl(null); + task.setTaskUrl(null); assertFalse(task.hasValidUrl()); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockQueryHit.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockQueryHit.java index 5d4497312..acd566886 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockQueryHit.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockQueryHit.java @@ -24,7 +24,7 @@ public class MockQueryHit extends AbstractQueryHit { @Override protected AbstractRepositoryTask createTask() { - return new MockRepositoryTask(AbstractRepositoryTask.getHandle(repositoryUrl, id)); + return new MockRepositoryTask(repositoryUrl, id); } } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java index 50be0f980..d8c898306 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java @@ -37,7 +37,7 @@ public class MockRepositoryConnector extends AbstractRepositoryConnector { public static final String REPOSITORY_KIND = "mock"; - public static final String REPOSITORY_URL = "http://mockrepository.com"; + public static final String REPOSITORY_URL = "http://mockrepository.test"; @Override public boolean canCreateNewTask(TaskRepository repository) { diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java index c44c2f4ce..818f59726 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java @@ -20,10 +20,15 @@ public class MockRepositoryTask extends AbstractRepositoryTask { private String ownerId; - public MockRepositoryTask(String handle) { - super(handle, "label for " + handle, true); + public MockRepositoryTask(String taskId) { + super(MockRepositoryConnector.REPOSITORY_URL, taskId, "label for " + taskId, true); } + public MockRepositoryTask(String repositoryUrl, String taskId) { + super(repositoryUrl, taskId, "label for " + taskId, true); + } + + @Override public String getRepositoryKind() { return "mock"; |