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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.awt.Point;
@@ -12 +12 @@
 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.gui.jmapviewer.Coordinate;
 import org.openstreetmap.gui.jmapviewer.Projected;
@@ -39 +39 @@
  * Test of the base {@link AbstractTileSourceLayer} class
  */
-public class AbstractTileSourceLayerTest {
+class AbstractTileSourceLayerTest {
 
     /**
      * Setup test
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().projection().main();
@@ -148 +148 @@
      * Create test layer
      */
-    @Before
+    @BeforeEach
     public void setUp() {
         MainApplication.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null));
@@ -159 +159 @@
      */
     @Test
-    public void testFilterChanged() {
+    void testFilterChanged() {
         try {
             ImageryFilterSettings filterSettings = new ImageryFilterSettings();
@@ -175 +175 @@
      */
     @Test
-    public void testClearTileCache() {
+    void testClearTileCache() {
         testLayer.loadAllTiles(true);
         assertTrue(testLayer.getTileCache().getTileCount() > 0);
@@ -186 +186 @@
      */
     @Test
-    public void testGetAdjustAction() {
+    void testGetAdjustAction() {
         assertNotNull(testLayer.getAdjustAction());
     }
@@ -194 +194 @@
      */
     @Test
-    public void testGetInfoComponent() {
+    void testGetInfoComponent() {
         assertNotNull(testLayer.getInfoComponent());
     }
@@ -202 +202 @@
      */
     @Test
-    public void testTileSourceLayerPopup() {
+    void testTileSourceLayerPopup() {
         assertNotNull(testLayer.new TileSourceLayerPopup(100, 100));
     }