Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (6 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/SystemOfMeasurementTest.java (modified) (6 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.text.DecimalFormat;
@@ -8 +8 @@
 import java.util.Locale;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
@@ -16 +16 @@
  * Unit tests of {@link SystemOfMeasurement} class.
  */
-public class SystemOfMeasurementTest {
+class SystemOfMeasurementTest {
 
     /**
      * Setup test.
      */
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         JOSMFixture.createUnitTestFixture().init();
@@ -30 +30 @@
      */
     @Test
-    public void testGetDistText() {
+    void testGetDistText() {
 
         assertEquals("< 0.01 m", SystemOfMeasurement.METRIC.getDistText(-1));
@@ -71 +71 @@
      */
     @Test
-    public void testGetDistTextLocalized() {
+    void testGetDistTextLocalized() {
         final DecimalFormat format = new DecimalFormat("0.000", DecimalFormatSymbols.getInstance(Locale.GERMAN));
         assertEquals("0,001 m", SystemOfMeasurement.METRIC.getDistText(0.001, format, 1e-6));
@@ -84 +84 @@
      */
     @Test
-    public void testGetAreaText() {
+    void testGetAreaText() {
         assertEquals("< 0.01 m²", SystemOfMeasurement.METRIC.getAreaText(-1));
         assertEquals("< 0.01 m²", SystemOfMeasurement.METRIC.getAreaText(-0.99));