Changeset 36013 in osm for applications/editors/josm/plugins/ImportImagePlugin/test

Timestamp:

2022-08-04T15:43:42+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22263: Could not load plug-in 'ImportImagePlugin' due to log4j errors

This moves the plugin logging from log4j to the JOSM Logging class.

It also cleans up various lint issues and moves the unit tests from JUnit 4 to JUnit 5.

Location:

applications/editors/josm/plugins/ImportImagePlugin/test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin

Files:

• GeoTiffReaderTest.java (modified) (4 diffs)
• ImageLayerTest.java (modified) (4 diffs)

applications/editors/josm/plugins/ImportImagePlugin/test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/GeoTiffReaderTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.ImportImagePlugin;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
@@ -15 +15 @@
 
 import org.geotools.coverage.grid.GridCoverage2D;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -25 +25 @@
  * Data downloaded from <a href="ftp://ftp.remotesensing.org/pub/geotiff/samples">remotesensing.org</a>.
  */
-public class GeoTiffReaderTest {
-
-    /**
-     * Setup test.
-     */
-    @Rule
-    public JOSMTestRules rules = new JOSMTestRules().preferences().timeout(20000);
-
+@BasicPreferences
+@Timeout(20)
+class GeoTiffReaderTest {
     @Test
-    public void testReadGeoTiffFiles() throws IOException {
+    void testReadGeoTiffFiles() throws IOException {
         for (Path p : listDataFiles("tif")) {
             File file = p.toFile();
@@ -46 +41 @@
      * Lists all datasets files matching given extension.
      * @param ext file extension to search for
-     * @returns List of all datasets files matching given extension
+     * @return List of all datasets files matching given extension
      * @throws IOException in case of I/O error
      */

applications/editors/josm/plugins/ImportImagePlugin/test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.ImportImagePlugin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.InputStream;
 
-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;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -15 +15 @@
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
 /**
@@ -20 +21 @@
  * Data downloaded from <a href="ftp://ftp.remotesensing.org/pub/geotiff/samples">remotesensing.org</a>.
  */
-public class ImageLayerTest {
+@BasicPreferences
+class ImageLayerTest {
 
     /**
      * Setup test.
      */
-    @Rule
-    public JOSMTestRules rules = new JOSMTestRules().preferences().projection();
+    @RegisterExtension
+    static JOSMTestRules rules = new JOSMTestRules().projection();
 
     /**
@@ -33 +35 @@
      */
     @Test
-    public void testTicket14894() throws Exception {
+    void testTicket14894() throws Exception {
         assertTrue(MainApplication.getLayerManager().getLayers().isEmpty());
         // Step 1: add .osm layer