Changeset 16519 in josm for trunk/test

Timestamp:

2020-05-29T20:51:32+02:00 (4 years ago)

Author:

simon04

Message:

MapRendererPerformanceTest: use JOSMTestRules

File:

• trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java (modified) (3 diffs)

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java

@@ -24 +24 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.Timeout;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.PerformanceTestUtils;
@@ -46 +45 @@
 import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -84 +84 @@
 
     /**
-     * Global timeout applied to all test methods.
+     * Setup tests
      */
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public Timeout globalTimeout = Timeout.seconds(15*60);
+    public JOSMTestRules josmTestRules = new JOSMTestRules().main().projection().preferences().timeout(15 * 60 * 1000);
 
     /**