diff --git a/src/main/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayFilter.java b/src/main/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplay.java
similarity index 78%
rename from src/main/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayFilter.java
rename to src/main/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplay.java
index 1d1c1e7fa2ab85269ae368a4477be020c5b96aa0..21abd1ef7dd566354593a91d35c5d536c72c01a9 100644
--- a/src/main/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayFilter.java
+++ b/src/main/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplay.java
@@ -25,7 +25,7 @@ import kieker.analysis.display.XYPlot;
import kieker.analysis.display.annotation.Display;
import kieker.common.record.system.CPUUtilizationRecord;
-import teetime.stage.basic.AbstractFilter;
+import teetime.framework.AbstractConsumerStage;
/**
* This is a filter which accepts {@link CPUUtilizationRecord} instances and provides different views (XYPlot or MeterGauge) to visualize them.
@@ -34,7 +34,7 @@ import teetime.stage.basic.AbstractFilter;
*
* @since 1.8
*/
-public class CPUUtilizationDisplayFilter extends AbstractFilter<CPUUtilizationRecord> {
+public class CPUUtilizationDisplay extends AbstractConsumerStage<CPUUtilizationRecord> {
private static final String TOTAL_UTILIZATION = "totalUtilization";
private static final String IDLE = "idle";
@@ -62,7 +62,7 @@ public class CPUUtilizationDisplayFilter extends AbstractFilter<CPUUtilizationRe
* @see kieker.analysis.display.MeterGauge
* @see kieker.analysis.display.XYPlot
*/
- public CPUUtilizationDisplayFilter(final int numberOfEntries, final Number[] warningIntervals, final TimeUnit recordsTimeUnit) {
+ public CPUUtilizationDisplay(final int numberOfEntries, final Number[] warningIntervals, final TimeUnit recordsTimeUnit) {
this.numberOfEntries = numberOfEntries;
this.warningIntervals = warningIntervals;
this.recordsTimeUnit = recordsTimeUnit;
@@ -87,12 +87,12 @@ public class CPUUtilizationDisplayFilter extends AbstractFilter<CPUUtilizationRe
this.meterGauge.setIntervals(id, Arrays.asList(this.warningIntervals), Arrays.asList("66cc66", "E7E658", "cc6666"));
this.meterGauge.setValue(id, record.getTotalUtilization() * 100);
- this.xyplot.setEntry(id + " - " + CPUUtilizationDisplayFilter.TOTAL_UTILIZATION, minutesAndSeconds, record.getTotalUtilization() * 100);
- this.xyplot.setEntry(id + " - " + CPUUtilizationDisplayFilter.IDLE, minutesAndSeconds, record.getIdle() * 100);
- this.xyplot.setEntry(id + " - " + CPUUtilizationDisplayFilter.IRQ, minutesAndSeconds, record.getIrq() * 100);
- this.xyplot.setEntry(id + " - " + CPUUtilizationDisplayFilter.NICE, minutesAndSeconds, record.getNice() * 100);
- this.xyplot.setEntry(id + " - " + CPUUtilizationDisplayFilter.SYSTEM, minutesAndSeconds, record.getSystem() * 100);
- this.xyplot.setEntry(id + " - " + CPUUtilizationDisplayFilter.USER, minutesAndSeconds, record.getUser() * 100);
+ this.xyplot.setEntry(id + " - " + CPUUtilizationDisplay.TOTAL_UTILIZATION, minutesAndSeconds, record.getTotalUtilization() * 100);
+ this.xyplot.setEntry(id + " - " + CPUUtilizationDisplay.IDLE, minutesAndSeconds, record.getIdle() * 100);
+ this.xyplot.setEntry(id + " - " + CPUUtilizationDisplay.IRQ, minutesAndSeconds, record.getIrq() * 100);
+ this.xyplot.setEntry(id + " - " + CPUUtilizationDisplay.NICE, minutesAndSeconds, record.getNice() * 100);
+ this.xyplot.setEntry(id + " - " + CPUUtilizationDisplay.SYSTEM, minutesAndSeconds, record.getSystem() * 100);
+ this.xyplot.setEntry(id + " - " + CPUUtilizationDisplay.USER, minutesAndSeconds, record.getUser() * 100);
}
@Display(name = "Meter Gauge CPU total utilization Display")
diff --git a/src/main/java/kieker/analysis/plugin/filter/sink/GCDisplayFilter.java b/src/main/java/kieker/analysis/plugin/filter/sink/GCDisplay.java
similarity index 85%
rename from src/main/java/kieker/analysis/plugin/filter/sink/GCDisplayFilter.java
rename to src/main/java/kieker/analysis/plugin/filter/sink/GCDisplay.java
index f07e0b4fbe9a0fbe1416cf06d4a37286dcf352a6..cdf7661032174553731ffd8310ecea4507b25a83 100644
--- a/src/main/java/kieker/analysis/plugin/filter/sink/GCDisplayFilter.java
+++ b/src/main/java/kieker/analysis/plugin/filter/sink/GCDisplay.java
@@ -22,14 +22,14 @@ import kieker.analysis.display.XYPlot;
import kieker.analysis.display.annotation.Display;
import kieker.common.record.jvm.GCRecord;
-import teetime.stage.basic.AbstractFilter;
+import teetime.framework.AbstractConsumerStage;
/**
* @author Nils Christian Ehmke, Lars Erik Bluemke
*
* @since 1.10
*/
-public class GCDisplayFilter extends AbstractFilter<GCRecord> {
+public class GCDisplay extends AbstractConsumerStage<GCRecord> {
private static final String COLLECTION_TIME = "Collection Time";
private static final String COLLECTION_COUNT = "Collection Count";
@@ -50,7 +50,7 @@ public class GCDisplayFilter extends AbstractFilter<GCRecord> {
*
* @see kieker.analysis.display.XYPlot
*/
- public GCDisplayFilter(final int numberOfEntries, final TimeUnit recordsTimeUnit) {
+ public GCDisplay(final int numberOfEntries, final TimeUnit recordsTimeUnit) {
this.numberOfEntries = numberOfEntries;
this.recordsTimeUnit = recordsTimeUnit;
@@ -70,8 +70,8 @@ public class GCDisplayFilter extends AbstractFilter<GCRecord> {
final String id = record.getHostname() + " - " + record.getVmName() + " - " + record.getGcName();
- this.xyplot.setEntry(id + " - " + GCDisplayFilter.COLLECTION_COUNT, minutesAndSeconds, record.getCollectionCount());
- this.xyplot.setEntry(id + " - " + GCDisplayFilter.COLLECTION_TIME, minutesAndSeconds, record.getCollectionTimeMS());
+ this.xyplot.setEntry(id + " - " + GCDisplay.COLLECTION_COUNT, minutesAndSeconds, record.getCollectionCount());
+ this.xyplot.setEntry(id + " - " + GCDisplay.COLLECTION_TIME, minutesAndSeconds, record.getCollectionTimeMS());
}
@Display(name = "XYPlot Display")
diff --git a/src/main/java/kieker/analysis/plugin/filter/sink/MemSwapUtilizationDisplayFilter.java b/src/main/java/kieker/analysis/plugin/filter/sink/MemSwapUtilizationDisplay.java
similarity index 75%
rename from src/main/java/kieker/analysis/plugin/filter/sink/MemSwapUtilizationDisplayFilter.java
rename to src/main/java/kieker/analysis/plugin/filter/sink/MemSwapUtilizationDisplay.java
index 50b52d29974bbbaf636c8b93cbb66d68b5286199..23efaa8c673425d47ad0e00e38a2b49a69ee52b0 100644
--- a/src/main/java/kieker/analysis/plugin/filter/sink/MemSwapUtilizationDisplayFilter.java
+++ b/src/main/java/kieker/analysis/plugin/filter/sink/MemSwapUtilizationDisplay.java
@@ -24,7 +24,7 @@ import kieker.analysis.display.XYPlot;
import kieker.analysis.display.annotation.Display;
import kieker.common.record.system.MemSwapUsageRecord;
-import teetime.stage.basic.AbstractFilter;
+import teetime.framework.AbstractConsumerStage;
/**
* This is a filter which accepts {@link MemSwapUsageRecord} instances and provides different views to visualize them.
@@ -33,7 +33,7 @@ import teetime.stage.basic.AbstractFilter;
*
* @since 1.8
*/
-public class MemSwapUtilizationDisplayFilter extends AbstractFilter<MemSwapUsageRecord> {
+public class MemSwapUtilizationDisplay extends AbstractConsumerStage<MemSwapUsageRecord> {
static final String MEM_FREE = "memFree";
static final String MEM_TOTAL = "memTotal";
@@ -61,7 +61,7 @@ public class MemSwapUtilizationDisplayFilter extends AbstractFilter<MemSwapUsage
* @see kieker.analysis.display.XYPlot
* @see kieker.analysis.display.PieChart
*/
- public MemSwapUtilizationDisplayFilter(final int numberOfEntries, final TimeUnit recordsTimeUnit) {
+ public MemSwapUtilizationDisplay(final int numberOfEntries, final TimeUnit recordsTimeUnit) {
this.numberOfEntries = numberOfEntries;
this.recordsTimeUnit = recordsTimeUnit;
@@ -90,18 +90,18 @@ public class MemSwapUtilizationDisplayFilter extends AbstractFilter<MemSwapUsage
final String id = record.getHostname();
// Sets Entries in MB instead of Bytes
- this.xyplot.setEntry(id + " - " + MemSwapUtilizationDisplayFilter.MEM_FREE, minutesAndSeconds, record.getMemFree() / 1048576);
- this.xyplot.setEntry(id + " - " + MemSwapUtilizationDisplayFilter.MEM_TOTAL, minutesAndSeconds, record.getMemTotal() / 1048576);
- this.xyplot.setEntry(id + " - " + MemSwapUtilizationDisplayFilter.MEM_USED, minutesAndSeconds, record.getMemUsed() / 1048576);
- this.xyplot.setEntry(id + " - " + MemSwapUtilizationDisplayFilter.SWAP_FREE, minutesAndSeconds, record.getSwapFree() / 1048576);
- this.xyplot.setEntry(id + " - " + MemSwapUtilizationDisplayFilter.SWAP_TOTAL, minutesAndSeconds, record.getSwapTotal() / 1048576);
- this.xyplot.setEntry(id + " - " + MemSwapUtilizationDisplayFilter.SWAP_USED, minutesAndSeconds, record.getSwapUsed() / 1048576);
-
- this.memPieChart.setValue(id + " - " + MemSwapUtilizationDisplayFilter.MEM_FREE, record.getMemFree());
- this.memPieChart.setValue(id + " - " + MemSwapUtilizationDisplayFilter.MEM_USED, record.getMemUsed());
-
- this.swapPieChart.setValue(id + " - " + MemSwapUtilizationDisplayFilter.SWAP_FREE, record.getSwapFree());
- this.swapPieChart.setValue(id + " - " + MemSwapUtilizationDisplayFilter.SWAP_USED, record.getSwapUsed());
+ this.xyplot.setEntry(id + " - " + MemSwapUtilizationDisplay.MEM_FREE, minutesAndSeconds, record.getMemFree() / 1048576);
+ this.xyplot.setEntry(id + " - " + MemSwapUtilizationDisplay.MEM_TOTAL, minutesAndSeconds, record.getMemTotal() / 1048576);
+ this.xyplot.setEntry(id + " - " + MemSwapUtilizationDisplay.MEM_USED, minutesAndSeconds, record.getMemUsed() / 1048576);
+ this.xyplot.setEntry(id + " - " + MemSwapUtilizationDisplay.SWAP_FREE, minutesAndSeconds, record.getSwapFree() / 1048576);
+ this.xyplot.setEntry(id + " - " + MemSwapUtilizationDisplay.SWAP_TOTAL, minutesAndSeconds, record.getSwapTotal() / 1048576);
+ this.xyplot.setEntry(id + " - " + MemSwapUtilizationDisplay.SWAP_USED, minutesAndSeconds, record.getSwapUsed() / 1048576);
+
+ this.memPieChart.setValue(id + " - " + MemSwapUtilizationDisplay.MEM_FREE, record.getMemFree());
+ this.memPieChart.setValue(id + " - " + MemSwapUtilizationDisplay.MEM_USED, record.getMemUsed());
+
+ this.swapPieChart.setValue(id + " - " + MemSwapUtilizationDisplay.SWAP_FREE, record.getSwapFree());
+ this.swapPieChart.setValue(id + " - " + MemSwapUtilizationDisplay.SWAP_USED, record.getSwapUsed());
}
@Display(name = "XYPlot Memory utilization Display")
diff --git a/src/main/java/kieker/analysis/plugin/filter/sink/ThreadsStatusDisplayFilter.java b/src/main/java/kieker/analysis/plugin/filter/sink/ThreadsStatusDisplay.java
similarity index 79%
rename from src/main/java/kieker/analysis/plugin/filter/sink/ThreadsStatusDisplayFilter.java
rename to src/main/java/kieker/analysis/plugin/filter/sink/ThreadsStatusDisplay.java
index 5cae056a5ca046b333e88e2f36abfb97167eb80d..308d3fbd48d9f04c4e4fa4bde79c2f3a2b7f96f0 100644
--- a/src/main/java/kieker/analysis/plugin/filter/sink/ThreadsStatusDisplayFilter.java
+++ b/src/main/java/kieker/analysis/plugin/filter/sink/ThreadsStatusDisplay.java
@@ -22,6 +22,7 @@ import kieker.analysis.display.XYPlot;
import kieker.analysis.display.annotation.Display;
import kieker.common.record.jvm.ThreadsStatusRecord;
+import teetime.framework.AbstractConsumerStage;
import teetime.stage.basic.AbstractFilter;
/**
@@ -29,7 +30,7 @@ import teetime.stage.basic.AbstractFilter;
*
* @since 1.10
*/
-public class ThreadsStatusDisplayFilter extends AbstractFilter<ThreadsStatusRecord> {
+public class ThreadsStatusDisplay extends AbstractConsumerStage<ThreadsStatusRecord> {
static final String TOTAL_THREADS = "Total Threads";
static final String THREADS = "Threads";
@@ -52,7 +53,7 @@ public class ThreadsStatusDisplayFilter extends AbstractFilter<ThreadsStatusReco
*
* @see kieker.analysis.display.XYPlot
*/
- public ThreadsStatusDisplayFilter(final int numberOfEntries, final TimeUnit recordsTimeUnit) {
+ public ThreadsStatusDisplay(final int numberOfEntries, final TimeUnit recordsTimeUnit) {
this.numberOfEntries = numberOfEntries;
this.recordsTimeUnit = recordsTimeUnit;
@@ -78,10 +79,10 @@ public class ThreadsStatusDisplayFilter extends AbstractFilter<ThreadsStatusReco
final String id = record.getHostname() + " - " + record.getVmName();
- this.xyplot.setEntry(id + " - " + ThreadsStatusDisplayFilter.THREADS, minutesAndSeconds, record.getThreadCount());
- this.xyplot.setEntry(id + " - " + ThreadsStatusDisplayFilter.TOTAL_THREADS, minutesAndSeconds, record.getTotalStartedThreadCount());
- this.xyplot.setEntry(id + " - " + ThreadsStatusDisplayFilter.PEAK_THREADS, minutesAndSeconds, record.getPeakThreadCount());
- this.xyplot.setEntry(id + " - " + ThreadsStatusDisplayFilter.DAEMON_THREADS, minutesAndSeconds, record.getDaemonThreadCount());
+ this.xyplot.setEntry(id + " - " + ThreadsStatusDisplay.THREADS, minutesAndSeconds, record.getThreadCount());
+ this.xyplot.setEntry(id + " - " + ThreadsStatusDisplay.TOTAL_THREADS, minutesAndSeconds, record.getTotalStartedThreadCount());
+ this.xyplot.setEntry(id + " - " + ThreadsStatusDisplay.PEAK_THREADS, minutesAndSeconds, record.getPeakThreadCount());
+ this.xyplot.setEntry(id + " - " + ThreadsStatusDisplay.DAEMON_THREADS, minutesAndSeconds, record.getDaemonThreadCount());
}
@Display(name = "XYPlot Display")
diff --git a/src/test/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayFilterTest.java b/src/test/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayTest.java
similarity index 93%
rename from src/test/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayFilterTest.java
rename to src/test/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayTest.java
index 598b6d9af44cb176fd5e508193f37d0622c2ae1f..7c7b4e4e30bbaa37fe9451ad3e6f0789bacff056 100644
--- a/src/test/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayFilterTest.java
+++ b/src/test/java/kieker/analysis/plugin/filter/sink/CPUUtilizationDisplayTest.java
@@ -17,10 +17,10 @@ import kieker.common.record.system.CPUUtilizationRecord;
*
* @author Lars Erik Bluemke
*/
-public class CPUUtilizationDisplayFilterTest {
+public class CPUUtilizationDisplayTest {
private CPUUtilizationRecord record;
- private CPUUtilizationDisplayFilter cpuUtilFilter;
+ private CPUUtilizationDisplay cpuUtilFilter;
private String id;
// Constructor arguments for filter
@@ -43,7 +43,7 @@ public class CPUUtilizationDisplayFilterTest {
@Before
public void initializeCPUUtilizationDisplayFilter() {
record = new CPUUtilizationRecord(timestamp, hostname, cpuID, user, system, wait, nice, irq, totalUtilisation, idle);
- cpuUtilFilter = new CPUUtilizationDisplayFilter(numberOfEntries, warningIntervals, recordsTimeUnit);
+ cpuUtilFilter = new CPUUtilizationDisplay(numberOfEntries, warningIntervals, recordsTimeUnit);
id = record.getHostname() + " - " + record.getCpuID();
}
diff --git a/src/test/java/kieker/analysis/plugin/filter/sink/GCDisplayFilterTest.java b/src/test/java/kieker/analysis/plugin/filter/sink/GCDisplayTest.java
similarity index 92%
rename from src/test/java/kieker/analysis/plugin/filter/sink/GCDisplayFilterTest.java
rename to src/test/java/kieker/analysis/plugin/filter/sink/GCDisplayTest.java
index 621a87bd1cf274ae11f0742972c1c0b508875938..4a7a79f42e4554e54627ed065b8e528b48e3892b 100644
--- a/src/test/java/kieker/analysis/plugin/filter/sink/GCDisplayFilterTest.java
+++ b/src/test/java/kieker/analysis/plugin/filter/sink/GCDisplayTest.java
@@ -17,10 +17,10 @@ import kieker.common.record.jvm.GCRecord;
*
* @author Lars Erik Bluemke
*/
-public class GCDisplayFilterTest {
+public class GCDisplayTest {
private GCRecord record;
- private GCDisplayFilter gcDisplayFilter;
+ private GCDisplay gcDisplayFilter;
private final int numberOfEntries = 3;
private final TimeUnit recordsTimeUnit = TimeUnit.MILLISECONDS;
@@ -35,7 +35,7 @@ public class GCDisplayFilterTest {
@Before
public void initializeGCDisplayFilter() {
record = new GCRecord(timestamp, hostname, vmName, gcName, collectionCount, collectionTimeMS);
- gcDisplayFilter = new GCDisplayFilter(numberOfEntries, recordsTimeUnit);
+ gcDisplayFilter = new GCDisplay(numberOfEntries, recordsTimeUnit);
}
@Test
diff --git a/src/test/java/kieker/analysis/plugin/filter/sink/MemSwapUtilizationDisplayFilterTest.java b/src/test/java/kieker/analysis/plugin/filter/sink/MemSwapUtilizationDisplayTest.java
similarity index 74%
rename from src/test/java/kieker/analysis/plugin/filter/sink/MemSwapUtilizationDisplayFilterTest.java
rename to src/test/java/kieker/analysis/plugin/filter/sink/MemSwapUtilizationDisplayTest.java
index a2ea15d1309f10340030d111d33ae4234b40a8cd..3d0cd253d7de8071809be6df183a2254c7eb944b 100644
--- a/src/test/java/kieker/analysis/plugin/filter/sink/MemSwapUtilizationDisplayFilterTest.java
+++ b/src/test/java/kieker/analysis/plugin/filter/sink/MemSwapUtilizationDisplayTest.java
@@ -17,10 +17,10 @@ import kieker.common.record.system.MemSwapUsageRecord;
*
* @author Lars Erik Bluemke
*/
-public class MemSwapUtilizationDisplayFilterTest {
+public class MemSwapUtilizationDisplayTest {
private MemSwapUsageRecord record;
- private MemSwapUtilizationDisplayFilter memSwapUtilFilter;
+ private MemSwapUtilizationDisplay memSwapUtilFilter;
private final int numberOfEntries = 3;
private final TimeUnit recordsTimeUnit = TimeUnit.MILLISECONDS;
@@ -39,7 +39,7 @@ public class MemSwapUtilizationDisplayFilterTest {
@Before
public void initializeMemSwapUtilizationDisplayFilter() {
record = new MemSwapUsageRecord(timestamp, hostname, memTotal, memUsed, memFree, swapTotal, swapUsed, swapFree);
- memSwapUtilFilter = new MemSwapUtilizationDisplayFilter(numberOfEntries, recordsTimeUnit);
+ memSwapUtilFilter = new MemSwapUtilizationDisplay(numberOfEntries, recordsTimeUnit);
id = record.getHostname();
}
@@ -51,12 +51,12 @@ public class MemSwapUtilizationDisplayFilterTest {
final Date date = new Date(TimeUnit.MILLISECONDS.convert(record.getLoggingTimestamp(), recordsTimeUnit));
final String minutesAndSeconds = date.toString().substring(14, 19);
- long actualMemTotal = (long) memSwapUtilFilter.getXYPlot().getEntries(id + " - " + MemSwapUtilizationDisplayFilter.MEM_TOTAL).get(minutesAndSeconds);
- long actualMemUsed = (long) memSwapUtilFilter.getXYPlot().getEntries(id + " - " + MemSwapUtilizationDisplayFilter.MEM_USED).get(minutesAndSeconds);
- long actualMemFree = (long) memSwapUtilFilter.getXYPlot().getEntries(id + " - " + MemSwapUtilizationDisplayFilter.MEM_FREE).get(minutesAndSeconds);
- long actualSwapTotal = (long) memSwapUtilFilter.getXYPlot().getEntries(id + " - " + MemSwapUtilizationDisplayFilter.SWAP_TOTAL).get(minutesAndSeconds);
- long actualSwapUsed = (long) memSwapUtilFilter.getXYPlot().getEntries(id + " - " + MemSwapUtilizationDisplayFilter.SWAP_USED).get(minutesAndSeconds);
- long actualSwapFree = (long) memSwapUtilFilter.getXYPlot().getEntries(id + " - " + MemSwapUtilizationDisplayFilter.SWAP_FREE).get(minutesAndSeconds);
+ long actualMemTotal = (long) memSwapUtilFilter.getXYPlot().getEntries(id + " - " + MemSwapUtilizationDisplay.MEM_TOTAL).get(minutesAndSeconds);
+ long actualMemUsed = (long) memSwapUtilFilter.getXYPlot().getEntries(id + " - " + MemSwapUtilizationDisplay.MEM_USED).get(minutesAndSeconds);
+ long actualMemFree = (long) memSwapUtilFilter.getXYPlot().getEntries(id + " - " + MemSwapUtilizationDisplay.MEM_FREE).get(minutesAndSeconds);
+ long actualSwapTotal = (long) memSwapUtilFilter.getXYPlot().getEntries(id + " - " + MemSwapUtilizationDisplay.SWAP_TOTAL).get(minutesAndSeconds);
+ long actualSwapUsed = (long) memSwapUtilFilter.getXYPlot().getEntries(id + " - " + MemSwapUtilizationDisplay.SWAP_USED).get(minutesAndSeconds);
+ long actualSwapFree = (long) memSwapUtilFilter.getXYPlot().getEntries(id + " - " + MemSwapUtilizationDisplay.SWAP_FREE).get(minutesAndSeconds);
// Converting back form MB to Byte
assertThat(actualMemTotal * 1048576, is(memTotal));
@@ -72,8 +72,8 @@ public class MemSwapUtilizationDisplayFilterTest {
public void memPieChartShouldBeCorrect() {
test(memSwapUtilFilter).and().send(record).to(memSwapUtilFilter.getInputPort()).start();
- long actualMemFree = (long) memSwapUtilFilter.getMemPieChart().getValue(id + " - " + MemSwapUtilizationDisplayFilter.MEM_FREE);
- long actualMemUsed = (long) memSwapUtilFilter.getMemPieChart().getValue(id + " - " + MemSwapUtilizationDisplayFilter.MEM_USED);
+ long actualMemFree = (long) memSwapUtilFilter.getMemPieChart().getValue(id + " - " + MemSwapUtilizationDisplay.MEM_FREE);
+ long actualMemUsed = (long) memSwapUtilFilter.getMemPieChart().getValue(id + " - " + MemSwapUtilizationDisplay.MEM_USED);
assertThat(actualMemFree, is(memFree));
assertThat(actualMemUsed, is(memUsed));
@@ -84,8 +84,8 @@ public class MemSwapUtilizationDisplayFilterTest {
public void swapPieChartShouldBeCorrect() {
test(memSwapUtilFilter).and().send(record).to(memSwapUtilFilter.getInputPort()).start();
- long actualSwapFree = (long) memSwapUtilFilter.getSwapPieChart().getValue(id + " - " + MemSwapUtilizationDisplayFilter.SWAP_FREE);
- long actualSwapUsed = (long) memSwapUtilFilter.getSwapPieChart().getValue(id + " - " + MemSwapUtilizationDisplayFilter.SWAP_USED);
+ long actualSwapFree = (long) memSwapUtilFilter.getSwapPieChart().getValue(id + " - " + MemSwapUtilizationDisplay.SWAP_FREE);
+ long actualSwapUsed = (long) memSwapUtilFilter.getSwapPieChart().getValue(id + " - " + MemSwapUtilizationDisplay.SWAP_USED);
assertThat(actualSwapFree, is(swapFree));
assertThat(actualSwapUsed, is(swapUsed));
diff --git a/src/test/java/kieker/analysis/plugin/filter/sink/ThreadsStatusDisplayFilterTest.java b/src/test/java/kieker/analysis/plugin/filter/sink/ThreadsStatusDisplayTest.java
similarity index 78%
rename from src/test/java/kieker/analysis/plugin/filter/sink/ThreadsStatusDisplayFilterTest.java
rename to src/test/java/kieker/analysis/plugin/filter/sink/ThreadsStatusDisplayTest.java
index 7856321ede8f5915acc5a9114afb3c855be2db8a..e9db59c5d8e02d3b2ff658fa5c7e11d41798c822 100644
--- a/src/test/java/kieker/analysis/plugin/filter/sink/ThreadsStatusDisplayFilterTest.java
+++ b/src/test/java/kieker/analysis/plugin/filter/sink/ThreadsStatusDisplayTest.java
@@ -12,9 +12,9 @@ import org.junit.Test;
import kieker.common.record.jvm.ThreadsStatusRecord;
-public class ThreadsStatusDisplayFilterTest {
+public class ThreadsStatusDisplayTest {
private ThreadsStatusRecord record;
- private ThreadsStatusDisplayFilter threadsStatusFilter;
+ private ThreadsStatusDisplay threadsStatusFilter;
private final int numberOfEntries = 3;
private final TimeUnit recordsTimeUnit = TimeUnit.MILLISECONDS;
@@ -30,7 +30,7 @@ public class ThreadsStatusDisplayFilterTest {
@Before
public void initializeThreadStatusDisplayFilter() {
record = new ThreadsStatusRecord(timestamp, hostname, vmName, threadCount, daemonThreadCount, peakThreadCount, totalStartedThreadCount);
- threadsStatusFilter = new ThreadsStatusDisplayFilter(numberOfEntries, recordsTimeUnit);
+ threadsStatusFilter = new ThreadsStatusDisplay(numberOfEntries, recordsTimeUnit);
}
@Test
@@ -42,11 +42,11 @@ public class ThreadsStatusDisplayFilterTest {
final String id = record.getHostname() + " - " + record.getVmName();
- long actualThreadCount = (long) threadsStatusFilter.getXYPlot().getEntries(id + " - " + ThreadsStatusDisplayFilter.THREADS).get(minutesAndSeconds);
- long actualTotalStartedThreadCount = (long) threadsStatusFilter.getXYPlot().getEntries(id + " - " + ThreadsStatusDisplayFilter.TOTAL_THREADS)
+ long actualThreadCount = (long) threadsStatusFilter.getXYPlot().getEntries(id + " - " + ThreadsStatusDisplay.THREADS).get(minutesAndSeconds);
+ long actualTotalStartedThreadCount = (long) threadsStatusFilter.getXYPlot().getEntries(id + " - " + ThreadsStatusDisplay.TOTAL_THREADS)
.get(minutesAndSeconds);
- long actualPeakThreadCount = (long) threadsStatusFilter.getXYPlot().getEntries(id + " - " + ThreadsStatusDisplayFilter.PEAK_THREADS).get(minutesAndSeconds);
- long actualDaemonThreadCount = (long) threadsStatusFilter.getXYPlot().getEntries(id + " - " + ThreadsStatusDisplayFilter.DAEMON_THREADS)
+ long actualPeakThreadCount = (long) threadsStatusFilter.getXYPlot().getEntries(id + " - " + ThreadsStatusDisplay.PEAK_THREADS).get(minutesAndSeconds);
+ long actualDaemonThreadCount = (long) threadsStatusFilter.getXYPlot().getEntries(id + " - " + ThreadsStatusDisplay.DAEMON_THREADS)
.get(minutesAndSeconds);
assertThat(actualThreadCount, is(threadCount));