diff options
author | mkersten | 2006-06-29 21:59:55 +0000 |
---|---|---|
committer | mkersten | 2006-06-29 21:59:55 +0000 |
commit | 4934c30a4f28b27ec85f0513ce90b51707bda9a8 (patch) | |
tree | 446921b369e69d2e8ab85286ecea10bd89195c50 | |
parent | f9faa99776fbdc4237f2897629efccfc5d5eb904 (diff) | |
download | org.eclipse.mylyn-e_3_1.tar.gz org.eclipse.mylyn-e_3_1.tar.xz org.eclipse.mylyn-e_3_1.zip |
3.1 mergee_3_1
3 files changed, 34 insertions, 25 deletions
diff --git a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllTests.java b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllTests.java index 149adcda..600ee8b7 100644 --- a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllTests.java +++ b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllTests.java @@ -21,8 +21,7 @@ import org.eclipse.mylar.internal.core.util.MylarStatusHandler; import org.eclipse.mylar.internal.ide.MylarIdePlugin; import org.eclipse.mylar.java.tests.AllJavaTests; import org.eclipse.mylar.monitor.reports.tests.AllMonitorReportTests; -import org.eclipse.mylar.monitor.tests.AllMonitorTests; -import org.eclipse.mylar.tasklist.tests.AllTasklistTests; +import org.eclipse.mylar.tasklist.tests.AllTaskListTests; import org.eclipse.mylar.tests.integration.AllIntegrationTests; import org.eclipse.mylar.tests.misc.AllMiscTests; import org.eclipse.mylar.tests.xml.AllXmlTests; @@ -41,16 +40,16 @@ public class AllTests { // TODO: the order of these tests might still matter, but shouldn't // $JUnit-BEGIN$ suite.addTest(AllMonitorReportTests.suite()); - suite.addTest(AllMonitorTests.suite()); - suite.addTest(AllIntegrationTests.suite()); +// suite.addTest(AllMonitorTests.suite()); suite.addTest(AllCoreTests.suite()); suite.addTest(AllIdeTests.suite()); suite.addTest(AllJavaTests.suite()); - suite.addTest(AllTasklistTests.suite()); + suite.addTest(AllTaskListTests.suite()); suite.addTest(AllXmlTests.suite()); suite.addTest(AllBugzillaTests.suite()); // suite.addTest(AllJiraTests.suite()); suite.addTest(AllMiscTests.suite()); + suite.addTest(AllIntegrationTests.suite()); // $JUnit-END$ return suite; } diff --git a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.java b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.java index 3167d467..cf92cd34 100644 --- a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.java +++ b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.java @@ -53,7 +53,7 @@ public class ChangeDataDirTest extends TestCase { dir.deleteOnExit(); manager.resetTaskList(); assertTrue(manager.getTaskList().isEmpty()); - MylarTaskListPlugin.getDefault().getTaskListSaveManager().saveTaskListAndContexts(); + MylarTaskListPlugin.getDefault().getTaskListSaveManager().saveTaskList(true); } protected void tearDown() throws Exception { @@ -108,36 +108,35 @@ public class ChangeDataDirTest extends TestCase { assertEquals(readTaskBeforeMove.getCreationDate(), readTaskAfterMove.getCreationDate()); } - // TODO: delete? using lastOpened date wrong + // TODO: delete? using lastOpened date wrong public void testBugzillaTaskMove() { String handle = AbstractRepositoryTask.getHandle("server", 1); BugzillaTask bugzillaTask = new BugzillaTask(handle, "bug1", true); + String refreshDate = (new Date()).toString(); + bugzillaTask.setModifiedDateStamp(refreshDate); addBugzillaTask(bugzillaTask); - Date refreshDate = new Date(); - bugzillaTask.setLastSynchronized(refreshDate); - BugzillaTask readTaskBeforeMove = (BugzillaTask) manager.getTaskList().getTask(handle); assertNotNull(readTaskBeforeMove); - assertEquals(refreshDate, readTaskBeforeMove.getLastSynchronized()); + assertEquals(refreshDate, readTaskBeforeMove.getLastModifiedDateStamp()); MylarTaskListPlugin.getDefault().getTaskListSaveManager().copyDataDirContentsTo(newDataDir); MylarPlugin.getDefault().setDataDirectory(newDataDir); - + BugzillaTask readTaskAfterMove = (BugzillaTask) manager.getTaskList().getTask(handle); assertNotNull(readTaskAfterMove); - // HACK: should be checking date equality, but millis seem to differ? - assertEquals(refreshDate.toString(), readTaskAfterMove.getLastSynchronized().toString()); + assertEquals(refreshDate, readTaskAfterMove.getLastModifiedDateStamp()); } private void addBugzillaTask(BugzillaTask newTask) { -// AbstractRepositoryClient client = MylarTaskListPlugin.getRepositoryManager().getRepositoryClient(BugzillaPlugin.REPOSITORY_KIND); -// client.addTaskToArchive(newTask); - + // AbstractRepositoryClient client = + // MylarTaskListPlugin.getRepositoryManager().getRepositoryClient(BugzillaPlugin.REPOSITORY_KIND); + // client.addTaskToArchive(newTask); + // TODO: put back? -// MylarTaskListPlugin.getTaskListManager().getTaskList().internalAddTask(newTask); + // MylarTaskListPlugin.getTaskListManager().getTaskList().internalAddTask(newTask); -// BugzillaTaskHandler handler = new BugzillaTaskHandler(); -// handler.addTaskToArchive(newTask); + // BugzillaTaskHandler handler = new BugzillaTaskHandler(); + // handler.addTaskToArchive(newTask); MylarTaskListPlugin.getTaskListManager().getTaskList().moveToRoot(newTask); } diff --git a/org.eclipse.mylyn.tests/tests-manual.html b/org.eclipse.mylyn.tests/tests-manual.html index bc08528a..1fbb53f3 100644 --- a/org.eclipse.mylyn.tests/tests-manual.html +++ b/org.eclipse.mylyn.tests/tests-manual.html @@ -1,10 +1,16 @@ <html> <body> <h2>Mylar Manual Tests</h2> + <p><b>Help</b></p> + <ul> + <li><b> </b>Help > Help Contents > Mylar > New and Noteworthy + [ ensure updated ]</li> + </ul> <p><b>Bugzilla Client</b></p> <ul> - <li>Bug Editor Hyperlinking - URL Hyperlinks, Bug hyperlinks (bug# 123, bug 12312, duplicate bug links), stack trace file links</li> + <li>Bug Editor Hyperlinking - <font color="#FF6600">URL Hyperlinks</font>, Bug hyperlinks (bug# 123, bug 12312, duplicate bug links), stack trace file links</li> + <li>Ensure that when offline reports still open correctly.</li> </ul> <ul> <li>Test of Search > Search... > Bugzilla Search tab @@ -65,15 +71,20 @@ <li>If no override, get conflict icon to show</li> </ul></li> <li>Case open: should retain outgoing overlay</li> + <li>Case edit and save again: outgoing overlay remains (should + not receive conflict warning)</li> <li>Case submit: outgoing overlay should disappear (should be no incoming - upon synchronize)<br> </li> + upon synchronize)</li> </ul></li> <li>Task in CONFLICT state<ul> <li>Case open: remains with conflict decorator</li> <li>Case synchronize: should get option to override local changes<ul> <li>Case overriding: overlay and changes go away</li> - <li>Case no override: changes remain, conflict decorator appears<br> </li> + <li>Case no override: changes remain, conflict decorator appears</li> </ul></li> + <li>Case edit: Currently state switches to OUTGOING which is + correct for now because we migrate their comment into the new + report<br> </li> </ul> <p></li> <li>Query hits not yet downloaded<ul> @@ -88,10 +99,10 @@ <li>Case open (bug editor already open): User presented with dialog asking if they want to reopen with latest version</li> + <li>Case Background Synchronization incoming state remains</li> </ul></li> <li>Case open: task opens with offline content, user asked if - they want to refresh with incoming content.<br> - </li> + they want to refresh with incoming content.<br> </li> </ul></li> <li>Open, modify, save, should have outgoing decorator, open report in external browser, add comment<ul> |