Changeset 18870 in josm for trunk/test/unit/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayerTest.java

Timestamp:

2023-10-16T15:19:07+02:00 (11 months ago)

Author:

taylor.smock

Message:

See #16567: Update to JUnit 5

This converts most tests to use @Annotations. There are also some performance
improvements as it relates to tests.

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayerTest.java (modified) (4 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -14 +15 @@
 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;
@@ -32 +32 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.testutils.annotations.Main;
+import org.openstreetmap.josm.testutils.annotations.Projection;
 
 /**
  * Test of the base {@link AbstractTileSourceLayer} class
  */
+@Projection
+@Main
 class AbstractTileSourceLayerTest {
-
-    /**
-     * Setup test
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().projection().main();
-
     private static final class TMSTileStubSource extends AbstractTMSTileSource {
         private TMSTileStubSource() {
@@ -203 +196 @@
     @Test
     void testTileSourceLayerPopup() {
-        assertNotNull(testLayer.new TileSourceLayerPopup(100, 100));
+        assertDoesNotThrow(() -> testLayer.new TileSourceLayerPopup(100, 100));
     }
 }