From e96031bb02ddf79fefa15d99aa97ceb9162a62a6 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Fri, 5 Dec 2014 14:16:59 +0100
Subject: [PATCH] fixed NPE in PerformanceCheckProfileRepository
---
.../java/util/test/PerformanceCheckProfileRepository.java | 5 ++---
.../java/teetime/examples/ComparisonMethodcallWithPorts.java | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/util/test/PerformanceCheckProfileRepository.java b/src/main/java/util/test/PerformanceCheckProfileRepository.java
index d16171a6..60358758 100644
--- a/src/main/java/util/test/PerformanceCheckProfileRepository.java
+++ b/src/main/java/util/test/PerformanceCheckProfileRepository.java
@@ -8,12 +8,11 @@ import org.slf4j.LoggerFactory;
public class PerformanceCheckProfileRepository {
- public static final PerformanceCheckProfileRepository INSTANCE = new PerformanceCheckProfileRepository();
-
private static final Logger LOGGER = LoggerFactory.getLogger(PerformanceCheckProfileRepository.class);
- private final Map<Class<?>, AbstractProfiledPerformanceAssertion> performanceCheckProfiles = new HashMap<Class<?>, AbstractProfiledPerformanceAssertion>();
+ public static final PerformanceCheckProfileRepository INSTANCE = new PerformanceCheckProfileRepository();
+ private final Map<Class<?>, AbstractProfiledPerformanceAssertion> performanceCheckProfiles = new HashMap<Class<?>, AbstractProfiledPerformanceAssertion>();
private String currentProfile;
public PerformanceCheckProfileRepository() {
diff --git a/src/performancetest/java/teetime/examples/ComparisonMethodcallWithPorts.java b/src/performancetest/java/teetime/examples/ComparisonMethodcallWithPorts.java
index b7e1ed78..3d45a40e 100644
--- a/src/performancetest/java/teetime/examples/ComparisonMethodcallWithPorts.java
+++ b/src/performancetest/java/teetime/examples/ComparisonMethodcallWithPorts.java
@@ -15,8 +15,8 @@ import teetime.examples.experiment15.MethodCallThoughputTimestampAnalysis15Test;
import teetime.examples.experiment16.MethodCallThoughputTimestampAnalysis16Test;
import teetime.examples.experiment17.MethodCallThoughputTimestampAnalysis17Test;
import teetime.examples.experiment19.MethodCallThoughputTimestampAnalysis19Test;
-import util.test.PerformanceCheckProfileRepository;
import util.test.AbstractProfiledPerformanceAssertion;
+import util.test.PerformanceCheckProfileRepository;
@RunWith(Suite.class)
@SuiteClasses({
@@ -34,7 +34,7 @@ public class ComparisonMethodcallWithPorts {
@BeforeClass
public static void beforeClass() {
- System.setProperty("logback.configurationFile", "src/test/resources/logback-test.groovy");
+ System.setProperty("logback.configurationFile", "src/test/resources/logback.groovy");
PerformanceCheckProfileRepository.INSTANCE.register(ComparisonMethodcallWithPorts.class, new ChwWorkComparisonMethodcallWithPorts());
PerformanceCheckProfileRepository.INSTANCE.register(ComparisonMethodcallWithPorts.class, new ChwHomeComparisonMethodcallWithPorts());
PerformanceCheckProfileRepository.INSTANCE.register(ComparisonMethodcallWithPorts.class, new NieWorkComparisonMethodcallWithPorts());
--
GitLab