From 9cd55ce3a88e900b3d43358ce80b9686f8e66b28 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Mon, 22 Jun 2015 17:09:00 +0200
Subject: [PATCH] adapted new API
---
.settings/edu.umd.cs.findbugs.core.prefs | 2 +-
.../dynamic/ControlledDistributorTest.java | 13 ++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index 8aa5ab1d..e6f45f06 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
#FindBugs User Preferences
-#Mon Jun 22 16:34:51 CEST 2015
+#Mon Jun 22 16:47:12 CEST 2015
detector_threshold=2
effort=max
excludefilter0=.fbExcludeFilterFile|true
diff --git a/src/test/java/teetime/stage/basic/distributor/dynamic/ControlledDistributorTest.java b/src/test/java/teetime/stage/basic/distributor/dynamic/ControlledDistributorTest.java
index 74841da7..d988259d 100644
--- a/src/test/java/teetime/stage/basic/distributor/dynamic/ControlledDistributorTest.java
+++ b/src/test/java/teetime/stage/basic/distributor/dynamic/ControlledDistributorTest.java
@@ -11,8 +11,8 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import teetime.framework.Analysis;
-import teetime.framework.AnalysisConfiguration;
+import teetime.framework.ConfigurationContext;
+import teetime.framework.Execution;
import teetime.framework.Stage;
import teetime.framework.exceptionHandling.TerminatingExceptionListenerFactory;
import teetime.stage.CollectorSink;
@@ -36,7 +36,7 @@ public class ControlledDistributorTest {
List<PortAction<Integer>> inputActions = Arrays.asList(createAction, createAction, createAction, createAction, createAction);
ControlledDistributorTestConfig<Integer> config = new ControlledDistributorTestConfig<Integer>(inputNumbers, inputActions);
- Analysis<ControlledDistributorTestConfig<Integer>> analysis = new Analysis<ControlledDistributorTestConfig<Integer>>(config,
+ Execution<ControlledDistributorTestConfig<Integer>> analysis = new Execution<ControlledDistributorTestConfig<Integer>>(config,
new TerminatingExceptionListenerFactory());
analysis.executeBlocking();
@@ -56,7 +56,7 @@ public class ControlledDistributorTest {
}
ControlledDistributorTestConfig<Integer> config = new ControlledDistributorTestConfig<Integer>(inputNumbers, Arrays.asList(inputActions));
- Analysis<ControlledDistributorTestConfig<Integer>> analysis = new Analysis<ControlledDistributorTestConfig<Integer>>(config,
+ Execution<ControlledDistributorTestConfig<Integer>> analysis = new Execution<ControlledDistributorTestConfig<Integer>>(config,
new TerminatingExceptionListenerFactory());
analysis.executeBlocking();
@@ -83,7 +83,7 @@ public class ControlledDistributorTest {
inputActions[5] = new RemovePortAction<Integer>(null);
ControlledDistributorTestConfig<Integer> config = new ControlledDistributorTestConfig<Integer>(inputNumbers, Arrays.asList(inputActions));
- Analysis<ControlledDistributorTestConfig<Integer>> analysis = new Analysis<ControlledDistributorTestConfig<Integer>>(config,
+ Execution<ControlledDistributorTestConfig<Integer>> analysis = new Execution<ControlledDistributorTestConfig<Integer>>(config,
new TerminatingExceptionListenerFactory());
analysis.executeBlocking();
@@ -109,7 +109,7 @@ public class ControlledDistributorTest {
assertThat(collectorSink.getElements(), is(values));
}
- private static class ControlledDistributorTestConfig<T> extends AnalysisConfiguration {
+ private static class ControlledDistributorTestConfig<T> extends ConfigurationContext {
private final CollectorSink<T> collectorSink;
@@ -121,7 +121,6 @@ public class ControlledDistributorTest {
connectPorts(initialElementProducer.getOutputPort(), distributor.getInputPort());
connectPorts(distributor.getNewOutputPort(), collectorSink.getInputPort());
- addThreadableStage(initialElementProducer);
addThreadableStage(distributor);
addThreadableStage(collectorSink);
--
GitLab