Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (5 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/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java (modified) (9 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer.gpx;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.FileNotFoundException;
@@ -12 +12 @@
 import java.util.stream.Collectors;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -28 +28 @@
  * Unit tests of {@link GpxDrawHelper} class.
  */
-public class GpxDrawHelperTest {
+class GpxDrawHelperTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
@@ -44 +44 @@
      */
     @Test
-    public void testTicket12312() throws FileNotFoundException, IOException, SAXException {
+    void testTicket12312() throws FileNotFoundException, IOException, SAXException {
         final Map<String, String> prefs = new HashMap<String, String>() {{
             put("colormode.dynamic-range", "true");
@@ -60 +60 @@
      */
     @Test
-    public void testNone() throws IOException, SAXException {
+    void testNone() throws IOException, SAXException {
         final List<String> colors = calculateColors("nodist/data/2094047.gpx", Collections.emptyMap(), 10);
         assertEquals("[#000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000]", colors.toString());
@@ -72 +72 @@
      */
     @Test
-    public void testVelocity() throws IOException, SAXException {
+    void testVelocity() throws IOException, SAXException {
         final Map<String, String> prefs = Collections.singletonMap("colormode", Integer.toString(ColorMode.VELOCITY.toIndex()));
         final List<String> colors = calculateColors("nodist/data/2094047.gpx", prefs, 10);
@@ -85 +85 @@
      */
     @Test
-    public void testVelocityDynamic() throws IOException, SAXException {
+    void testVelocityDynamic() throws IOException, SAXException {
         final Map<String, String> prefs = new HashMap<String, String>() {{
             put("colormode.dynamic-range", "true");
@@ -101 +101 @@
      */
     @Test
-    public void testDirection() throws IOException, SAXException {
+    void testDirection() throws IOException, SAXException {
         final Map<String, String> prefs = Collections.singletonMap("colormode", Integer.toString(ColorMode.DIRECTION.toIndex()));
         final List<String> colors = calculateColors("nodist/data/2094047.gpx", prefs, 10);
@@ -114 +114 @@
      */
     @Test
-    public void testTime() throws IOException, SAXException {
+    void testTime() throws IOException, SAXException {
         final Map<String, String> prefs = Collections.singletonMap("colormode", Integer.toString(ColorMode.TIME.toIndex()));
         final List<String> colors = calculateColors("nodist/data/2094047.gpx", prefs, 10);