Changeset 9458 in josm for trunk/test/performance/org/openstreetmap/josm/data/osm

Timestamp:

2016-01-15T02:11:39+01:00 (9 years ago)

Author:

Don-vip

Message:

timeouts for unit/performance tests

Location:

trunk/test/performance/org/openstreetmap/josm/data/osm

Files:

• KeyValuePerformanceTest.java (modified) (2 diffs)
• visitor/paint/StyledMapRendererPerformanceTest.java (modified) (2 diffs)

trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java

@@ -11 +11 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.Timeout;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.PerformanceTestUtils;
@@ -31 +33 @@
 
     /**
+     * Global timeout applied to all test methods.
+     */
+    @Rule
+    public Timeout globalTimeout = Timeout.seconds(15*60);
+
+    /**
      * Prepare the test.
      */

trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererPerformanceTest.java

@@ -9 +9 @@
 
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.Timeout;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.Bounds;
@@ -30 +32 @@
     private static DataSet dsMultipolygon;
     private static DataSet dsCity;
+
+    /**
+     * Global timeout applied to all test methods.
+     */
+    @Rule
+    public Timeout globalTimeout = Timeout.seconds(15*60);
 
     @BeforeClass