From e2af0002f42942413942f83c1650c5dcbe9dc641 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <ntd@informatik.uni-kiel.de>
Date: Wed, 15 Apr 2015 15:49:29 +0200
Subject: [PATCH] migrated to Analysis.executeBlocking()
---
.../recordReader/RecordReaderAnalysisTest.java | 16 ++--------------
.../traceReading/ChwHomeTcpTraceReadingTest.java | 2 +-
...hwHomeTcpTraceReconstructionAnalysisTest.java | 2 +-
.../ChwHomeTraceReconstructionAnalysisTest.java | 6 +++---
...hwWorkTcpTraceReconstructionAnalysisTest.java | 2 +-
.../ChwWorkTraceReconstructionAnalysisTest.java | 6 +++---
...aceReconstructionAnalysisWithThreadsTest.java | 2 +-
...aceReconstructionAnalysisWithThreadsTest.java | 2 +-
...TcpTraceReductionAnalysisWithThreadsTest.java | 2 +-
9 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/src/performancetest/java/teetime/examples/recordReader/RecordReaderAnalysisTest.java b/src/performancetest/java/teetime/examples/recordReader/RecordReaderAnalysisTest.java
index 21cbdf2b..cff21613 100644
--- a/src/performancetest/java/teetime/examples/recordReader/RecordReaderAnalysisTest.java
+++ b/src/performancetest/java/teetime/examples/recordReader/RecordReaderAnalysisTest.java
@@ -16,9 +16,7 @@
package teetime.examples.recordReader;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import java.util.Collection;
import java.util.concurrent.TimeUnit;
import org.junit.After;
@@ -26,7 +24,6 @@ import org.junit.Before;
import org.junit.Test;
import teetime.framework.Analysis;
-import teetime.util.Pair;
import teetime.util.StopWatch;
import kieker.common.record.IMonitoringRecord;
@@ -58,19 +55,10 @@ public class RecordReaderAnalysisTest {
final RecordReaderConfiguration configuration = new RecordReaderConfiguration();
Analysis analysis = new Analysis(configuration);
- analysis.init();
-
- Collection<Pair<Thread, Throwable>> exceptions;
this.stopWatch.start();
- try {
- exceptions = analysis.start();
- } finally {
- this.stopWatch.end();
- }
-
- assertNotNull(exceptions);
- assertEquals(0, exceptions.size());
+ analysis.executeBlocking();
+ this.stopWatch.end();
assertEquals(6541, configuration.getElementCollection().size());
diff --git a/src/performancetest/java/teetime/examples/traceReading/ChwHomeTcpTraceReadingTest.java b/src/performancetest/java/teetime/examples/traceReading/ChwHomeTcpTraceReadingTest.java
index bd37b015..c80634ed 100644
--- a/src/performancetest/java/teetime/examples/traceReading/ChwHomeTcpTraceReadingTest.java
+++ b/src/performancetest/java/teetime/examples/traceReading/ChwHomeTcpTraceReadingTest.java
@@ -71,7 +71,7 @@ public class ChwHomeTcpTraceReadingTest {
this.stopWatch.start();
try {
- analysis.start();
+ analysis.executeBlocking();
} finally {
this.stopWatch.end();
}
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTcpTraceReconstructionAnalysisTest.java b/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTcpTraceReconstructionAnalysisTest.java
index 74076efb..db85ffe1 100644
--- a/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTcpTraceReconstructionAnalysisTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTcpTraceReconstructionAnalysisTest.java
@@ -68,7 +68,7 @@ public class ChwHomeTcpTraceReconstructionAnalysisTest {
this.stopWatch.start();
try {
- analysis.start();
+ analysis.executeBlocking();
} finally {
this.stopWatch.end();
}
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTraceReconstructionAnalysisTest.java b/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTraceReconstructionAnalysisTest.java
index f777ab1d..01b5daac 100644
--- a/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTraceReconstructionAnalysisTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstruction/ChwHomeTraceReconstructionAnalysisTest.java
@@ -66,7 +66,7 @@ public class ChwHomeTraceReconstructionAnalysisTest {
this.stopWatch.start();
try {
- analysis.start();
+ analysis.executeBlocking();
} finally {
this.stopWatch.end();
}
@@ -96,7 +96,7 @@ public class ChwHomeTraceReconstructionAnalysisTest {
this.stopWatch.start();
try {
- analysis.start();
+ analysis.executeBlocking();
} finally {
this.stopWatch.end();
}
@@ -126,7 +126,7 @@ public class ChwHomeTraceReconstructionAnalysisTest {
this.stopWatch.start();
try {
- analysis.start();
+ analysis.executeBlocking();
} finally {
this.stopWatch.end();
}
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTcpTraceReconstructionAnalysisTest.java b/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTcpTraceReconstructionAnalysisTest.java
index 9486d2da..1e936725 100644
--- a/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTcpTraceReconstructionAnalysisTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTcpTraceReconstructionAnalysisTest.java
@@ -61,7 +61,7 @@ public class ChwWorkTcpTraceReconstructionAnalysisTest {
this.stopWatch.start();
try {
- analysis.start();
+ analysis.executeBlocking();
} finally {
this.stopWatch.end();
}
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTraceReconstructionAnalysisTest.java b/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTraceReconstructionAnalysisTest.java
index 3d8935a5..3c111756 100644
--- a/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTraceReconstructionAnalysisTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstruction/ChwWorkTraceReconstructionAnalysisTest.java
@@ -64,7 +64,7 @@ class ChwWorkTraceReconstructionAnalysisTest {
this.stopWatch.start();
try {
- analysis.start();
+ analysis.executeBlocking();
} finally {
this.stopWatch.end();
}
@@ -92,7 +92,7 @@ class ChwWorkTraceReconstructionAnalysisTest {
this.stopWatch.start();
try {
- analysis.start();
+ analysis.executeBlocking();
} finally {
this.stopWatch.end();
}
@@ -122,7 +122,7 @@ class ChwWorkTraceReconstructionAnalysisTest {
this.stopWatch.start();
try {
- analysis.start();
+ analysis.executeBlocking();
} finally {
this.stopWatch.end();
}
diff --git a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwHomeTcpTraceReconstructionAnalysisWithThreadsTest.java b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwHomeTcpTraceReconstructionAnalysisWithThreadsTest.java
index 0826c429..62755a6f 100644
--- a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwHomeTcpTraceReconstructionAnalysisWithThreadsTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwHomeTcpTraceReconstructionAnalysisWithThreadsTest.java
@@ -78,7 +78,7 @@ public class ChwHomeTcpTraceReconstructionAnalysisWithThreadsTest {
this.stopWatch.start();
try {
- analysis.start();
+ analysis.executeBlocking();
} finally {
this.stopWatch.end();
}
diff --git a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwWorkTcpTraceReconstructionAnalysisWithThreadsTest.java b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwWorkTcpTraceReconstructionAnalysisWithThreadsTest.java
index 1baf02b6..8ec08f8a 100644
--- a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwWorkTcpTraceReconstructionAnalysisWithThreadsTest.java
+++ b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwWorkTcpTraceReconstructionAnalysisWithThreadsTest.java
@@ -93,7 +93,7 @@ public class ChwWorkTcpTraceReconstructionAnalysisWithThreadsTest {
this.stopWatch.start();
try {
- analysis.start();
+ analysis.executeBlocking();
} finally {
this.stopWatch.end();
}
diff --git a/src/performancetest/java/teetime/examples/traceReductionWithThreads/ChwWorkTcpTraceReductionAnalysisWithThreadsTest.java b/src/performancetest/java/teetime/examples/traceReductionWithThreads/ChwWorkTcpTraceReductionAnalysisWithThreadsTest.java
index c8bca509..9f33491d 100644
--- a/src/performancetest/java/teetime/examples/traceReductionWithThreads/ChwWorkTcpTraceReductionAnalysisWithThreadsTest.java
+++ b/src/performancetest/java/teetime/examples/traceReductionWithThreads/ChwWorkTcpTraceReductionAnalysisWithThreadsTest.java
@@ -107,7 +107,7 @@ public class ChwWorkTcpTraceReductionAnalysisWithThreadsTest {
this.stopWatch.start();
try {
- analysis.start();
+ analysis.executeBlocking();
} finally {
this.stopWatch.end();
}
--
GitLab