Changeset 9174 in josm for trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

Timestamp:

2015-12-27T00:07:00+01:00 (9 years ago)

Author:

simon04

Message:

see #12231 - Update unit tests, fix regression

File:

• trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (2 diffs)

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

@@ -86 +86 @@
     public void testOpenUrlGzip() throws IOException {
         Main.initApplicationPreferences();
-        try (BufferedReader x = Utils.openURLReaderAndDecompress(new URL("https://www.openstreetmap.org/trace/1613906/data"), true)) {
+        final URL url = new URL("https://www.openstreetmap.org/trace/1613906/data");
+        try (BufferedReader x = HttpClient.create(url).connect().uncompress(true).getContentReader()) {
             Assert.assertTrue(x.readLine().startsWith("<?xml version="));
         }
@@ -98 +99 @@
     public void testOpenUrlBzip() throws IOException {
         Main.initApplicationPreferences();
-        try (BufferedReader x = Utils.openURLReaderAndDecompress(new URL("https://www.openstreetmap.org/trace/785544/data"), true)) {
+        final URL url = new URL("https://www.openstreetmap.org/trace/785544/data");
+        try (BufferedReader x = HttpClient.create(url).connect().uncompress(true).getContentReader()) {
+            Assert.assertTrue(x.readLine().startsWith("<?xml version="));
+        }
+    }
+
+    /**
+     * Test of {@link Utils#openURLReaderAndDecompress} method with Bzip compression.
+     * @throws IOException if any I/O error occurs
+     */
+    @Test
+    public void testTicket9660() throws IOException {
+        Main.initApplicationPreferences();
+        final URL url = new URL("http://www.openstreetmap.org/trace/1350010/data");
+        try (BufferedReader x = HttpClient.create(url).connect()
+                .uncompress(true).uncompressAccordingToContentDisposition(true).getContentReader()) {
             Assert.assertTrue(x.readLine().startsWith("<?xml version="));
         }