Repository: incubator-wave Updated Branches: refs/heads/fix/dependendices-2016 2d48da780 -> 8db12c97a
changed IdempotentSchedulerTest to use mockito instead of jmock. Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/8db12c97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/8db12c97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/8db12c97 Branch: refs/heads/fix/dependendices-2016 Commit: 8db12c97aa9637194eac72d0c2898cee9daa3661 Parents: 2d48da7 Author: wisebaldone <wisebald...@apache.org> Authored: Mon Nov 28 20:16:25 2016 +1000 Committer: wisebaldone <wisebald...@apache.org> Committed: Mon Nov 28 20:16:25 2016 +1000 ---------------------------------------------------------------------- wave/build.gradle | 4 +- .../scheduler/IdempotentSchedulerTest.java | 73 ++++++-------------- 2 files changed, 24 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8db12c97/wave/build.gradle ---------------------------------------------------------------------- diff --git a/wave/build.gradle b/wave/build.gradle index 384391b..fa6c638 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -169,9 +169,7 @@ dependencies { ) testCompile( [group: 'junit', name: 'junit', version: '4.12'], // [11/2016, 1/2018] - [group: "org.hamcrest", name: "hamcrest-junit", version: "2.0.0.0"], // [11/2016, 1/2018] - [group: "org.jmock", name: "jmock-junit3", version: "2.6.0"], // [11/2016, depreciate] - [group: "org.jmock", name: "jmock", version: "2.6.0"], // [11/2016, depreciate] + [group: "org.hamcrest", name: "hamcrest-junit", version: "2.0.0.0"], // [11/2016, 1/2018] // [11/2016, depreciate] [group: "org.mockito", name: "mockito-core", version: "2.2.21"], // [11/2016, 1/2018] ) } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8db12c97/wave/src/test/java/org/waveprotocol/wave/client/scheduler/IdempotentSchedulerTest.java ---------------------------------------------------------------------- diff --git a/wave/src/test/java/org/waveprotocol/wave/client/scheduler/IdempotentSchedulerTest.java b/wave/src/test/java/org/waveprotocol/wave/client/scheduler/IdempotentSchedulerTest.java index 27f062b..3082226 100644 --- a/wave/src/test/java/org/waveprotocol/wave/client/scheduler/IdempotentSchedulerTest.java +++ b/wave/src/test/java/org/waveprotocol/wave/client/scheduler/IdempotentSchedulerTest.java @@ -19,17 +19,17 @@ package org.waveprotocol.wave.client.scheduler; +import junit.framework.TestCase; import org.waveprotocol.wave.client.scheduler.Scheduler.IncrementalTask; -import org.jmock.Expectations; -import org.jmock.integration.junit3.MockObjectTestCase; +import static org.mockito.Mockito.*; /** * Test case for IdempotentScheduler. * */ -public class IdempotentSchedulerTest extends MockObjectTestCase { +public class IdempotentSchedulerTest extends TestCase { // Mocks. private IncrementalTask task; @@ -49,84 +49,57 @@ public class IdempotentSchedulerTest extends MockObjectTestCase { } public void testSchedulesItselfAsTheTask() { - checking(new Expectations() {{ - oneOf(timer).isScheduled(with(is)); - will(returnValue(false)); - oneOf(timer).scheduleRepeating(is, delay, delay); - }}); - is.schedule(); + + verify(timer, times(1)).isScheduled(is); + verify(timer, times(1)).scheduleRepeating(is, delay, delay); } public void testCancelsItselfAsTheTask() { - checking(new Expectations() {{ - oneOf(timer).isScheduled(with(is)); - will(returnValue(true)); - oneOf(timer).cancel(is); - }}); - + when(timer.isScheduled(is)).thenReturn(true); is.cancel(); + verify(timer, times(1)).cancel(is); } public void testSchedulerExecutesTask() { - checking(new Expectations() {{ - oneOf(task).execute(); - }}); - is.execute(); + verify(task, times(1)).execute(); } public void testMultipleScheduleCallsScheduleExactlyOnce() { - checking(new Expectations() {{ - oneOf(timer).isScheduled(with(is)); - will(returnValue(false)); - oneOf(timer).scheduleRepeating(is, delay, delay); - oneOf(timer).isScheduled(with(is)); - will(returnValue(true)); - }}); + when(timer.isScheduled(is)).thenReturn(true, false); is.schedule(); is.schedule(); + + verify(timer, times(2)).isScheduled(is); + verify(timer, times(1)).scheduleRepeating(is, delay, delay); } public void testCancelWillNotCancelIfNotScheduled() { - checking(new Expectations() {{ - oneOf(timer).isScheduled(with(is)); - will(returnValue(false)); - }}); - + when(timer.isScheduled(is)).thenReturn(false); is.cancel(); + verify(timer, never()).cancel(is); } public void testWillRescheduleAfterTaskCompletion() { - checking(new Expectations() {{ - oneOf(timer).isScheduled(with(is)); - will(returnValue(false)); - oneOf(timer).scheduleRepeating(is, delay, delay); - oneOf(task).execute(); - will(returnValue(false)); // Indicates termination - oneOf(timer).isScheduled(with(is)); - will(returnValue(false)); - oneOf(timer).scheduleRepeating(is, delay, delay); - }}); + when(timer.isScheduled(is)).thenReturn(false); + when(task.execute()).thenReturn(false); is.schedule(); is.execute(); // Simulates call by timer. is.schedule(); + + verify(timer, times(2)).scheduleRepeating(is, delay, delay); } public void testWillRescheduleAfterCancel() { - checking(new Expectations() {{ - oneOf(timer).isScheduled(with(is)); will(returnValue(false)); - oneOf(timer).scheduleRepeating(is, delay, delay); - oneOf(timer).isScheduled(with(is)); will(returnValue(true)); - oneOf(timer).cancel(is); - oneOf(timer).isScheduled(with(is)); - will(returnValue(false)); - oneOf(timer).scheduleRepeating(is, delay, delay); - }}); + when(timer.isScheduled(is)).thenReturn(false, true, false); is.schedule(); is.cancel(); is.schedule(); + + verify(timer, times(1)).cancel(is); + verify(timer, times(2)).scheduleRepeating(is, delay, delay); } }
