From 102abf04b0f9f3c28a4f1dcf6d8ede196f1363c9 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Thu, 11 Dec 2014 14:54:32 +0100
Subject: [PATCH] fixed StageTest
---
src/main/java/teetime/framework/Stage.java | 11 ++++++++---
src/test/java/teetime/framework/StageTest.java | 2 ++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/teetime/framework/Stage.java b/src/main/java/teetime/framework/Stage.java
index 802a5d32..f947b215 100644
--- a/src/main/java/teetime/framework/Stage.java
+++ b/src/main/java/teetime/framework/Stage.java
@@ -1,8 +1,8 @@
package teetime.framework;
import java.util.List;
-import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -12,8 +12,9 @@ import teetime.framework.validation.InvalidPortConnection;
public abstract class Stage { // NOPMD (should not start with "Abstract")
+ private static final ConcurrentMap<String, Integer> INSTANCES_COUNTER = new ConcurrentHashMap<String, Integer>();
+
private final String id;
- private static final Map<String, Integer> INSTANCES_COUNTER = new ConcurrentHashMap<String, Integer>();
/**
* A unique logger instance per stage instance
*/
@@ -21,7 +22,7 @@ public abstract class Stage { // NOPMD (should not start with "Abstract")
protected Stage() {
this.id = this.createId();
- this.logger = LoggerFactory.getLogger(this.getClass().getName() + "-" + this.id);
+ this.logger = LoggerFactory.getLogger(this.id);
}
public String getId() {
@@ -46,6 +47,10 @@ public abstract class Stage { // NOPMD (should not start with "Abstract")
return newId;
}
+ static void clearInstanceCounters() { // NOPMD (package-private to clear map in tests)
+ INSTANCES_COUNTER.clear();
+ }
+
// public abstract Stage getParentStage();
//
// public abstract void setParentStage(Stage parentStage, int index);
diff --git a/src/test/java/teetime/framework/StageTest.java b/src/test/java/teetime/framework/StageTest.java
index 2a63e93e..b3ac1981 100644
--- a/src/test/java/teetime/framework/StageTest.java
+++ b/src/test/java/teetime/framework/StageTest.java
@@ -10,6 +10,8 @@ public class StageTest {
@Test
public void testId() {
+ Stage.clearInstanceCounters();
+
Counter<Object> counter0 = new Counter<Object>();
Counter<Object> counter1 = new Counter<Object>();
Assert.assertEquals("Counter-0", counter0.getId());
--
GitLab