From 6b68248e151522ed391fa9a075a3e0792eb316df Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <stu103017@mail.uni-kiel.de>
Date: Tue, 26 May 2015 14:08:15 +0200
Subject: [PATCH] refactored tests; all work but one... but that's logical
consequence of the changes
---
.../java/teetime/framework/test/StageTester.java | 4 ++--
.../teetime/examples/cipher/CipherConfiguration.java | 12 ++++++------
src/test/java/teetime/framework/AnalysisTest.java | 2 +-
.../RunnableConsumerStageTestConfiguration.java | 2 +-
src/test/java/teetime/framework/StageTest.java | 2 +-
src/test/java/teetime/framework/TraversorTest.java | 11 +++++------
.../teetime/framework/WaitStrategyConfiguration.java | 8 ++++----
.../framework/YieldStrategyConfiguration.java | 4 ++--
.../ExceptionTestConfiguration.java | 2 +-
.../java/teetime/stage/InstanceOfFilterTest.java | 6 +++---
10 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/src/main/java/teetime/framework/test/StageTester.java b/src/main/java/teetime/framework/test/StageTester.java
index 4ece7704..2c3ac523 100644
--- a/src/main/java/teetime/framework/test/StageTester.java
+++ b/src/main/java/teetime/framework/test/StageTester.java
@@ -88,7 +88,7 @@ public final class StageTester {
public Configuration(final List<InputHolder<?>> inputHolders, final Stage stage, final List<OutputHolder<?>> outputHolders) {
for (InputHolder<?> inputHolder : inputHolders) {
final InitialElementProducer<Object> producer = new InitialElementProducer<Object>(inputHolder.getInput());
- connectBoundedInterThreads(producer.getOutputPort(), inputHolder.getPort());
+ connectStages(producer.getOutputPort(), inputHolder.getPort());
addThreadableStage(producer);
}
@@ -96,7 +96,7 @@ public final class StageTester {
for (OutputHolder<?> outputHolder : outputHolders) {
final CollectorSink<Object> sink = new CollectorSink<Object>(outputHolder.getOutputElements());
- connectIntraThreads(outputHolder.getPort(), sink.getInputPort());
+ connectStages(outputHolder.getPort(), sink.getInputPort());
}
}
}
diff --git a/src/test/java/teetime/examples/cipher/CipherConfiguration.java b/src/test/java/teetime/examples/cipher/CipherConfiguration.java
index fca97df2..8cef45c5 100644
--- a/src/test/java/teetime/examples/cipher/CipherConfiguration.java
+++ b/src/test/java/teetime/examples/cipher/CipherConfiguration.java
@@ -40,12 +40,12 @@ public class CipherConfiguration extends AnalysisConfiguration {
final CipherStage decrypt = new CipherStage(password, CipherMode.DECRYPT);
final ByteArrayFileWriter writer = new ByteArrayFileWriter(output);
- connectIntraThreads(init.getOutputPort(), f2b.getInputPort());
- connectIntraThreads(f2b.getOutputPort(), enc.getInputPort());
- connectIntraThreads(enc.getOutputPort(), comp.getInputPort());
- connectIntraThreads(comp.getOutputPort(), decomp.getInputPort());
- connectIntraThreads(decomp.getOutputPort(), decrypt.getInputPort());
- connectIntraThreads(decrypt.getOutputPort(), writer.getInputPort());
+ connectStages(init.getOutputPort(), f2b.getInputPort());
+ connectStages(f2b.getOutputPort(), enc.getInputPort());
+ connectStages(enc.getOutputPort(), comp.getInputPort());
+ connectStages(comp.getOutputPort(), decomp.getInputPort());
+ connectStages(decomp.getOutputPort(), decrypt.getInputPort());
+ connectStages(decrypt.getOutputPort(), writer.getInputPort());
// this.getFiniteProducerStages().add(init);
this.addThreadableStage(init);
diff --git a/src/test/java/teetime/framework/AnalysisTest.java b/src/test/java/teetime/framework/AnalysisTest.java
index f9905c60..0ebf719e 100644
--- a/src/test/java/teetime/framework/AnalysisTest.java
+++ b/src/test/java/teetime/framework/AnalysisTest.java
@@ -71,7 +71,7 @@ public class AnalysisTest {
public TestConfig() {
final InitialElementProducer<String> init = new InitialElementProducer<String>("Hello");
delay = new DelayAndTerminate(DELAY_IN_MS);
- connectIntraThreads(init.getOutputPort(), delay.getInputPort());
+ connectStages(init.getOutputPort(), delay.getInputPort());
addThreadableStage(init);
}
}
diff --git a/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java b/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
index 892c3cd0..6e3be7ba 100644
--- a/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
+++ b/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
@@ -35,7 +35,7 @@ public class RunnableConsumerStageTestConfiguration extends AnalysisConfiguratio
CollectorSink<Integer> collectorSink = new CollectorSink<Integer>(collectedElements);
addThreadableStage(collectorSink);
- connectBoundedInterThreads(producer.getOutputPort(), collectorSink.getInputPort());
+ connectStages(producer.getOutputPort(), collectorSink.getInputPort());
this.collectorSink = collectorSink;
}
diff --git a/src/test/java/teetime/framework/StageTest.java b/src/test/java/teetime/framework/StageTest.java
index 5fcc1dfe..4df2995e 100644
--- a/src/test/java/teetime/framework/StageTest.java
+++ b/src/test/java/teetime/framework/StageTest.java
@@ -60,7 +60,7 @@ public class StageTest {
public TestConfig() {
init = new InitialElementProducer<String>("Hello");
delay = new DelayAndTerminate(0);
- connectIntraThreads(init.getOutputPort(), delay.getInputPort());
+ connectStages(init.getOutputPort(), delay.getInputPort());
addThreadableStage(init);
}
}
diff --git a/src/test/java/teetime/framework/TraversorTest.java b/src/test/java/teetime/framework/TraversorTest.java
index 35a7826b..eaf4be71 100644
--- a/src/test/java/teetime/framework/TraversorTest.java
+++ b/src/test/java/teetime/framework/TraversorTest.java
@@ -23,7 +23,6 @@ import java.util.Set;
import org.junit.Test;
-import teetime.framework.pipe.IPipe;
import teetime.stage.CountingMapMerger;
import teetime.stage.InitialElementProducer;
import teetime.stage.basic.distributor.Distributor;
@@ -67,8 +66,8 @@ public class TraversorTest {
// CountingMapMerger (already as field)
// Connecting the stages of the first part of the config
- connectIntraThreads(init.getOutputPort(), f2b.getInputPort());
- connectIntraThreads(f2b.getOutputPort(), distributor.getInputPort());
+ connectStages(init.getOutputPort(), f2b.getInputPort());
+ connectStages(f2b.getOutputPort(), distributor.getInputPort());
// Middle part... multiple instances of WordCounter are created and connected to the merger and distrubuter stages
for (int i = 0; i < threads; i++) {
@@ -76,15 +75,15 @@ public class TraversorTest {
final WordCounter wc = new WordCounter();
// intraFact.create(inputPortSizePrinter.getOutputPort(), wc.getInputPort());
- final IPipe distributorPipe = connectBoundedInterThreads(distributor.getNewOutputPort(), wc.getInputPort(), 10000);
- final IPipe mergerPipe = connectBoundedInterThreads(wc.getOutputPort(), merger.getNewInputPort());
+ connectStages(distributor.getNewOutputPort(), wc.getInputPort());
+ connectStages(wc.getOutputPort(), merger.getNewInputPort());
// Add WordCounter as a threadable stage, so it runs in its own thread
addThreadableStage(wc);
}
// Connect the stages of the last part
- connectIntraThreads(merger.getOutputPort(), result.getInputPort());
+ connectStages(merger.getOutputPort(), result.getInputPort());
// Add the first and last part to the threadable stages
addThreadableStage(init);
diff --git a/src/test/java/teetime/framework/WaitStrategyConfiguration.java b/src/test/java/teetime/framework/WaitStrategyConfiguration.java
index 4d4dff16..785aafd7 100644
--- a/src/test/java/teetime/framework/WaitStrategyConfiguration.java
+++ b/src/test/java/teetime/framework/WaitStrategyConfiguration.java
@@ -42,7 +42,7 @@ class WaitStrategyConfiguration extends AnalysisConfiguration {
Clock clock = new Clock();
clock.setInitialDelayInMs(initialDelayInMs);
- connectBoundedInterThreads(clock.getOutputPort(), delay.getTimestampTriggerInputPort());
+ connectStages(clock.getOutputPort(), delay.getTimestampTriggerInputPort());
return clock;
}
@@ -51,7 +51,7 @@ class WaitStrategyConfiguration extends AnalysisConfiguration {
InitialElementProducer<Object> initialElementProducer = new InitialElementProducer<Object>(elements);
delay = new Delay<Object>();
- connectIntraThreads(initialElementProducer.getOutputPort(), delay.getInputPort());
+ connectStages(initialElementProducer.getOutputPort(), delay.getInputPort());
return initialElementProducer;
}
@@ -62,8 +62,8 @@ class WaitStrategyConfiguration extends AnalysisConfiguration {
// relay.setIdleStrategy(new WaitStrategy(relay));
- connectBoundedInterThreads(delay.getOutputPort(), relay.getInputPort());
- connectIntraThreads(relay.getOutputPort(), collectorSink.getInputPort());
+ connectStages(delay.getOutputPort(), relay.getInputPort());
+ connectStages(relay.getOutputPort(), collectorSink.getInputPort());
this.collectorSink = collectorSink;
diff --git a/src/test/java/teetime/framework/YieldStrategyConfiguration.java b/src/test/java/teetime/framework/YieldStrategyConfiguration.java
index f3e48a4d..8c784d11 100644
--- a/src/test/java/teetime/framework/YieldStrategyConfiguration.java
+++ b/src/test/java/teetime/framework/YieldStrategyConfiguration.java
@@ -44,8 +44,8 @@ class YieldStrategyConfiguration extends AnalysisConfiguration {
// relay.setIdleStrategy(new YieldStrategy());
- connectBoundedInterThreads(producer.getOutputPort(), relay.getInputPort());
- connectIntraThreads(relay.getOutputPort(), collectorSink.getInputPort());
+ connectStages(producer.getOutputPort(), relay.getInputPort());
+ connectStages(relay.getOutputPort(), collectorSink.getInputPort());
this.collectorSink = collectorSink;
diff --git a/src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java b/src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java
index a9a1d1df..ab1d2e27 100644
--- a/src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java
+++ b/src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java
@@ -28,7 +28,7 @@ public class ExceptionTestConfiguration extends AnalysisConfiguration {
second = new ExceptionTestConsumerStage();
third = new ExceptionTestProducerStage();
- connectBoundedInterThreads(first.getOutputPort(), second.getInputPort());
+ connectStages(first.getOutputPort(), second.getInputPort());
// this.addThreadableStage(new ExceptionTestStage());
this.addThreadableStage(first);
diff --git a/src/test/java/teetime/stage/InstanceOfFilterTest.java b/src/test/java/teetime/stage/InstanceOfFilterTest.java
index 8abd3018..03e13bfc 100644
--- a/src/test/java/teetime/stage/InstanceOfFilterTest.java
+++ b/src/test/java/teetime/stage/InstanceOfFilterTest.java
@@ -130,9 +130,9 @@ public class InstanceOfFilterTest {
CollectorSink<Clazz> clazzCollector = new CollectorSink<Clazz>();
CollectorSink<Object> mismatchedCollector = new CollectorSink<Object>();
- connectIntraThreads(elementProducer.getOutputPort(), instanceOfFilter.getInputPort());
- connectIntraThreads(instanceOfFilter.getMatchedOutputPort(), clazzCollector.getInputPort());
- connectIntraThreads(instanceOfFilter.getMismatchedOutputPort(), mismatchedCollector.getInputPort());
+ connectStages(elementProducer.getOutputPort(), instanceOfFilter.getInputPort());
+ connectStages(instanceOfFilter.getMatchedOutputPort(), clazzCollector.getInputPort());
+ connectStages(instanceOfFilter.getMismatchedOutputPort(), mismatchedCollector.getInputPort());
addThreadableStage(elementProducer);
}
--
GitLab