Changeset 16162 in josm for trunk/test/unit/org

Timestamp:

2020-03-17T20:09:45+01:00 (5 years ago)

Author:

simon04

Message:

see #18948 - Use Utils.readBytesFromStream instead of ByteStreams.toByteArray

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (2 diffs)
• actions/downloadtasks/PluginDownloadTaskTest.java (modified) (2 diffs)

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

@@ -60 +60 @@
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-import com.google.common.io.ByteStreams;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -531 +530 @@
             ) {
                 assertArrayEquals(
-                    ByteStreams.toByteArray(streamA),
-                    ByteStreams.toByteArray(streamB)
+                    Utils.readBytesFromStream(streamA),
+                    Utils.readBytesFromStream(streamB)
                 );
             }

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

@@ -20 +20 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import com.google.common.io.ByteStreams;
+import org.openstreetmap.josm.tools.Utils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -141 +140 @@
             assertArrayEquals(
                 existingPluginContents,
-                ByteStreams.toByteArray(pluginDirPluginStream)
+                Utils.readBytesFromStream(pluginDirPluginStream)
             );
         }