Changeset 17698 in josm for trunk

Timestamp:

2021-03-30T21:49:33+02:00 (4 years ago)

Author:

simon04

Message:

Simplify RemoteControlTest.testListOfCommands

File:

• trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java (modified) (3 diffs)

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

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
-import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.AfterEach;
@@ -20 +17 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Utils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -69 +67 @@
         assertEquals(connection.getResponseCode(), HttpURLConnection.HTTP_BAD_REQUEST);
         try (InputStream is = connection.getErrorStream()) {
-            // TODO this code should be refactored somewhere in Utils as it is used in several JOSM classes
-            String responseBody;
-            try (BufferedReader in = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
-                responseBody = in.lines().collect(Collectors.joining("\n"));
-            }
+            String responseBody = new String(Utils.readBytesFromStream(is), StandardCharsets.UTF_8);
             assert responseBody.contains(RequestProcessor.getUsageAsHtml());
         }