From ffeac3594f2a545c66d64a8b6d2ae3a1e3930e22 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <stu103017@mail.uni-kiel.de>
Date: Mon, 22 Jun 2015 13:51:54 +0200
Subject: [PATCH] updated tests to the new api
---
src/main/java/teetime/framework/ConfigurationContext.java | 2 +-
src/test/java/teetime/examples/cipher/CipherConfiguration.java | 3 ---
.../teetime/examples/tokenizer/TokenizerConfiguration.java | 1 -
src/test/java/teetime/framework/ExecutionTest.java | 3 ---
src/test/java/teetime/framework/StageTest.java | 1 -
src/test/java/teetime/framework/TraversorTest.java | 1 -
.../exceptionHandling/ExceptionTestConfiguration.java | 2 +-
src/test/java/teetime/stage/InstanceOfFilterTest.java | 3 +--
8 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/main/java/teetime/framework/ConfigurationContext.java b/src/main/java/teetime/framework/ConfigurationContext.java
index d6341823..c477e6fe 100644
--- a/src/main/java/teetime/framework/ConfigurationContext.java
+++ b/src/main/java/teetime/framework/ConfigurationContext.java
@@ -66,7 +66,7 @@ public abstract class ConfigurationContext extends Configuration {
*/
@Override
protected final void addThreadableStage(final Stage stage) {
- if (this.threadableStages.add(stage)) {
+ if (!this.threadableStages.add(stage)) {
LOGGER.warn("Stage " + stage.getId() + " was already marked as threadable stage.");
}
}
diff --git a/src/test/java/teetime/examples/cipher/CipherConfiguration.java b/src/test/java/teetime/examples/cipher/CipherConfiguration.java
index 717a6fb3..7f46f37b 100644
--- a/src/test/java/teetime/examples/cipher/CipherConfiguration.java
+++ b/src/test/java/teetime/examples/cipher/CipherConfiguration.java
@@ -47,8 +47,5 @@ public class CipherConfiguration extends ConfigurationContext {
connectPorts(decomp.getOutputPort(), decrypt.getInputPort());
connectPorts(decrypt.getOutputPort(), writer.getInputPort());
- // this.getFiniteProducerStages().add(init);
- this.addThreadableStage(init);
-
}
}
diff --git a/src/test/java/teetime/examples/tokenizer/TokenizerConfiguration.java b/src/test/java/teetime/examples/tokenizer/TokenizerConfiguration.java
index d76fcbb9..abafb20b 100644
--- a/src/test/java/teetime/examples/tokenizer/TokenizerConfiguration.java
+++ b/src/test/java/teetime/examples/tokenizer/TokenizerConfiguration.java
@@ -50,7 +50,6 @@ public class TokenizerConfiguration extends ConfigurationContext {
connectPorts(b2s.getOutputPort(), tokenizer.getInputPort());
connectPorts(tokenizer.getOutputPort(), this.counter.getInputPort());
- this.addThreadableStage(init);
}
public int getTokenCount() {
diff --git a/src/test/java/teetime/framework/ExecutionTest.java b/src/test/java/teetime/framework/ExecutionTest.java
index c32c39f5..758dcfb1 100644
--- a/src/test/java/teetime/framework/ExecutionTest.java
+++ b/src/test/java/teetime/framework/ExecutionTest.java
@@ -77,7 +77,6 @@ public class ExecutionTest {
final InitialElementProducer<String> init = new InitialElementProducer<String>("Hello");
delay = new DelayAndTerminate(DELAY_IN_MS);
connectPorts(init.getOutputPort(), delay.getInputPort());
- addThreadableStage(init);
}
}
@@ -118,7 +117,6 @@ public class ExecutionTest {
public AnalysisTestConfig(final boolean inter) {
connectPorts(init.getOutputPort(), sink.getInputPort());
- addThreadableStage(init);
if (inter) {
addThreadableStage(sink);
}
@@ -145,7 +143,6 @@ public class ExecutionTest {
connectPorts(init.getOutputPort(), iof.getInputPort());
connectPorts(iof.getMatchedOutputPort(), sink.getInputPort());
connectPorts(init.createOutputPort(), sink.createInputPort());
- addThreadableStage(init);
addThreadableStage(iof);
}
}
diff --git a/src/test/java/teetime/framework/StageTest.java b/src/test/java/teetime/framework/StageTest.java
index 10725dd1..c8cf92c2 100644
--- a/src/test/java/teetime/framework/StageTest.java
+++ b/src/test/java/teetime/framework/StageTest.java
@@ -61,7 +61,6 @@ public class StageTest {
init = new InitialElementProducer<String>("Hello");
delay = new DelayAndTerminate(0);
connectPorts(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 6079aa01..782fc8cf 100644
--- a/src/test/java/teetime/framework/TraversorTest.java
+++ b/src/test/java/teetime/framework/TraversorTest.java
@@ -91,7 +91,6 @@ public class TraversorTest {
connectPorts(merger.getOutputPort(), result.getInputPort());
// Add the first and last part to the threadable stages
- addThreadableStage(init);
addThreadableStage(merger);
}
diff --git a/src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java b/src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java
index bf9d3c7a..f7d1e450 100644
--- a/src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java
+++ b/src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java
@@ -32,6 +32,6 @@ public class ExceptionTestConfiguration extends ConfigurationContext {
// this.addThreadableStage(new ExceptionTestStage());
this.addThreadableStage(second);
- // this.addThreadableStage(third);
+ this.addThreadableStage(third);
}
}
diff --git a/src/test/java/teetime/stage/InstanceOfFilterTest.java b/src/test/java/teetime/stage/InstanceOfFilterTest.java
index 6b385175..f4152c64 100644
--- a/src/test/java/teetime/stage/InstanceOfFilterTest.java
+++ b/src/test/java/teetime/stage/InstanceOfFilterTest.java
@@ -29,8 +29,8 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import teetime.framework.Execution;
import teetime.framework.ConfigurationContext;
+import teetime.framework.Execution;
import teetime.framework.ExecutionException;
import teetime.util.Pair;
@@ -134,7 +134,6 @@ public class InstanceOfFilterTest {
connectPorts(instanceOfFilter.getMatchedOutputPort(), clazzCollector.getInputPort());
connectPorts(instanceOfFilter.getMismatchedOutputPort(), mismatchedCollector.getInputPort());
- addThreadableStage(elementProducer);
}
}
--
GitLab