Merge remote-tracking branch 'origin/master' into site

src/test/java/teetime/stage/basic/merger/MergerTest.java

@@ -63,8 +63,24 @@ public class MergerTest {
 		Assert.assertFalse(testPipe.startSent());
 		Assert.assertTrue(testPipe.terminateSent());
 
-		merger.onSignal(new StartingSignal(), firstPort);
+		merger.onSignal(new StartingSignal(), secondPort);
 		Assert.assertTrue(testPipe.startSent());
 		Assert.assertTrue(testPipe.terminateSent());
 	}
+
+	@Test
+	public void testMultipleSignals() {
+		this.beforeSignalTesting();
+		merger.onSignal(new StartingSignal(), firstPort);
+		Assert.assertFalse(testPipe.startSent());
+
+		merger.onSignal(new StartingSignal(), firstPort);
+		Assert.assertFalse(testPipe.startSent());
+
+		merger.onSignal(new StartingSignal(), firstPort);
+		Assert.assertFalse(testPipe.startSent());
+
+		merger.onSignal(new StartingSignal(), secondPort);
+		Assert.assertTrue(testPipe.startSent());
+	}
 }

src/test/java/teetime/framework/FileSearcherTest.java → src/test/java/teetime/util/classpath/FileSearcherTest.java

-package teetime.framework;
+package teetime.util.classpath;
 
 import java.io.IOException;
 import java.net.URL;
@@ -7,6 +7,8 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 
+import teetime.util.classpath.FileSearcher;
+
 public class FileSearcherTest {
 
 	public FileSearcherTest() {}

src/test/resources/logback.groovy

@@ -21,7 +21,7 @@ appender("CONSOLE", ConsoleAppender) {
 
 root ERROR, ["CONSOLE"]
 
-logger "teetime.framework", INFO
+//logger "teetime.framework", INFO
 logger "teetime.stage", INFO
 
 logger "util", INFO
\ No newline at end of file