Changeset 9771 in josm for trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java

Timestamp:

2016-02-09T18:58:37+01:00 (8 years ago)

Author:

bastiK

Message:

add test output for the Jenkins Measurement Plots Plugin

File:

• trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java (modified) (5 diffs)

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java

@@ -101 +101 @@
         data.generateDataSet();
         CssGenerator css = new CssGenerator(data).addKeyValueRules(TEST_RULE_COUNT);
-        runTest(data, css, "only key=value rules");
+        runTest(data, css, "only key=value rules", false);
     }
 
@@ -112 +112 @@
         data.generateDataSet();
         CssGenerator css = new CssGenerator(data).addHasKeyRules(TEST_RULE_COUNT);
-        runTest(data, css, "only has key rules");
+        runTest(data, css, "only has key rules", false);
     }
 
@@ -123 +123 @@
         data.generateDataSet();
         CssGenerator css = new CssGenerator(data).addKeyRegexpRules(TEST_RULE_COUNT);
-        runTest(data, css, "regular expressions");
+        runTest(data, css, "regular expressions", true);
     }
 
@@ -134 +134 @@
         data.generateDataSet();
         CssGenerator css = new CssGenerator(data).addIsTrueRules(TEST_RULE_COUNT);
-        runTest(data, css, "is true");
+        runTest(data, css, "is true", false);
     }
 
-    private void runTest(KeyValueDataGenerator data, CssGenerator css, String description) {
+    private void runTest(KeyValueDataGenerator data, CssGenerator css, String description, boolean measurementPlotsPlugin) {
         MapCSSStyleSource source = new MapCSSStyleSource(css.getCss());
         PerformanceTestTimer timer = PerformanceTestUtils.startTimer("MapCSSStyleSource#loadStyleSource(...) for " + description);
@@ -143 +143 @@
         timer.done();
 
-        timer = PerformanceTestUtils.startTimer(APPLY_CALLS + "x MapCSSStyleSource#apply(...) for " + description);
+        if (measurementPlotsPlugin) {
+            timer = PerformanceTestUtils.startTimer(description);
+            timer.setMeasurementPlotsPluginOutput(true);
+        } else {
+            timer = PerformanceTestUtils.startTimer(APPLY_CALLS + "x MapCSSStyleSource#apply(...) for " + description);
+        }
         for (int i = 0; i < APPLY_CALLS; i++) {
             MultiCascade mc = new MultiCascade();