From ecb6a54014dae64c55c124fd286ab19e19808410 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Sun, 28 Dec 2014 07:43:08 +0100
Subject: [PATCH] moved some files
---
src/main/java/util/MooBenchStarter.java | 31 -------------------
.../java/util/test/PerformanceResult.java | 2 ++
.../{ => test/eval}/BucketTimingsReader.java | 4 +--
.../util/test/{ => eval}/StatisticsUtil.java | 3 +-
.../java/teetime/util/StopWatchTest.java | 2 +-
src/test/java/util/test/PerformanceTest.java | 1 +
6 files changed, 7 insertions(+), 36 deletions(-)
delete mode 100644 src/main/java/util/MooBenchStarter.java
rename src/main/java/util/{ => test/eval}/BucketTimingsReader.java (97%)
rename src/main/java/util/test/{ => eval}/StatisticsUtil.java (98%)
diff --git a/src/main/java/util/MooBenchStarter.java b/src/main/java/util/MooBenchStarter.java
deleted file mode 100644
index 6d225302..00000000
--- a/src/main/java/util/MooBenchStarter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package util;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-public class MooBenchStarter {
-
- private final File execDir;
-
- public MooBenchStarter() {
- this.execDir = new File("scripts/MooBench-cmd");
- System.out.println("execDir: " + this.execDir.getAbsolutePath());
- }
-
- public void start(final int runs, final long calls) throws IOException {
- final List<String> command = new LinkedList<String>();
- command.add("cmd");
- command.add("/c");
- command.add("start");
- command.add("/D");
- command.add(this.execDir.getAbsolutePath());
- command.add("Load Driver");
- command.add("startMooBench.cmd");
- command.add(String.valueOf(runs));
- command.add(String.valueOf(calls));
-
- new ProcessBuilder(command).start();
- }
-}
diff --git a/src/main/java/util/test/PerformanceResult.java b/src/main/java/util/test/PerformanceResult.java
index d6d77a6c..e852dce9 100644
--- a/src/main/java/util/test/PerformanceResult.java
+++ b/src/main/java/util/test/PerformanceResult.java
@@ -2,6 +2,8 @@ package util.test;
import java.util.Map;
+import util.test.eval.StatisticsUtil;
+
public class PerformanceResult {
public long overallDurationInNs;
diff --git a/src/main/java/util/BucketTimingsReader.java b/src/main/java/util/test/eval/BucketTimingsReader.java
similarity index 97%
rename from src/main/java/util/BucketTimingsReader.java
rename to src/main/java/util/test/eval/BucketTimingsReader.java
index 0efdfe65..9b17b973 100644
--- a/src/main/java/util/BucketTimingsReader.java
+++ b/src/main/java/util/test/eval/BucketTimingsReader.java
@@ -1,4 +1,4 @@
-package util;
+package util.test.eval;
import java.io.BufferedReader;
import java.io.File;
@@ -11,8 +11,6 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import util.test.StatisticsUtil;
-
import com.google.common.base.Charsets;
import com.google.common.io.CharSource;
import com.google.common.io.Files;
diff --git a/src/main/java/util/test/StatisticsUtil.java b/src/main/java/util/test/eval/StatisticsUtil.java
similarity index 98%
rename from src/main/java/util/test/StatisticsUtil.java
rename to src/main/java/util/test/eval/StatisticsUtil.java
index 26a9bc35..0f30e96b 100644
--- a/src/main/java/util/test/StatisticsUtil.java
+++ b/src/main/java/util/test/eval/StatisticsUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
***************************************************************************/
-package util.test;
+package util.test.eval;
import java.util.ArrayList;
import java.util.Collections;
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit;
import teetime.util.MathUtil;
import teetime.util.TimestampObject;
+import util.test.PerformanceResult;
/**
* @author Christian Wulf
diff --git a/src/performancetest/java/teetime/util/StopWatchTest.java b/src/performancetest/java/teetime/util/StopWatchTest.java
index 5c0a6a0d..e7ad6ec9 100644
--- a/src/performancetest/java/teetime/util/StopWatchTest.java
+++ b/src/performancetest/java/teetime/util/StopWatchTest.java
@@ -7,7 +7,7 @@ import java.util.Map;
import org.junit.Test;
-import util.test.StatisticsUtil;
+import util.test.eval.StatisticsUtil;
public class StopWatchTest {
diff --git a/src/test/java/util/test/PerformanceTest.java b/src/test/java/util/test/PerformanceTest.java
index 031b4f62..7a4b0895 100644
--- a/src/test/java/util/test/PerformanceTest.java
+++ b/src/test/java/util/test/PerformanceTest.java
@@ -13,6 +13,7 @@ import org.junit.runner.Description;
import teetime.util.StopWatch;
import teetime.util.TimestampObject;
+import util.test.eval.StatisticsUtil;
public abstract class PerformanceTest {
--
GitLab