Changeset 19056 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2024-04-24T20:02:57+02:00 (8 months ago)

Author:

taylor.smock

Message:

Fix last failing test in Java 21

• Generate Java 21 image files (probably from r19043: Drop COMPAT locale provider).
• Replace most deprecated function calls and classes in tests with non-deprecated functions.

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (1 diff)
• actions/SessionSaveActionTest.java (modified) (1 diff)
• actions/downloadtasks/PluginDownloadTaskTest.java (modified) (2 diffs)
• gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (1 diff)
• io/remotecontrol/RemoteControlTest.java (modified) (2 diffs)
• io/session/SessionWriterTest.java (modified) (4 diffs)
• testutils/annotations/AnnotationUtils.java (modified) (1 diff)
• testutils/annotations/BasicWiremock.java (modified) (7 diffs)
• tools/UtilsTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -592 +592 @@
             ) {
                 assertArrayEquals(
-                    Utils.readBytesFromStream(streamA),
-                    Utils.readBytesFromStream(streamB)
+                    streamA.readAllBytes(),
+                    streamB.readAllBytes()
                 );
             }

trunk/test/unit/org/openstreetmap/josm/actions/SessionSaveActionTest.java

@@ -55 +55 @@
 
         JOptionPaneSimpleMocker mocker = new JOptionPaneSimpleMocker(Collections.singletonMap(overrideStr, 0));
-        SessionSaveAction.setCurrentSession(jos, false, Arrays.asList(gpx, osm)); //gpx and OSM layer
+        SessionSaveAction.setCurrentSession(jos, Arrays.asList(gpx, osm)); //gpx and OSM layer
         MainApplication.getLayerManager().addLayer(gpx); //only gpx layer
         saveAction.actionPerformed(null); //Complain that OSM layer was removed

trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PluginDownloadTaskTest.java

