Repository: incubator-slider Updated Branches: refs/heads/develop 5ff1aa7a6 -> d81da56a1
SLIDER-94 callable<V> notification service Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/61658283 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/61658283 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/61658283 Branch: refs/heads/develop Commit: 616582838b074e9747af67a3d80013cec5cbbdc8 Parents: 10fc874 Author: Steve Loughran <ste...@apache.org> Authored: Tue Jun 3 13:19:48 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Jun 3 13:19:48 2014 +0100 ---------------------------------------------------------------------- .../workflow/TestWorkflowCompositeService.java | 20 ---------------- .../workflow/TestWorkflowSequenceService.java | 24 +++++++++++--------- 2 files changed, 13 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/61658283/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowCompositeService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowCompositeService.java b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowCompositeService.java index 1e8eb52..afd5a61 100644 --- a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowCompositeService.java +++ b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowCompositeService.java @@ -61,23 +61,6 @@ public class TestWorkflowCompositeService extends ParentWorkflowTestBase { } @Test - public void testNotificationChild() throws Throwable { - - MockService one = new MockService("one", false, 100); - EventCallbackHandler ecb = new EventCallbackHandler(); - WorkflowEventNotifyingService ens = - new WorkflowEventNotifyingService(ecb, "hello", 100); - MockService two = new MockService("two", false, 100); - ServiceParent parent = startService(one, ens, two); - waitForParentToStop(parent); - assertStopped(one); - assertStopped(ens); - assertStopped(two); - assertTrue(ecb.notified); - assertEquals("hello", ecb.result); - } - - @Test public void testCallableChild() throws Throwable { MockService one = new MockService("one", false, 100); @@ -92,11 +75,9 @@ public class TestWorkflowCompositeService extends ParentWorkflowTestBase { assertStopped(two); assertTrue(handler.notified); String s = ens.getScheduledFuture().get(); - assertEquals("hello", s); } - @Test public void testNestedComposite() throws Throwable { MockService one = new MockService("one", false, 100); @@ -121,7 +102,6 @@ public class TestWorkflowCompositeService extends ParentWorkflowTestBase { assertEquals(one.getFailureCause(), parent.getFailureCause()); } - @Override public ServiceParent buildService(Service... services) { ServiceParent parent = http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/61658283/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowSequenceService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowSequenceService.java b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowSequenceService.java index 22b595e..a581bc9 100644 --- a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowSequenceService.java +++ b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowSequenceService.java @@ -52,21 +52,24 @@ public class TestWorkflowSequenceService extends ParentWorkflowTestBase { } @Test - public void testNotificationInSequence() throws Throwable { - EventCallbackHandler ecb = new EventCallbackHandler(); + public void testCallableChild() throws Throwable { + MockService one = new MockService("one", false, 100); - WorkflowEventNotifyingService ens = - new WorkflowEventNotifyingService(ecb, 3, 100); + CallableHandler handler = new CallableHandler("hello"); + WorkflowCallbackService<String> ens = + new WorkflowCallbackService<String>("handler", handler, 100); MockService two = new MockService("two", false, 100); ServiceParent parent = startService(one, ens, two); waitForParentToStop(parent); assertStopped(one); assertStopped(ens); assertStopped(two); - assertTrue(ecb.notified); - assertEquals(3, ecb.result); + assertTrue(handler.notified); + String s = ens.getScheduledFuture().get(); + assertEquals("hello", s); } + @Test public void testFailingSequence() throws Throwable { MockService one = new MockService("one", true, 100); @@ -126,17 +129,16 @@ public class TestWorkflowSequenceService extends ParentWorkflowTestBase { MockService one = new MockService("one", false, 5000); MockService two = new MockService("two", false, 100); ServiceParent parent = startService(one, two); - EventCallbackHandler ecb = new EventCallbackHandler(); - WorkflowEventNotifyingService ens = - new WorkflowEventNotifyingService(ecb, "hello", 100); + CallableHandler handler = new CallableHandler("hello"); + WorkflowCallbackService<String> ens = + new WorkflowCallbackService<String>("handler", handler, 100); parent.addService(ens); waitForParentToStop(parent, 10000); assertStopped(one); assertStopped(two); assertStopped(ens); assertStopped(two); - assertTrue(ecb.notified); - assertEquals("hello", ecb.result); + assertEquals("hello", ens.getScheduledFuture().get()); } public WorkflowSequenceService buildService(Service... services) {
