Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/gui/autofilter

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/unit/org/openstreetmap/josm/gui/autofilter/AutoFilterRuleTest.java (modified) (7 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/autofilter/AutoFilterRuleTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.autofilter;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.NoSuchElementException;
@@ -9 +9 @@
 import java.util.stream.IntStream;
 
-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.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -20 +20 @@
  * Unit tests of {@link AutoFilterRule} class.
  */
-public class AutoFilterRuleTest {
+class AutoFilterRuleTest {
 
     /**
      * Setup tests
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().i18n();
@@ -33 +33 @@
      */
     @Test
-    public void testTagValuesForPrimitive() {
+    void testTagValuesForPrimitive() {
         // #17109, support values like 0.5 or 1.5 - level values are multiplied by 2 when parsing, values are divided by 2 for formatting
         final AutoFilterRule level = AutoFilterRule.getDefaultRule("level").orElseThrow(NoSuchElementException::new);
@@ -52 +52 @@
      */
     @Test
-    public void testTagValuesForPrimitiveInclineUnit() {
+    void testTagValuesForPrimitiveInclineUnit() {
         final AutoFilterRule incline = AutoFilterRule.getDefaultRule("incline").orElseThrow(NoSuchElementException::new);
         assertTagValuesForPrimitive(incline, "way incline=up");
@@ -63 +63 @@
      */
     @Test
-    public void testTagValuesForPrimitivesDefaults() {
+    void testTagValuesForPrimitivesDefaults() {
         final AutoFilterRule layer = AutoFilterRule.getDefaultRule("layer").orElseThrow(NoSuchElementException::new);
         assertTagValuesForPrimitive(layer, "way foo=bar");
@@ -85 +85 @@
      */
     @Test
-    public void testValueFormatter() {
+    void testValueFormatter() {
         final AutoFilterRule voltage = AutoFilterRule.getDefaultRule("voltage").orElseThrow(NoSuchElementException::new);
         assertEquals("230V", voltage.formatValue(230));