@@ -19 +19 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.testutils.annotations.AssumeRevision;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -129 +128 @@
             assertArrayEquals(
                 existingPluginContents,
-                Utils.readBytesFromStream(pluginDirPluginStream)
+                pluginDirPluginStream.readAllBytes()
             );
         }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -170 +170 @@
                 }
                 try {
-                    byte[] data = Utils.readBytesFromStream(response.getContent());
+                    byte[] data = response.getContent().readAllBytes();
                     if (response.getResponseCode() < 300) {
                         workingURLs.put(url, data);

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java

@@ -17 +17 @@
 import org.openstreetmap.josm.testutils.annotations.AssertionsInEDT;
 import org.openstreetmap.josm.testutils.annotations.HTTPS;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -60 +59 @@
         assertEquals(HttpURLConnection.HTTP_BAD_REQUEST, connection.getResponseCode());
         try (InputStream is = connection.getErrorStream()) {
-            String responseBody = new String(Utils.readBytesFromStream(is), StandardCharsets.UTF_8);
+            String responseBody = new String(is.readAllBytes(), StandardCharsets.UTF_8);
             assert responseBody.contains(RequestProcessor.getUsageAsHtml());
         }

trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java

@@ -3 +3 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -134 +134 @@
                 return Collections.list(zipFile.entries()).stream().collect(Collectors.toMap(ZipEntry::getName, e -> {
                     try {
-                        return Utils.readBytesFromStream(zipFile.getInputStream(e));
+                        return zipFile.getInputStream(e).readAllBytes();
                     } catch (IOException ex) {
-                        fail(ex);
+                        throw new UncheckedIOException(ex);
                     }
-                    return null;
                 }));
             }
@@ -275 +274 @@
 
         Path path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/gpx_markers_combined.jos");
-        String expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
+        String expected = Files.readString(path).replace("\r", "");
         String actual = new String(bytes.get("session.jos"), StandardCharsets.UTF_8).replace("\r", "");
         assertEquals(expected, actual);
 
         path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/data_export.gpx");
-        expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
+        expected = Files.readString(path).replace("\r", "");
         actual = new String(bytes.get("layers/01/data.gpx"), StandardCharsets.UTF_8).replace("\r", "");
         assertEquals(expected, actual);
@@ -291 +290 @@
 
         path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/gpx_markers.jos");
-        expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
+        expected = Files.readString(path).replace("\r", "");
         actual = new String(bytes.get("session.jos"), StandardCharsets.UTF_8).replace("\r", "");
         assertEquals(expected, actual);
 
         path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/data_export.gpx");
-        expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
+        expected = Files.readString(path).replace("\r", "");
         actual = new String(bytes.get("layers/01/data.gpx"), StandardCharsets.UTF_8).replace("\r", "");
         assertEquals(expected, actual);
 
         path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/markers.gpx");
-        expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
+        expected = Files.readString(path).replace("\r", "");
         actual = new String(bytes.get("layers/02/data.gpx"), StandardCharsets.UTF_8).replace("\r", "");
         assertEquals(expected, actual);

trunk/test/unit/org/openstreetmap/josm/testutils/annotations/AnnotationUtils.java

@@ -48 +48 @@
     public static void resetStaticClass(Class<?> clazz) throws ReflectiveOperationException {
         for (Field field : clazz.getDeclaredFields()) {
-            if (!field.isAccessible()) {
-                field.setAccessible(true);
-            }
             // Don't reset fields that are not static
             if ((field.getModifiers() & Modifier.STATIC) == 0) {
                 continue;
+            }
+            if (!field.canAccess(null)) {
+                field.setAccessible(true);
             }
             final boolean isFinal = (field.getModifiers() & Modifier.FINAL) != 0;

trunk/test/unit/org/openstreetmap/josm/testutils/annotations/BasicWiremock.java

@@ -41 +41 @@
 
 import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformerV2;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 
@@ -65 +66 @@
 
     /**
-     * {@link ResponseTransformer} for use with the WireMock server.
+     * {@link ResponseTransformerV2} for use with the WireMock server.
      * Current constructors supported:
      * <ul>
@@ -73 +74 @@
      * @return The transformers to instantiate
      */
-    Class<? extends ResponseTransformer>[] responseTransformers() default {};
+    Class<? extends ResponseTransformerV2>[] responseTransformers() default {};
 
     /**
@@ -92 +93 @@
                     .orElseThrow(() -> new IllegalArgumentException("There must be a @BasicWiremock annotation"));
             return context.getStore(namespace).getOrComputeIfAbsent(WireMockServer.class, clazz -> {
-                final List<ResponseTransformer> transformers = new ArrayList<>(annotation.responseTransformers().length);
-                for (Class<? extends ResponseTransformer> responseTransformer : annotation.responseTransformers()) {
+                final List<ResponseTransformerV2> transformers = new ArrayList<>(annotation.responseTransformers().length);
+                for (Class<? extends ResponseTransformerV2> responseTransformer : annotation.responseTransformers()) {
                     for (Pair<Class<?>[], Object[]> parameterMapping : Arrays.asList(
                             new Pair<>(new Class<?>[] {ExtensionContext.class }, new Object[] {context }),
                             new Pair<>(new Class<?>[0], new Object[0]))) {
                         try {
-                            Constructor<? extends ResponseTransformer> constructor = responseTransformer
+                            Constructor<? extends ResponseTransformerV2> constructor = responseTransformer
                                     .getConstructor(parameterMapping.a);
                             transformers.add(constructor.newInstance(parameterMapping.b));
@@ -109 +110 @@
                 return new WireMockServer(
                     options().usingFilesUnderDirectory(Utils.isStripEmpty(annotation.value()) ? TestUtils.getTestDataRoot() :
-                            annotation.value()).extensions(transformers.toArray(new ResponseTransformer[0])).dynamicPort());
+                            annotation.value()).extensions(transformers.toArray(new ResponseTransformerV2[0])).dynamicPort());
             }, WireMockServer.class);
         }
@@ -167 +168 @@
                 for (Field field : wireMockFields) {
                     if (WireMockServer.class.isAssignableFrom(field.getType())) {
-                        final boolean isAccessible = field.isAccessible();
+                        final boolean isAccessible = field.canAccess(context.getRequiredTestInstance());
                         field.setAccessible(true);
                         try {
@@ -214 +215 @@
             }
             super.beforeAll(context);
-            Config.getPref().put("osm-server.url", getWiremock(context).baseUrl());
+            Config.getPref().put("osm-server.url", getWiremock(context).baseUrl() + "/api");
+            getWiremock(context).stubFor(WireMock.get("/api/0.6/capabilities")
+                    .willReturn(WireMock.aResponse().withBodyFile("api/0.6/capabilities")));
+            getWiremock(context).stubFor(WireMock.get("/api/capabilities")
+                    .willReturn(WireMock.aResponse().withBodyFile("api/capabilities")));
             OsmApi.getOsmApi().initialize(NullProgressMonitor.INSTANCE);
         }

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -11 +11 @@
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22 +23 @@
 import java.util.regex.Pattern;
 
+import org.junit.jupiter.api.Test;
+
 import net.trajano.commons.testing.UtilityClassTestUtil;
-import org.junit.jupiter.api.Test;
 
 /**
@@ -354 +356 @@
      * Tests if readBytesFromStream handles null streams (might happen when there is no data on error stream)
      * @throws IOException in case of I/O error
-     */
-    @Test
+     * @deprecated {@link Utils#readBytesFromStream(InputStream)} is deprecated since the JVM has the same functionality.
+     */
+    @Test
+    @Deprecated
     void testNullStreamForReadBytesFromStream() throws IOException {
         assertEquals(0, Utils.readBytesFromStream(null).length, "Empty on null stream");