From 9d925c7c211d6c7fbe105bac690f8b0e27b8ba30 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Wed, 17 Dec 2014 13:50:45 +0100
Subject: [PATCH] fixed cause of test failures
---
src/main/java/teetime/framework/AbstractStage.java | 3 ++-
src/main/java/teetime/framework/Analysis.java | 4 ++--
.../teetime/framework/validation/InvalidPortConnection.java | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/teetime/framework/AbstractStage.java b/src/main/java/teetime/framework/AbstractStage.java
index bc6a244a..06b1b772 100644
--- a/src/main/java/teetime/framework/AbstractStage.java
+++ b/src/main/java/teetime/framework/AbstractStage.java
@@ -119,7 +119,8 @@ public abstract class AbstractStage extends Stage {
@Override
public void validateOutputPorts(final List<InvalidPortConnection> invalidPortConnections) {
- for (OutputPort<?> outputPort : this.getOutputPorts()) {
+ // for (OutputPort<?> outputPort : this.getOutputPorts()) {
+ for (OutputPort<?> outputPort : this.outputPortList) {
final IPipe pipe = outputPort.getPipe();
if (null != pipe) { // if output port is connected with another one
final Class<?> sourcePortType = outputPort.getType();
diff --git a/src/main/java/teetime/framework/Analysis.java b/src/main/java/teetime/framework/Analysis.java
index 7d80f166..9645269e 100644
--- a/src/main/java/teetime/framework/Analysis.java
+++ b/src/main/java/teetime/framework/Analysis.java
@@ -33,13 +33,13 @@ public class Analysis implements UncaughtExceptionHandler {
private final Collection<Pair<Thread, Throwable>> exceptions = new ConcurrentLinkedQueue<Pair<Thread, Throwable>>();
/**
- * Creates a new {@link Analysis} that initially validates the port connections.
+ * Creates a new {@link Analysis} that skips validating the port connections.
*
* @param configuration
* to be used for the analysis
*/
public Analysis(final AnalysisConfiguration configuration) {
- this(configuration, true);
+ this(configuration, false);
}
public Analysis(final AnalysisConfiguration configuration, final boolean validationEnabled) {
diff --git a/src/main/java/teetime/framework/validation/InvalidPortConnection.java b/src/main/java/teetime/framework/validation/InvalidPortConnection.java
index dbe36d53..19ea3a45 100644
--- a/src/main/java/teetime/framework/validation/InvalidPortConnection.java
+++ b/src/main/java/teetime/framework/validation/InvalidPortConnection.java
@@ -24,9 +24,9 @@ public class InvalidPortConnection {
@Override
public String toString() {
- final String sourcePortTypeName = (this.sourcePort.getType() == null) ? null : this.sourcePort.getType().getName();
- final String targetPortTypeName = (this.targetPort.getType() == null) ? null : this.targetPort.getType().getName();
- return sourcePortTypeName + " != " + targetPortTypeName;
+ final String sourcePortTypeName = (this.sourcePort.getType() == null) ? "null" : this.sourcePort.getType().getName();
+ final String targetPortTypeName = (this.targetPort.getType() == null) ? "null" : this.targetPort.getType().getName();
+ return "Source port type does not match target port type: " + sourcePortTypeName + " != " + targetPortTypeName;
}
}
--
GitLab