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

trunk/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-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.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -26 +26 @@
  * Unit tests for class {@link SelectByInternalPointAction}.
  */
-public final class SelectByInternalPointActionTest {
+final class SelectByInternalPointActionTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules rules = new JOSMTestRules().preferences().projection().main();
@@ -40 +40 @@
      */
     @Test
-    public void testUtilityClass() throws ReflectiveOperationException {
+    void testUtilityClass() throws ReflectiveOperationException {
         UtilityClassTestUtil.assertUtilityClassWellDefined(SelectByInternalPointAction.class);
     }
@@ -48 +48 @@
      */
     @Test
-    public void testNoDataSet() {
+    void testNoDataSet() {
         assertNull(MainApplication.getLayerManager().getEditDataSet());
         assertEquals(0, SelectByInternalPointAction.getSurroundingObjects(null).size());
@@ -85 +85 @@
      */
     @Test
-    public void testGetSurroundingObjects() {
+    void testGetSurroundingObjects() {
         initDataSet();
         assertEquals(0, SelectByInternalPointAction.getSurroundingObjects(null).size());
@@ -97 +97 @@
      */
     @Test
-    public void testGetSmallestSurroundingObject() {
+    void testGetSmallestSurroundingObject() {
         initDataSet();
         assertNull(SelectByInternalPointAction.getSmallestSurroundingObject(null));
@@ -107 +107 @@
      */
     @Test
-    public void testPerformSelection() {
+    void testPerformSelection() {
         initDataSet();
         DataSet ds = MainApplication.getLayerManager().getEditDataSet();