diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki index 63ccbbc87bd2c0e6599ca91502149dba3cfb99de..0e4474577e1f49bc96e734c286b2d9e0363895e8 160000 --- a/src/site/markdown/wiki +++ b/src/site/markdown/wiki @@ -1 +1 @@ -Subproject commit 63ccbbc87bd2c0e6599ca91502149dba3cfb99de +Subproject commit 0e4474577e1f49bc96e734c286b2d9e0363895e8 diff --git a/src/test/java/teetime/stage/basic/merger/MergerTest.java b/src/test/java/teetime/stage/basic/merger/MergerTest.java index fad02a9f3d1abddd9eb8bc92539576714f1a16cf..9ec29159adb89a073801393d87d8341e8b0790fa 100644 --- a/src/test/java/teetime/stage/basic/merger/MergerTest.java +++ b/src/test/java/teetime/stage/basic/merger/MergerTest.java @@ -20,6 +20,7 @@ import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertThat; +import static teetime.framework.test.StageTester.test; import java.util.ArrayList; import java.util.List; @@ -29,7 +30,6 @@ import org.junit.Test; import teetime.framework.pipe.IPipeFactory; import teetime.framework.pipe.SingleElementPipeFactory; -import teetime.framework.test.StageTester; import teetime.stage.CollectorSink; import teetime.stage.InitialElementProducer; @@ -81,11 +81,11 @@ public class MergerTest { @Test public void roundRobinShouldWork2() { - mergerUnderTest = new Merger<Integer>(); - mergerUnderTest.setStrategy(new RoundRobinStrategy()); + mergerUnderTest = new Merger<Integer>(new RoundRobinStrategy()); List<Integer> outputList = new ArrayList<Integer>(); - StageTester.test(mergerUnderTest).and().send(1, 2, 3).to(mergerUnderTest.getNewInputPort()) + test(mergerUnderTest) + .and().send(1, 2, 3).to(mergerUnderTest.getNewInputPort()) .and().send(4, 5, 6).to(mergerUnderTest.getNewInputPort()) .and().receive(outputList);