Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (4 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/io/remotecontrol/handler/AddNodeHandlerTest.java (modified) (7 diffs)

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java

@@ -6 +6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-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.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -19 +19 @@
  * Unit tests of {@link AddNodeHandler} class.
  */
-public class AddNodeHandlerTest {
+class AddNodeHandlerTest {
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().main().assertionsInEDT().projection();
@@ -38 +38 @@
      */
     @Test
-    public void testBadRequestNoLayer() {
+    void testBadRequestNoLayer() {
         Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("https://localhost?lat=0&lon=0").handle());
         assertEquals("There is no layer opened to add node", e.getMessage());
@@ -47 +47 @@
      */
     @Test
-    public void testBadRequestNoParam() {
+    void testBadRequestNoParam() {
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         MainApplication.getLayerManager().addLayer(layer);
@@ -58 +58 @@
      */
     @Test
-    public void testBadRequestInvalidUrl() {
+    void testBadRequestInvalidUrl() {
         Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("invalid_url").handle());
         assertEquals("The following keys are mandatory, but have not been provided: lat, lon", e.getMessage());
@@ -67 +67 @@
      */
     @Test
-    public void testBadRequestIncompleteUrl() {
+    void testBadRequestIncompleteUrl() {
         Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler("https://localhost").handle());
         assertEquals("The following keys are mandatory, but have not been provided: lat, lon", e.getMessage());
@@ -76 +76 @@
      */
     @Test
-    public void testNominalRequest() {
+    void testNominalRequest() {
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         MainApplication.getLayerManager().addLayer(layer);