Changeset 17211 in josm for trunk/test/functional/org/openstreetmap

Timestamp:

2020-10-15T23:11:36+02:00 (4 years ago)

Author:

simon04

Message:

see #15102 - see #16637 - Fix HttpClientTest

File:

• trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java (modified) (9 diffs)

trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java

@@ -13 +13 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.text.IsEqualIgnoringCase.equalToIgnoringCase;
@@ -23 +24 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.Map;
@@ -30 +34 @@
 import java.util.stream.Collectors;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -339 +342 @@
     @Test
     public void testOpenUrlGzip() throws IOException {
-        final byte[] gpx = Utils.readBytesFromStream(getClass().getClassLoader().getResourceAsStream("tracks/tracks.gpx.gz"));
+        final Path path = Paths.get(TestUtils.getTestDataRoot(), "tracks/tracks.gpx.gz");
+        final byte[] gpx = Files.readAllBytes(path);
         localServer.stubFor(get(urlEqualTo("/trace/1613906/data"))
                 .willReturn(aResponse()
@@ -348 +352 @@
         final URL url = new URL(localServer.url("/trace/1613906/data"));
         try (BufferedReader x = HttpClient.create(url).connect().uncompress(true).getContentReader()) {
-            Assert.assertTrue(x.readLine().startsWith("<?xml version="));
+            assertThat(x.readLine(), startsWith("<?xml version="));
         }
     }
@@ -358 +362 @@
     @Test
     public void testOpenUrlBzip() throws IOException {
-        final byte[] gpx = Utils.readBytesFromStream(getClass().getClassLoader().getResourceAsStream("tracks/tracks.gpx.bz2"));
+        final Path path = Paths.get(TestUtils.getTestDataRoot(), "tracks/tracks.gpx.bz2");
+        final byte[] gpx = Files.readAllBytes(path);
         localServer.stubFor(get(urlEqualTo("/trace/785544/data"))
                 .willReturn(aResponse()
@@ -367 +372 @@
         final URL url = new URL(localServer.url("/trace/785544/data"));
         try (BufferedReader x = HttpClient.create(url).connect().uncompress(true).getContentReader()) {
-            Assert.assertTrue(x.readLine().startsWith("<?xml version="));
+            assertThat(x.readLine(), startsWith("<?xml version="));
         }
     }
@@ -377 +382 @@
     @Test
     public void testOpenUrlBzipAccordingToContentDisposition() throws IOException {
-        final byte[] gpx = Utils.readBytesFromStream(getClass().getClassLoader().getResourceAsStream("tracks/tracks.gpx.bz2"));
+        final Path path = Paths.get(TestUtils.getTestDataRoot(), "tracks/tracks.gpx.bz2");
+        final byte[] gpx = Files.readAllBytes(path);
         localServer.stubFor(get(urlEqualTo("/trace/1350010/data"))
                 .willReturn(aResponse()
@@ -388 +394 @@
         try (BufferedReader x = HttpClient.create(url).connect()
                 .uncompress(true).uncompressAccordingToContentDisposition(true).getContentReader()) {
-            Assert.assertTrue(x.readLine().startsWith("<?xml version="));
+            assertThat(x.readLine(), startsWith("<?xml version="));
         }
     }