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

trunk/test/unit/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintableTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationListener;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -19 +19 @@
  * @author Michael Zangl
  */
-public class AbstractMapViewPaintableTest {
+class AbstractMapViewPaintableTest {
     /**
      * No special test rules
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
@@ -32 +32 @@
      * Create test layer
      */
-    @Before
+    @BeforeEach
     public void setUp() {
         testLayer = new LayerManagerTest.TestLayer();
@@ -41 +41 @@
      */
     @Test
-    public void testInvalidate() {
+    void testInvalidate() {
         AtomicBoolean fired = new AtomicBoolean();
         PaintableInvalidationListener listener = l -> fired.set(true);