From 15eb43fb1e045df8da43a7d0bd25ba9872cbc4e1 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <ntd@informatik.uni-kiel.de>
Date: Thu, 26 Mar 2015 15:36:55 +0100
Subject: [PATCH] added one test method
---
.../teetime/stage/basic/merger/Merger.java | 1 -
src/site/markdown/wiki | 2 +-
.../stage/basic/merger/MergerTest.java | 20 +++++++++++++++++++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/teetime/stage/basic/merger/Merger.java b/src/main/java/teetime/stage/basic/merger/Merger.java
index f162b2d5..d8b0320a 100644
--- a/src/main/java/teetime/stage/basic/merger/Merger.java
+++ b/src/main/java/teetime/stage/basic/merger/Merger.java
@@ -59,7 +59,6 @@ public final class Merger<T> extends AbstractStage {
if (token == null) {
returnNoElement();
}
-
outputPort.send(token);
}
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
index 0e447457..63ccbbc8 160000
--- a/src/site/markdown/wiki
+++ b/src/site/markdown/wiki
@@ -1 +1 @@
-Subproject commit 0e4474577e1f49bc96e734c286b2d9e0363895e8
+Subproject commit 63ccbbc87bd2c0e6599ca91502149dba3cfb99de
diff --git a/src/test/java/teetime/stage/basic/merger/MergerTest.java b/src/test/java/teetime/stage/basic/merger/MergerTest.java
index 234537e0..fad02a9f 100644
--- a/src/test/java/teetime/stage/basic/merger/MergerTest.java
+++ b/src/test/java/teetime/stage/basic/merger/MergerTest.java
@@ -16,13 +16,20 @@
package teetime.stage.basic.merger;
import static org.hamcrest.Matchers.contains;
+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 java.util.ArrayList;
+import java.util.List;
+
import org.junit.Before;
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;
@@ -72,4 +79,17 @@ public class MergerTest {
assertThat(this.collector.getElements(), contains(1, 2, 3));
}
+ @Test
+ public void roundRobinShouldWork2() {
+ mergerUnderTest = new Merger<Integer>();
+ mergerUnderTest.setStrategy(new RoundRobinStrategy());
+
+ List<Integer> outputList = new ArrayList<Integer>();
+ StageTester.test(mergerUnderTest).and().send(1, 2, 3).to(mergerUnderTest.getNewInputPort())
+ .and().send(4, 5, 6).to(mergerUnderTest.getNewInputPort())
+ .and().receive(outputList);
+
+ assertThat(outputList, is(not(empty())));
+ assertThat(outputList, contains(1, 2, 3, 4, 5, 6));
+ }
}
--
GitLab