diff --git a/src/main/java/teetime/stage/basic/merger/Merger.java b/src/main/java/teetime/stage/basic/merger/Merger.java index c9ddee77ace9490297c522392bcaf98f4426d184..289c1ca8fe9614fad1f9dd130bbf0a3be4366556 100644 --- a/src/main/java/teetime/stage/basic/merger/Merger.java +++ b/src/main/java/teetime/stage/basic/merger/Merger.java @@ -86,7 +86,7 @@ public final class Merger<T> extends AbstractStage { if (set.size() == this.getInputPorts().length) { signal.trigger(this); - // this.outputPort.sendSignal(signal); + this.outputPort.sendSignal(signal); signalMap.remove(signal.getClass()); } } else { diff --git a/src/test/java/teetime/stage/WordCountingTest.java b/src/test/java/teetime/stage/WordCountingTest.java index f895a4d2e075ab1f631ec37956336b25b43177d2..c1df1ba92d946c49538178b95685a30c8662c65d 100644 --- a/src/test/java/teetime/stage/WordCountingTest.java +++ b/src/test/java/teetime/stage/WordCountingTest.java @@ -1,7 +1,8 @@ package teetime.stage; +import static org.junit.Assert.assertEquals; + import java.io.File; -import java.util.Map; import org.junit.Test; @@ -10,17 +11,17 @@ import teetime.stage.util.CountingMap; public class WordCountingTest { - @Test + @Test(timeout = 3000) public void test1() { - WordCountingConfiguration wcc = new WordCountingConfiguration(3, new File("src/test/resources/data/output.txt"), new File( + int threads = 2; + WordCountingConfiguration wcc = new WordCountingConfiguration(threads, new File("src/test/resources/data/output.txt"), new File( "src/test/resources/data/output.txt")); Analysis analysis = new Analysis(wcc); analysis.start(); CountingMap<String> map = wcc.getResult(); - for (Map.Entry<String, Integer> entry : map.entrySet()) - { - System.out.println(entry.getKey() + " " + entry.getValue()); - } + assertEquals(new Integer(54), map.get("diam")); + assertEquals(new Integer(8), map.get("tation")); + assertEquals(new Integer(4), map.get("cum")); } }