diff options
author | Steffen Pingel | 2013-05-03 14:36:37 +0000 |
---|---|---|
committer | Steffen Pingel | 2013-05-03 14:36:37 +0000 |
commit | 2dc5856cb4a08832727818afd88cd809b29ff295 (patch) | |
tree | 41f989aa482b9c75d9238180758c7e039f8396b4 | |
parent | af505574701f1e70b64d892666dac6f4cffe9945 (diff) | |
download | org.eclipse.mylyn.tasks-2dc5856cb4a08832727818afd88cd809b29ff295.tar.gz org.eclipse.mylyn.tasks-2dc5856cb4a08832727818afd88cd809b29ff295.tar.xz org.eclipse.mylyn.tasks-2dc5856cb4a08832727818afd88cd809b29ff295.zip |
cancel synchronization job after completing test
Change-Id: Ie74b537a9cb4151125af64b16deb5058c37826bb
2 files changed, 18 insertions, 9 deletions
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/TaskListSynchronizationSchedulerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/TaskListSynchronizationSchedulerTest.java index d6b6345b6..74e3d8c15 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/TaskListSynchronizationSchedulerTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/TaskListSynchronizationSchedulerTest.java @@ -90,15 +90,19 @@ public class TaskListSynchronizationSchedulerTest extends TestCase { public void testSynchronization() throws Exception { TaskListSynchronizationScheduler scheduler = new TaskListSynchronizationScheduler( TasksUiPlugin.getTaskJobFactory()); - scheduler.setInterval(1); - assertTrue(connector.latch.await(10, TimeUnit.SECONDS)); - - // cancel and reschedule - scheduler.userAttentionLost(); - scheduler.userAttentionGained(); - release(); - - assertTrue("Expected synchronization to run again", connector.latch.await(5, TimeUnit.SECONDS)); + try { + scheduler.setInterval(1); + assertTrue(connector.latch.await(10, TimeUnit.SECONDS)); + + // cancel and reschedule + scheduler.userAttentionLost(); + scheduler.userAttentionGained(); + release(); + + assertTrue("Expected synchronization to run again", connector.latch.await(5, TimeUnit.SECONDS)); + } finally { + scheduler.dispose(); + } } private void release() throws Exception { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListSynchronizationScheduler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListSynchronizationScheduler.java index cae5ebc2b..5e2d334ca 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListSynchronizationScheduler.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListSynchronizationScheduler.java @@ -169,4 +169,9 @@ public class TaskListSynchronizationScheduler implements IUserAttentionListener reschedule(); } + public void dispose() { + refreshJob.removeJobChangeListener(jobListener); + refreshJob.cancel(); + } + } |