From aa9edb1651a9218d252b9573773f73b6107475fb Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <stu103017@mail.uni-kiel.de>
Date: Thu, 2 Jul 2015 15:29:55 +0200
Subject: [PATCH] testes now on a CS with two stages and one with a single
stage
---
.../framework/AbstractCompositeStageTest.java | 24 +++++++++++++------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/test/java/teetime/framework/AbstractCompositeStageTest.java b/src/test/java/teetime/framework/AbstractCompositeStageTest.java
index 2d8848e2..f023d619 100644
--- a/src/test/java/teetime/framework/AbstractCompositeStageTest.java
+++ b/src/test/java/teetime/framework/AbstractCompositeStageTest.java
@@ -48,12 +48,22 @@ public class AbstractCompositeStageTest {
}
}
- private class TestCompositeStage extends AbstractCompositeStage {
+ private class TestCompositeOneStage extends AbstractCompositeStage {
+
+ private final Counter firstCounter = new Counter();
+
+ public TestCompositeOneStage() {
+ addThreadableStage(firstCounter);
+ }
+
+ }
+
+ private class TestCompositeTwoStage extends AbstractCompositeStage {
private final Counter firstCounter = new Counter();
private final Counter secondCounter = new Counter();
- public TestCompositeStage() {
+ public TestCompositeTwoStage() {
addThreadableStage(firstCounter);
connectPorts(firstCounter.getOutputPort(), secondCounter.getInputPort());
}
@@ -62,13 +72,13 @@ public class AbstractCompositeStageTest {
private class TestNestingCompositeStage extends AbstractCompositeStage {
- public TestCompositeStage firstCompositeStage;
- public TestCompositeStage secondCompositeStage;
+ public TestCompositeOneStage firstCompositeStage;
+ public TestCompositeTwoStage secondCompositeStage;
public TestNestingCompositeStage() {
- firstCompositeStage = new TestCompositeStage();
- secondCompositeStage = new TestCompositeStage();
- connectPorts(firstCompositeStage.secondCounter.getOutputPort(), secondCompositeStage.firstCounter.getInputPort());
+ firstCompositeStage = new TestCompositeOneStage();
+ secondCompositeStage = new TestCompositeTwoStage();
+ connectPorts(firstCompositeStage.firstCounter.getOutputPort(), secondCompositeStage.firstCounter.getInputPort());
}
}
--
GitLab