Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanelTest.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/preferences/imagery/AddWMTSLayerPanelTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanelTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences.imagery;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -13 +14 @@
  * Unit tests of {@link AddWMTSLayerPanel} class.
  */
-public class AddWMTSLayerPanelTest {
+class AddWMTSLayerPanelTest {
 
     /**
      * Setup tests
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
@@ -26 +27 @@
      */
     @Test
-    public void testAddWMTSLayerPanel() {
+    void testAddWMTSLayerPanel() {
         AddWMTSLayerPanel panel = new AddWMTSLayerPanel();
         assertFalse(panel.isImageryValid());
@@ -34 +35 @@
      * Unit test of {@link AddWMTSLayerPanel#getImageryInfo}.
      */
-    @Test(expected = IllegalArgumentException.class)
-    public void testGetImageryInfo() {
-        new AddWMTSLayerPanel().getImageryInfo();
+    @Test
+    void testGetImageryInfo() {
+        assertThrows(IllegalArgumentException.class, () -> new AddWMTSLayerPanel().getImageryInfo());
     }
 }