From d93373a99adb016245576834d478053eda654c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Blu=CC=88mke?= <lbl@informatik.uni-kiel.de>
Date: Wed, 27 Apr 2016 18:28:59 +0200
Subject: [PATCH] Changed visibility of static constants to 'package' to make
them accessible from test case
---
.../plugin/filter/sink/CPUUtilizationDisplay.java | 12 ++++++------
.../analysis/plugin/filter/sink/GCDisplay.java | 4 ++--
.../filter/sink/CPUUtilizationDisplayTest.java | 12 ++++++------
.../analysis/plugin/filter/sink/GCDisplayTest.java | 4 ++--
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplay.java b/src/main/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplay.java
index 6ab3bdd5..faa98a82 100644
--- a/src/main/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplay.java
+++ b/src/main/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplay.java
@@ -35,12 +35,12 @@ import teetime.framework.AbstractConsumerStage;
*/
public class CPUUtilizationDisplay extends AbstractConsumerStage<CPUUtilizationRecord> {
- private static final String TOTAL_UTILIZATION = "totalUtilization";
- private static final String IDLE = "idle";
- private static final String IRQ = "irq";
- private static final String NICE = "nice";
- private static final String SYSTEM = "system";
- private static final String USER = "user";
+ static final String TOTAL_UTILIZATION = "totalUtilization";
+ static final String IDLE = "idle";
+ static final String IRQ = "irq";
+ static final String NICE = "nice";
+ static final String SYSTEM = "system";
+ static final String USER = "user";
private final MeterGauge meterGauge;
private final XYPlot xyplot;
diff --git a/src/main/java/kieker/analysis/plugin/filter/sink/GCDisplay.java b/src/main/java/kieker/analysis/plugin/filter/sink/GCDisplay.java
index 5ce6d002..6bb8da30 100644
--- a/src/main/java/kieker/analysis/plugin/filter/sink/GCDisplay.java
+++ b/src/main/java/kieker/analysis/plugin/filter/sink/GCDisplay.java
@@ -30,8 +30,8 @@ import teetime.framework.AbstractConsumerStage;
*/
public class GCDisplay extends AbstractConsumerStage<GCRecord> {
- private static final String COLLECTION_TIME = "Collection Time";
- private static final String COLLECTION_COUNT = "Collection Count";
+ static final String COLLECTION_TIME = "Collection Time";
+ static final String COLLECTION_COUNT = "Collection Count";
private final XYPlot xyplot;
diff --git a/src/test/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayTest.java b/src/test/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayTest.java
index 7c7b4e4e..02281b69 100644
--- a/src/test/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayTest.java
+++ b/src/test/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayTest.java
@@ -61,12 +61,12 @@ public class CPUUtilizationDisplayTest {
final Date date = new Date(TimeUnit.MILLISECONDS.convert(record.getLoggingTimestamp(), recordsTimeUnit));
final String minutesAndSeconds = date.toString().substring(14, 19);
- double actualUser = (double) cpuUtilFilter.getXYPlot().getEntries(id + " - " + "user").get(minutesAndSeconds);
- double actualSystem = (double) cpuUtilFilter.getXYPlot().getEntries(id + " - " + "system").get(minutesAndSeconds);
- double actualNice = (double) cpuUtilFilter.getXYPlot().getEntries(id + " - " + "nice").get(minutesAndSeconds);
- double actualIrq = (double) cpuUtilFilter.getXYPlot().getEntries(id + " - " + "irq").get(minutesAndSeconds);
- double actualTotalUtilization = (double) cpuUtilFilter.getXYPlot().getEntries(id + " - " + "totalUtilization").get(minutesAndSeconds);
- double actualIdle = (double) cpuUtilFilter.getXYPlot().getEntries(id + " - " + "idle").get(minutesAndSeconds);
+ double actualUser = (double) cpuUtilFilter.getXYPlot().getEntries(id + " - " + CPUUtilizationDisplay.USER).get(minutesAndSeconds);
+ double actualSystem = (double) cpuUtilFilter.getXYPlot().getEntries(id + " - " + CPUUtilizationDisplay.SYSTEM).get(minutesAndSeconds);
+ double actualNice = (double) cpuUtilFilter.getXYPlot().getEntries(id + " - " + CPUUtilizationDisplay.NICE).get(minutesAndSeconds);
+ double actualIrq = (double) cpuUtilFilter.getXYPlot().getEntries(id + " - " + CPUUtilizationDisplay.IRQ).get(minutesAndSeconds);
+ double actualTotalUtilization = (double) cpuUtilFilter.getXYPlot().getEntries(id + " - " + CPUUtilizationDisplay.TOTAL_UTILIZATION).get(minutesAndSeconds);
+ double actualIdle = (double) cpuUtilFilter.getXYPlot().getEntries(id + " - " + CPUUtilizationDisplay.IDLE).get(minutesAndSeconds);
assertThat(actualUser / 100, is(user));
assertThat(actualSystem / 100, is(system));
diff --git a/src/test/java/kieker/analysis/plugin/filter/sink/GCDisplayTest.java b/src/test/java/kieker/analysis/plugin/filter/sink/GCDisplayTest.java
index 4a7a79f4..a537654e 100644
--- a/src/test/java/kieker/analysis/plugin/filter/sink/GCDisplayTest.java
+++ b/src/test/java/kieker/analysis/plugin/filter/sink/GCDisplayTest.java
@@ -47,8 +47,8 @@ public class GCDisplayTest {
final String id = record.getHostname() + " - " + record.getVmName() + " - " + record.getGcName();
- long actualCollectionCount = (long) gcDisplayFilter.getXYPlot().getEntries(id + " - " + "Collection Count").get(minutesAndSeconds);
- long actualCollectionTime = (long) gcDisplayFilter.getXYPlot().getEntries(id + " - " + "Collection Time").get(minutesAndSeconds);
+ long actualCollectionCount = (long) gcDisplayFilter.getXYPlot().getEntries(id + " - " + GCDisplay.COLLECTION_COUNT).get(minutesAndSeconds);
+ long actualCollectionTime = (long) gcDisplayFilter.getXYPlot().getEntries(id + " - " + GCDisplay.COLLECTION_TIME).get(minutesAndSeconds);
assertThat(actualCollectionCount, is(collectionCount));
assertThat(actualCollectionTime, is(collectionTimeMS));
--
GitLab