From fda679f04edee19962fcf0d2fbffbae3c5df6dbc Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Wed, 25 Feb 2015 16:32:11 +0100
Subject: [PATCH] moved util classes from src/test to src/main
---
.../util/concurrent/queue/PCBlockingQueue.java | 15 +++++++++++++++
.../concurrent/queue/putstrategy/PutStrategy.java | 15 +++++++++++++++
.../queue/putstrategy/YieldPutStrategy.java | 15 +++++++++++++++
.../queue/takestrategy/SCParkTakeStrategy.java | 15 +++++++++++++++
.../queue/takestrategy/TakeStrategy.java | 15 +++++++++++++++
.../queue/takestrategy/YieldTakeStrategy.java | 15 +++++++++++++++
.../util/test/eval/BucketTimingsReader.java | 2 +-
.../teetime/util/{ => test/eval}/MathUtil.java | 2 +-
.../util/test/eval}/PerformanceResult.java | 4 +---
.../teetime}/util/test/eval/StatisticsUtil.java | 4 +---
.../ChwHomeComparisonMethodcallWithPorts.java | 2 +-
.../ChwWorkComparisonMethodcallWithPorts.java | 2 +-
.../NieWorkComparisonMethodcallWithPorts.java | 2 +-
.../experiment01/ChwHomePerformanceCheck.java | 2 +-
.../experiment01/ChwWorkPerformanceCheck.java | 2 +-
.../AbstractPerformanceCheck.java | 2 +-
.../experiment11/ChwHomePerformanceCheck.java | 2 +-
.../experiment11/ChwWorkPerformanceCheck.java | 2 +-
.../experiment16/ChwHomePerformanceCheck.java | 2 +-
.../experiment16/ChwWorkPerformanceCheck.java | 2 +-
.../java/teetime/util/StopWatchTest.java | 2 +-
.../RunnableConsumerStageTestConfiguration.java | 15 +++++++++++++++
.../java/util/test/MeasurementRepository.java | 2 ++
src/test/java/util/test/PerformanceTest.java | 3 ++-
24 files changed, 124 insertions(+), 20 deletions(-)
rename src/{test/java => main/java/teetime}/util/test/eval/BucketTimingsReader.java (98%)
rename src/main/java/teetime/util/{ => test/eval}/MathUtil.java (97%)
rename src/{test/java/util/test => main/java/teetime/util/test/eval}/PerformanceResult.java (96%)
rename src/{test/java => main/java/teetime}/util/test/eval/StatisticsUtil.java (97%)
diff --git a/src/main/java/teetime/util/concurrent/queue/PCBlockingQueue.java b/src/main/java/teetime/util/concurrent/queue/PCBlockingQueue.java
index 262257c2..702ccc9e 100644
--- a/src/main/java/teetime/util/concurrent/queue/PCBlockingQueue.java
+++ b/src/main/java/teetime/util/concurrent/queue/PCBlockingQueue.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package teetime.util.concurrent.queue;
import java.util.Collection;
diff --git a/src/main/java/teetime/util/concurrent/queue/putstrategy/PutStrategy.java b/src/main/java/teetime/util/concurrent/queue/putstrategy/PutStrategy.java
index df20e0f4..1c958b97 100644
--- a/src/main/java/teetime/util/concurrent/queue/putstrategy/PutStrategy.java
+++ b/src/main/java/teetime/util/concurrent/queue/putstrategy/PutStrategy.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package teetime.util.concurrent.queue.putstrategy;
import java.util.Queue;
diff --git a/src/main/java/teetime/util/concurrent/queue/putstrategy/YieldPutStrategy.java b/src/main/java/teetime/util/concurrent/queue/putstrategy/YieldPutStrategy.java
index a92a5000..bef6afff 100644
--- a/src/main/java/teetime/util/concurrent/queue/putstrategy/YieldPutStrategy.java
+++ b/src/main/java/teetime/util/concurrent/queue/putstrategy/YieldPutStrategy.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package teetime.util.concurrent.queue.putstrategy;
import java.util.Queue;
diff --git a/src/main/java/teetime/util/concurrent/queue/takestrategy/SCParkTakeStrategy.java b/src/main/java/teetime/util/concurrent/queue/takestrategy/SCParkTakeStrategy.java
index 0b010ba9..7f42c039 100644
--- a/src/main/java/teetime/util/concurrent/queue/takestrategy/SCParkTakeStrategy.java
+++ b/src/main/java/teetime/util/concurrent/queue/takestrategy/SCParkTakeStrategy.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package teetime.util.concurrent.queue.takestrategy;
import java.util.Queue;
diff --git a/src/main/java/teetime/util/concurrent/queue/takestrategy/TakeStrategy.java b/src/main/java/teetime/util/concurrent/queue/takestrategy/TakeStrategy.java
index f772f864..4f2a2096 100644
--- a/src/main/java/teetime/util/concurrent/queue/takestrategy/TakeStrategy.java
+++ b/src/main/java/teetime/util/concurrent/queue/takestrategy/TakeStrategy.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package teetime.util.concurrent.queue.takestrategy;
import java.util.Queue;
diff --git a/src/main/java/teetime/util/concurrent/queue/takestrategy/YieldTakeStrategy.java b/src/main/java/teetime/util/concurrent/queue/takestrategy/YieldTakeStrategy.java
index 00377fac..28b19de4 100644
--- a/src/main/java/teetime/util/concurrent/queue/takestrategy/YieldTakeStrategy.java
+++ b/src/main/java/teetime/util/concurrent/queue/takestrategy/YieldTakeStrategy.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package teetime.util.concurrent.queue.takestrategy;
import java.util.Queue;
diff --git a/src/test/java/util/test/eval/BucketTimingsReader.java b/src/main/java/teetime/util/test/eval/BucketTimingsReader.java
similarity index 98%
rename from src/test/java/util/test/eval/BucketTimingsReader.java
rename to src/main/java/teetime/util/test/eval/BucketTimingsReader.java
index d6e50992..df90e66e 100644
--- a/src/test/java/util/test/eval/BucketTimingsReader.java
+++ b/src/main/java/teetime/util/test/eval/BucketTimingsReader.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package util.test.eval;
+package teetime.util.test.eval;
import java.io.BufferedReader;
import java.io.File;
diff --git a/src/main/java/teetime/util/MathUtil.java b/src/main/java/teetime/util/test/eval/MathUtil.java
similarity index 97%
rename from src/main/java/teetime/util/MathUtil.java
rename to src/main/java/teetime/util/test/eval/MathUtil.java
index b665faa7..410a85ea 100644
--- a/src/main/java/teetime/util/MathUtil.java
+++ b/src/main/java/teetime/util/test/eval/MathUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package teetime.util;
+package teetime.util.test.eval;
import java.util.List;
diff --git a/src/test/java/util/test/PerformanceResult.java b/src/main/java/teetime/util/test/eval/PerformanceResult.java
similarity index 96%
rename from src/test/java/util/test/PerformanceResult.java
rename to src/main/java/teetime/util/test/eval/PerformanceResult.java
index 5008db70..5c8d05d8 100644
--- a/src/test/java/util/test/PerformanceResult.java
+++ b/src/main/java/teetime/util/test/eval/PerformanceResult.java
@@ -13,12 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package util.test;
+package teetime.util.test.eval;
import java.util.Map;
-import util.test.eval.StatisticsUtil;
-
public class PerformanceResult {
public long overallDurationInNs;
diff --git a/src/test/java/util/test/eval/StatisticsUtil.java b/src/main/java/teetime/util/test/eval/StatisticsUtil.java
similarity index 97%
rename from src/test/java/util/test/eval/StatisticsUtil.java
rename to src/main/java/teetime/util/test/eval/StatisticsUtil.java
index e4cb08e9..48711f1a 100644
--- a/src/test/java/util/test/eval/StatisticsUtil.java
+++ b/src/main/java/teetime/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.eval;
+package teetime.util.test.eval;
import java.util.ArrayList;
import java.util.Collections;
@@ -24,9 +24,7 @@ import java.util.Map;
import java.util.Map.Entry;
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/examples/ChwHomeComparisonMethodcallWithPorts.java b/src/performancetest/java/teetime/examples/ChwHomeComparisonMethodcallWithPorts.java
index 7efe6aea..3bb9e58c 100644
--- a/src/performancetest/java/teetime/examples/ChwHomeComparisonMethodcallWithPorts.java
+++ b/src/performancetest/java/teetime/examples/ChwHomeComparisonMethodcallWithPorts.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals;
import java.util.Map;
import java.util.Map.Entry;
+import teetime.util.test.eval.PerformanceResult;
import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
import util.test.PerformanceTest;
public class ChwHomeComparisonMethodcallWithPorts extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java b/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java
index 4f7387aa..d65e58f5 100644
--- a/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java
+++ b/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals;
import java.util.Map;
import java.util.Map.Entry;
+import teetime.util.test.eval.PerformanceResult;
import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
import util.test.PerformanceTest;
public class ChwWorkComparisonMethodcallWithPorts extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/NieWorkComparisonMethodcallWithPorts.java b/src/performancetest/java/teetime/examples/NieWorkComparisonMethodcallWithPorts.java
index 6e93bef0..7216f191 100644
--- a/src/performancetest/java/teetime/examples/NieWorkComparisonMethodcallWithPorts.java
+++ b/src/performancetest/java/teetime/examples/NieWorkComparisonMethodcallWithPorts.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals;
import java.util.Map;
import java.util.Map.Entry;
+import teetime.util.test.eval.PerformanceResult;
import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
import util.test.PerformanceTest;
public class NieWorkComparisonMethodcallWithPorts extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/experiment01/ChwHomePerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment01/ChwHomePerformanceCheck.java
index 3ac4a900..9944e2c2 100644
--- a/src/performancetest/java/teetime/examples/experiment01/ChwHomePerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment01/ChwHomePerformanceCheck.java
@@ -17,8 +17,8 @@ package teetime.examples.experiment01;
import static org.junit.Assert.assertEquals;
import teetime.examples.HostName;
+import teetime.util.test.eval.PerformanceResult;
import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
import util.test.PerformanceTest;
class ChwHomePerformanceCheck extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java
index efe7f9e5..6c7a37bb 100644
--- a/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java
@@ -16,7 +16,7 @@
package teetime.examples.experiment01;
import static org.junit.Assert.assertEquals;
-import util.test.PerformanceResult;
+import teetime.util.test.eval.PerformanceResult;
import util.test.PerformanceTest;
import util.test.AbstractProfiledPerformanceAssertion;
diff --git a/src/performancetest/java/teetime/examples/experiment09pipeimpls/AbstractPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment09pipeimpls/AbstractPerformanceCheck.java
index 3a8b3f5d..8f7eb29b 100644
--- a/src/performancetest/java/teetime/examples/experiment09pipeimpls/AbstractPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment09pipeimpls/AbstractPerformanceCheck.java
@@ -16,9 +16,9 @@
package teetime.examples.experiment09pipeimpls;
import teetime.examples.experiment01.MethodCallThoughputTimestampAnalysis1Test;
+import teetime.util.test.eval.PerformanceResult;
import util.test.AbstractProfiledPerformanceAssertion;
import util.test.MeasurementRepository;
-import util.test.PerformanceResult;
import util.test.PerformanceTest;
abstract class AbstractPerformanceCheck extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/experiment11/ChwHomePerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment11/ChwHomePerformanceCheck.java
index 1a566d22..e0a08644 100644
--- a/src/performancetest/java/teetime/examples/experiment11/ChwHomePerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment11/ChwHomePerformanceCheck.java
@@ -17,8 +17,8 @@ package teetime.examples.experiment11;
import static org.junit.Assert.assertEquals;
import teetime.examples.HostName;
+import teetime.util.test.eval.PerformanceResult;
import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
import util.test.PerformanceTest;
class ChwHomePerformanceCheck extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java
index 5bb3d871..f20539b6 100644
--- a/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java
@@ -16,7 +16,7 @@
package teetime.examples.experiment11;
import static org.junit.Assert.assertEquals;
-import util.test.PerformanceResult;
+import teetime.util.test.eval.PerformanceResult;
import util.test.PerformanceTest;
import util.test.AbstractProfiledPerformanceAssertion;
diff --git a/src/performancetest/java/teetime/examples/experiment16/ChwHomePerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment16/ChwHomePerformanceCheck.java
index fe49d8ed..a21b243b 100644
--- a/src/performancetest/java/teetime/examples/experiment16/ChwHomePerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment16/ChwHomePerformanceCheck.java
@@ -17,8 +17,8 @@ package teetime.examples.experiment16;
import static org.junit.Assert.assertEquals;
import teetime.examples.HostName;
+import teetime.util.test.eval.PerformanceResult;
import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
import util.test.PerformanceTest;
class ChwHomePerformanceCheck extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java
index 70486997..c9c07e70 100644
--- a/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java
@@ -16,8 +16,8 @@
package teetime.examples.experiment16;
import static org.junit.Assert.assertEquals;
+import teetime.util.test.eval.PerformanceResult;
import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceResult;
import util.test.PerformanceTest;
class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
diff --git a/src/performancetest/java/teetime/util/StopWatchTest.java b/src/performancetest/java/teetime/util/StopWatchTest.java
index 4f74ebfc..5bbb8a07 100644
--- a/src/performancetest/java/teetime/util/StopWatchTest.java
+++ b/src/performancetest/java/teetime/util/StopWatchTest.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.junit.Test;
-import util.test.eval.StatisticsUtil;
+import teetime.util.test.eval.StatisticsUtil;
public class StopWatchTest {
diff --git a/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java b/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
index 0631e81b..71769300 100644
--- a/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
+++ b/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package teetime.framework;
import java.util.ArrayList;
diff --git a/src/test/java/util/test/MeasurementRepository.java b/src/test/java/util/test/MeasurementRepository.java
index 484f8464..0c01463d 100644
--- a/src/test/java/util/test/MeasurementRepository.java
+++ b/src/test/java/util/test/MeasurementRepository.java
@@ -18,6 +18,8 @@ package util.test;
import java.util.HashMap;
import java.util.Map;
+import teetime.util.test.eval.PerformanceResult;
+
public class MeasurementRepository {
public final Map<String, PerformanceResult> performanceResults = new HashMap<String, PerformanceResult>();
diff --git a/src/test/java/util/test/PerformanceTest.java b/src/test/java/util/test/PerformanceTest.java
index 698152b5..59ff3ba6 100644
--- a/src/test/java/util/test/PerformanceTest.java
+++ b/src/test/java/util/test/PerformanceTest.java
@@ -28,7 +28,8 @@ import org.junit.runner.Description;
import teetime.util.StopWatch;
import teetime.util.TimestampObject;
-import util.test.eval.StatisticsUtil;
+import teetime.util.test.eval.PerformanceResult;
+import teetime.util.test.eval.StatisticsUtil;
public abstract class PerformanceTest {
--
GitLab