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

collectedExceptions

Conflicts:
	src/test/java/teetime/stage/InstanceOfFilterTest.java

src/test/java/teetime/framework/YieldStrategyConfiguration.java

@@ -26,10 +26,10 @@ class YieldStrategyConfiguration extends Configuration {
 	public YieldStrategyConfiguration(final Object... elements) {
 
 		InitialElementProducer<Object> producer = buildProducer(elements);
-		addThreadableStage(producer);
+		producer.declareActive();
 
 		Stage consumer = buildConsumer(producer);
-		addThreadableStage(consumer);
+		consumer.declareActive();
 	}
 
 	private InitialElementProducer<Object> buildProducer(final Object... elements) {

src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java

@@ -33,8 +33,8 @@ public class ExceptionTestConfiguration extends Configuration {
 		connectPorts(first.getOutputPort(), second.getInputPort());
 		// this.addThreadableStage(new ExceptionTestStage());
 
-		this.addThreadableStage(second);
-		this.addThreadableStage(third);
+		second.declareActive();
+		third.declareActive();
 	}
 
 }

src/test/java/teetime/stage/InstanceOfFilterTest.java

@@ -30,7 +30,6 @@ import org.junit.Test;
 
 import teetime.framework.Configuration;
 import teetime.framework.Execution;
-import teetime.framework.ExecutionException;
 
 /**
  * @author Nils Christian Ehmke
@@ -109,15 +108,10 @@ public class InstanceOfFilterTest {
 	}
 
 	@Test
-	public void filterShouldSendToBothOutputPorts() throws Exception {
+	public void filterShouldSendToBothOutputPorts() {
 		InstanceOfFilterTestConfig config = new InstanceOfFilterTestConfig();
 		Execution<InstanceOfFilterTestConfig> execution = new Execution<InstanceOfFilterTestConfig>(config);
-		try {
 		execution.executeBlocking();
-		} catch (ExecutionException e) {
-			// Collection<ThreadThrowableContainer> thrownExceptions = e.getThrownExceptions();
-			// TODO: handle exception
-		}
 	}
 
 	private static class InstanceOfFilterTestConfig extends Configuration {

src/test/java/teetime/stage/basic/distributor/dynamic/DynamicDistributorTest.java

@@ -137,8 +137,8 @@ public class DynamicDistributorTest {
 			connectPorts(initialElementProducer.getOutputPort(), distributor.getInputPort());
 			connectPorts(distributor.getNewOutputPort(), collectorSink.getInputPort());
 
-			addThreadableStage(distributor);
-			addThreadableStage(collectorSink);
+			distributor.declareActive();
+			collectorSink.declareActive();
 
 			for (PortAction<DynamicDistributor<T>> a : inputActions) {
 				distributor.addPortActionRequest(a);

src/test/java/teetime/stage/basic/merger/dynamic/DynamicMergerTest.java

@@ -118,7 +118,7 @@ public class DynamicMergerTest {
 			connectPorts(initialElementProducer.getOutputPort(), merger.getNewInputPort());
 			connectPorts(merger.getOutputPort(), collectorSink.getInputPort());
 
-			addThreadableStage(merger);
+			merger.declareActive();
 
 			for (PortAction<DynamicMerger<T>> a : inputActions) {
 				boolean added = merger.addPortActionRequest(a);