Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelperTest.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/unit/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelperTest.java (modified) (7 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelperTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs.properties;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.awt.GraphicsEnvironment;
@@ -21 +21 @@
 import javax.swing.table.DefaultTableModel;
 
-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.coor.LatLon;
@@ -44 +44 @@
  * Unit tests of {@link TagEditHelper} class.
  */
-public class TagEditHelperTest {
+class TagEditHelperTest {
 
     /**
      * Setup tests
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().territories().projection();
@@ -64 +64 @@
      */
     @Test
-    public void testAcItemComparator() {
+    void testAcItemComparator() {
         List<AutoCompletionItem> list = new ArrayList<>();
         list.add(new AutoCompletionItem("Bing Sat"));
@@ -81 +81 @@
      */
     @Test
-    public void testContainsDataKey() {
+    void testContainsDataKey() {
         assertFalse(newTagEditHelper().containsDataKey("foo"));
         // TODO: complete test
@@ -92 +92 @@
      */
     @Test
-    public void testTicket18764() throws Exception {
+    void testTicket18764() throws Exception {
         testIcon("*[building] ⧉ *[highway] { text: tr(\"Building crossing highway\"); }", ds -> {
             Way way = TestUtils.newWay("", new Node(LatLon.NORTH_POLE), new Node(LatLon.SOUTH_POLE));
@@ -106 +106 @@
      */
     @Test
-    public void testTicket18798() throws Exception {
+    void testTicket18798() throws Exception {
         testIcon("node:righthandtraffic[junction=roundabout] { text: tr(\"Roundabout node\"); }", ds -> {
             Node node = new Node(LatLon.NORTH_POLE);