Changeset 17275 in josm for trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (3 years ago)

Author:

Don-vip

Message:

see #16567 - upgrade almost all tests to JUnit 5, except those depending on WiremockRule

See ​https://github.com/tomakehurst/wiremock/issues/684

File:

• trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java (modified) (5 diffs)

trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.ByteArrayInputStream;
@@ -10 +10 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.concurrent.TimeUnit;
 
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.PerformanceTestUtils;
 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer;
 import org.openstreetmap.josm.data.osm.DataSet;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -29 +27 @@
  * @author Michael Zangl
  */
-public class OsmReaderPerformanceTest {
+@Timeout(value = 15*60, unit = TimeUnit.SECONDS)
+class OsmReaderPerformanceTest {
     private static final int TIMES = 4;
     private static final String DATA_FILE = "nodist/data/neubrandenburg.osm.bz2";
 
     /**
-     * Global timeout applied to all test methods.
-     */
-    @Rule
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public Timeout globalTimeout = Timeout.seconds(15*60);
-
-    /**
      * Prepare the test.
      */
-    @BeforeClass
+    @BeforeAll
     public static void createJOSMFixture() {
         JOSMFixture.createPerformanceTestFixture().init(true);
@@ -53 +45 @@
      */
     @Test
-    public void testCompressed() throws Exception {
+    void testCompressed() throws Exception {
         runTest("compressed (.osm.bz2)", false);
     }
@@ -62 +54 @@
      */
     @Test
-    public void testPlain() throws Exception {
+    void testPlain() throws Exception {
         runTest(".osm-file", true);
     }