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

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

Location:

trunk/test/unit/org/openstreetmap/josm/gui/bugreport

Files:

• BugReportSettingsPanelTest.java (modified) (3 diffs)
• DebugTextDisplayTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/bugreport/BugReportSettingsPanelTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.bugreport;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-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.JOSMTestRules;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
@@ -14 +14 @@
  * Tests the {@link BugReportSettingsPanel} class.
  */
-public class BugReportSettingsPanelTest {
+class BugReportSettingsPanelTest {
 
     /**
      * Setup test
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
@@ -27 +27 @@
      */
     @Test
-    public void testBugReportSettingsPanel() {
+    void testBugReportSettingsPanel() {
         assertNotNull(new BugReportSettingsPanel(new BugReport(BugReport.intercept(new Exception()))));
     }

trunk/test/unit/org/openstreetmap/josm/gui/bugreport/DebugTextDisplayTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.bugreport;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-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.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -14 +14 @@
  * Unit test of {@link DebugTextDisplay} class.
  */
-public class DebugTextDisplayTest {
+class DebugTextDisplayTest {
     /**
      * Setup test
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
@@ -26 +26 @@
      */
     @Test
-    public void testGetCodeText() {
+    void testGetCodeText() {
         assertEquals("test", new DebugTextDisplay("test").getCodeText());
     }
@@ -34 +34 @@
      */
     @Test
-    public void testCopyToClipboard() {
+    void testCopyToClipboard() {
         new DebugTextDisplay("copy").copyToClipboard();
         assertEquals(String.format("{{{%ncopy%n}}}"), ClipboardUtils.getClipboardStringContent());