refactored performance profiles

src/main/java/util/BucketTimingsReader.java

@@ -11,6 +11,8 @@ 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;

src/main/java/util/PerformanceCheckProfile.java

-package util;
-
-public interface PerformanceCheckProfile {
-
-	String getCorrespondingPerformanceProfile();
-
-	void check();
-
-}

src/main/java/util/MeasurementRepository.java → src/main/java/util/test/MeasurementRepository.java

-package util;
+package util.test;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/util/PerformanceCheckProfileRepository.java → src/main/java/util/test/PerformanceCheckProfileRepository.java

-package util;
+package util.test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -12,7 +12,7 @@ public class PerformanceCheckProfileRepository {
 
 	public static final PerformanceCheckProfileRepository INSTANCE = new PerformanceCheckProfileRepository();
 
-	private final Map<Class<?>, PerformanceCheckProfile> performanceCheckProfiles = new HashMap<Class<?>, PerformanceCheckProfile>();
+	private final Map<Class<?>, ProfiledPerformanceAssertion> performanceCheckProfiles = new HashMap<Class<?>, ProfiledPerformanceAssertion>();
 
 	private String currentProfile;
 
@@ -29,13 +29,13 @@ public class PerformanceCheckProfileRepository {
 		return this.currentProfile;
 	}
 
-	public void register(final Class<?> testClass, final PerformanceCheckProfile profile) {
+	public void register(final Class<?> testClass, final ProfiledPerformanceAssertion profile) {
 		if (profile.getCorrespondingPerformanceProfile().equals(this.currentProfile)) {
 			this.performanceCheckProfiles.put(testClass, profile);
 		}
 	}
 
-	public PerformanceCheckProfile get(final Class<?> clazz) {
+	public ProfiledPerformanceAssertion get(final Class<?> clazz) {
 		return this.performanceCheckProfiles.get(clazz);
 	}
 }

src/main/java/util/PerformanceResult.java → src/main/java/util/test/PerformanceResult.java

-package util;
+package util.test;
 
 import java.util.Map;
 

src/main/java/util/PerformanceTest.java → src/main/java/util/test/PerformanceTest.java

-package util;
+package util.test;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/util/test/ProfiledPerformanceAssertion.java

+package util.test;
+
+public abstract class ProfiledPerformanceAssertion {
+
+	public abstract String getCorrespondingPerformanceProfile();
+
+	public abstract void check();
+
+	protected String buildTestMethodIdentifier(final Class<? extends PerformanceTest> testClass, final String methodName) {
+		return testClass.getName() + "(" + methodName + ")";
+	}
+}

src/main/java/util/StatisticsUtil.java → src/main/java/util/test/StatisticsUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ***************************************************************************/
-package util;
+package util.test;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/performancetest/java/kieker/analysis/examples/throughput/ThroughputTimestampAnalysisTest.java

@@ -23,8 +23,8 @@ import org.junit.Test;
 
 import teetime.util.StopWatch;
 import teetime.util.TimestampObject;
-import util.PerformanceTest;
-import util.StatisticsUtil;
+import util.test.PerformanceTest;
+import util.test.StatisticsUtil;
 
 import kieker.analysis.examples.ThroughputTimestampAnalysis;
 import kieker.analysis.exception.AnalysisConfigurationException;

src/performancetest/java/teetime/examples/ChwHomeComparisonMethodcallWithPorts.java

@@ -5,11 +5,11 @@ import static org.junit.Assert.assertEquals;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import util.PerformanceCheckProfile;
-import util.PerformanceResult;
-import util.PerformanceTest;
+import util.test.PerformanceResult;
+import util.test.PerformanceTest;
+import util.test.ProfiledPerformanceAssertion;
 
-public class ChwHomeComparisonMethodcallWithPorts implements PerformanceCheckProfile {
+public class ChwHomeComparisonMethodcallWithPorts extends ProfiledPerformanceAssertion {
 
 	@Override
 	public String getCorrespondingPerformanceProfile() {

src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java

@@ -5,11 +5,11 @@ import static org.junit.Assert.assertEquals;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import util.PerformanceCheckProfile;
-import util.PerformanceResult;
-import util.PerformanceTest;
+import util.test.PerformanceResult;
+import util.test.PerformanceTest;
+import util.test.ProfiledPerformanceAssertion;
 
-public class ChwWorkComparisonMethodcallWithPorts implements PerformanceCheckProfile {
+public class ChwWorkComparisonMethodcallWithPorts extends ProfiledPerformanceAssertion {
 
 	@Override
 	public String getCorrespondingPerformanceProfile() {

src/performancetest/java/teetime/examples/ComparisonMethodcallWithPorts.java

@@ -15,8 +15,8 @@ import teetime.examples.experiment15.MethodCallThoughputTimestampAnalysis15Test;
 import teetime.examples.experiment16.MethodCallThoughputTimestampAnalysis16Test;
 import teetime.examples.experiment17.MethodCallThoughputTimestampAnalysis17Test;
 import teetime.examples.experiment19.MethodCallThoughputTimestampAnalysis19Test;
-import util.PerformanceCheckProfile;
-import util.PerformanceCheckProfileRepository;
+import util.test.PerformanceCheckProfileRepository;
+import util.test.ProfiledPerformanceAssertion;
 
 @RunWith(Suite.class)
 @SuiteClasses({
@@ -42,7 +42,7 @@ public class ComparisonMethodcallWithPorts {
 
 	@AfterClass
 	public static void compareResults() {
-		PerformanceCheckProfile pcp = PerformanceCheckProfileRepository.INSTANCE.get(ComparisonMethodcallWithPorts.class);
+		ProfiledPerformanceAssertion pcp = PerformanceCheckProfileRepository.INSTANCE.get(ComparisonMethodcallWithPorts.class);
 		pcp.check();
 	}
 

src/performancetest/java/teetime/examples/NieWorkComparisonMethodcallWithPorts.java

@@ -5,11 +5,11 @@ import static org.junit.Assert.assertEquals;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import util.PerformanceCheckProfile;
-import util.PerformanceResult;
-import util.PerformanceTest;
+import util.test.PerformanceResult;
+import util.test.PerformanceTest;
+import util.test.ProfiledPerformanceAssertion;
 
-public class NieWorkComparisonMethodcallWithPorts implements PerformanceCheckProfile {
+public class NieWorkComparisonMethodcallWithPorts extends ProfiledPerformanceAssertion {
 
 	@Override
 	public String getCorrespondingPerformanceProfile() {

src/performancetest/java/teetime/examples/experiment01/ChwHomePerformanceCheck.java

 package teetime.examples.experiment01;
 
 import static org.junit.Assert.assertEquals;
-import util.PerformanceCheckProfile;
-import util.PerformanceResult;
-import util.PerformanceTest;
+import util.test.PerformanceResult;
+import util.test.PerformanceTest;
+import util.test.ProfiledPerformanceAssertion;
 
-public class ChwHomePerformanceCheck implements PerformanceCheckProfile {
+public class ChwHomePerformanceCheck extends ProfiledPerformanceAssertion {
 
 	@Override
 	public String getCorrespondingPerformanceProfile() {

src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java

 package teetime.examples.experiment01;
 
 import static org.junit.Assert.assertEquals;
-import util.PerformanceCheckProfile;
-import util.PerformanceResult;
-import util.PerformanceTest;
+import util.test.PerformanceResult;
+import util.test.PerformanceTest;
+import util.test.ProfiledPerformanceAssertion;
 
-public class ChwWorkPerformanceCheck implements PerformanceCheckProfile {
+public class ChwWorkPerformanceCheck extends ProfiledPerformanceAssertion {
 
 	@Override
 	public String getCorrespondingPerformanceProfile() {

src/performancetest/java/teetime/examples/experiment01/MethodCallThoughputTimestampAnalysis1Test.java

@@ -21,9 +21,9 @@ import org.junit.Test;
 
 import teetime.util.ConstructorClosure;
 import teetime.util.TimestampObject;
-import util.PerformanceCheckProfile;
-import util.PerformanceCheckProfileRepository;
-import util.PerformanceTest;
+import util.test.PerformanceCheckProfileRepository;
+import util.test.PerformanceTest;
+import util.test.ProfiledPerformanceAssertion;
 
 /**
  * @author Christian Wulf
@@ -40,7 +40,7 @@ public class MethodCallThoughputTimestampAnalysis1Test extends PerformanceTest {
 
 	@AfterClass
 	public static void afterClass() {
-		PerformanceCheckProfile performanceCheckProfile = PerformanceCheckProfileRepository.INSTANCE.get(MethodCallThoughputTimestampAnalysis1Test.class);
+		ProfiledPerformanceAssertion performanceCheckProfile = PerformanceCheckProfileRepository.INSTANCE.get(MethodCallThoughputTimestampAnalysis1Test.class);
 		performanceCheckProfile.check();
 	};
 

src/performancetest/java/teetime/examples/experiment09/MethodCallThoughputTimestampAnalysis9Test.java

@@ -19,7 +19,7 @@ import org.junit.Test;
 
 import teetime.util.ConstructorClosure;
 import teetime.util.TimestampObject;
-import util.PerformanceTest;
+import util.test.PerformanceTest;
 
 /**
  * @author Christian Wulf

src/performancetest/java/teetime/examples/experiment10/ChwHomePerformanceCheck.java

 package teetime.examples.experiment10;
 
 import static org.junit.Assert.assertEquals;
-import util.PerformanceCheckProfile;
-import util.PerformanceResult;
-import util.PerformanceTest;
+import util.test.PerformanceResult;
+import util.test.PerformanceTest;
+import util.test.ProfiledPerformanceAssertion;
 
-public class ChwHomePerformanceCheck implements PerformanceCheckProfile {
+public class ChwHomePerformanceCheck extends ProfiledPerformanceAssertion {
 
 	@Override
 	public String getCorrespondingPerformanceProfile() {

src/performancetest/java/teetime/examples/experiment10/ChwWorkPerformanceCheck.java

 package teetime.examples.experiment10;
 
 import static org.junit.Assert.assertEquals;
-import util.PerformanceCheckProfile;
-import util.PerformanceResult;
-import util.PerformanceTest;
+import util.test.PerformanceResult;
+import util.test.PerformanceTest;
+import util.test.ProfiledPerformanceAssertion;
 
-public class ChwWorkPerformanceCheck implements PerformanceCheckProfile {
+public class ChwWorkPerformanceCheck extends ProfiledPerformanceAssertion {
 
 	@Override
 	public String getCorrespondingPerformanceProfile() {

src/performancetest/java/teetime/examples/experiment10/MethodCallThoughputTimestampAnalysis10Test.java

@@ -21,8 +21,8 @@ import org.junit.Test;
 
 import teetime.util.ConstructorClosure;
 import teetime.util.TimestampObject;
-import util.PerformanceCheckProfile;
-import util.PerformanceTest;
+import util.test.PerformanceTest;
+import util.test.ProfiledPerformanceAssertion;
 
 /**
  * @author Christian Wulf
@@ -39,7 +39,7 @@ public class MethodCallThoughputTimestampAnalysis10Test extends PerformanceTest
 
 	@AfterClass
 	public static void afterClass() {
-		PerformanceCheckProfile performanceCheckProfile = PERFORMANCE_CHECK_PROFILE_REPOSITORY.get(MethodCallThoughputTimestampAnalysis10Test.class);
+		ProfiledPerformanceAssertion performanceCheckProfile = PERFORMANCE_CHECK_PROFILE_REPOSITORY.get(MethodCallThoughputTimestampAnalysis10Test.class);
 		performanceCheckProfile.check();
 	};