Skip to content
Snippets Groups Projects
Commit 7c0d5cef authored by Nils Christian Ehmke's avatar Nils Christian Ehmke
Browse files

Corrected the used pipes in the StageTester

parent e99f2c40
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,6 @@ package teetime.framework.test; ...@@ -17,7 +17,6 @@ package teetime.framework.test;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
import teetime.framework.Analysis; import teetime.framework.Analysis;
...@@ -33,7 +32,7 @@ import teetime.stage.IterableProducer; ...@@ -33,7 +32,7 @@ import teetime.stage.IterableProducer;
/** /**
* This class can be used to test single stages in JUnit test cases. * This class can be used to test single stages in JUnit test cases.
* *
* @author Nils Christian Ehmke * @author Nils Christian Ehmke
*/ */
public final class StageTester { public final class StageTester {
...@@ -60,10 +59,6 @@ public final class StageTester { ...@@ -60,10 +59,6 @@ public final class StageTester {
return this.send(Arrays.asList(input)); return this.send(Arrays.asList(input));
} }
public <I> InputHolder<I> send(final I input) {
return this.send(Collections.singletonList(input));
}
public <O> OutputHolder<O> receive(final List<O> output) { public <O> OutputHolder<O> receive(final List<O> output) {
OutputHolder<O> outputHolder = new OutputHolder<O>(output); OutputHolder<O> outputHolder = new OutputHolder<O>(output);
this.outputHolders.add(outputHolder); this.outputHolders.add(outputHolder);
...@@ -140,16 +135,20 @@ public final class StageTester { ...@@ -140,16 +135,20 @@ public final class StageTester {
private final class Configuration extends AnalysisConfiguration { private final class Configuration extends AnalysisConfiguration {
public Configuration() { public Configuration() {
IPipeFactory pipeFactory = AnalysisConfiguration.PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false); final IPipeFactory interPipeFactory = PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTER, PipeOrdering.QUEUE_BASED, false);
for (InputHolder<?> inputHolder : inputHolders) { for (InputHolder<?> inputHolder : inputHolders) {
final IterableProducer<Object> producer = new IterableProducer<Object>(inputHolder.getInput()); final IterableProducer<Object> producer = new IterableProducer<Object>(inputHolder.getInput());
pipeFactory.create(producer.getOutputPort(), inputHolder.getPort()); interPipeFactory.create(producer.getOutputPort(), inputHolder.getPort());
addThreadableStage(producer); addThreadableStage(producer);
} }
addThreadableStage(stage);
final IPipeFactory intraPipeFactory = PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false);
for (OutputHolder<?> outputHolder : outputHolders) { for (OutputHolder<?> outputHolder : outputHolders) {
final CollectorSink<Object> sink = new CollectorSink<Object>(outputHolder.getOutput()); final CollectorSink<Object> sink = new CollectorSink<Object>(outputHolder.getOutput());
pipeFactory.create(outputHolder.getPort(), sink.getInputPort()); intraPipeFactory.create(outputHolder.getPort(), sink.getInputPort());
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment