From 66cd9c25df4976c41b3183fd0cfd32b7a88f4b65 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Thu, 26 Mar 2015 15:51:13 +0100
Subject: [PATCH] refactored merger test
---
src/site/markdown/wiki | 2 +-
src/test/java/teetime/stage/basic/merger/MergerTest.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
index 63ccbbc8..0e447457 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 fad02a9f..9ec29159 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);
--
GitLab