Changeset 9174 in josm

Timestamp:

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

Author:

simon04

Message:

see #12231 - Update unit tests, fix regression

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/OsmServerReader.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/HttpClient.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -152 +152 @@
                 }
 
+                activeConnection.uncompressAccordingToContentDisposition(uncompressAccordingToContentDisposition);
                 InputStream in = new ProgressInputStream(activeConnection, progressMonitor);
-                if (uncompressAccordingToContentDisposition) {
-                    activeConnection.uncompressAccordingToContentDisposition(true);
-                }
                 return in;
             } catch (OsmTransferException e) {

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -183 +183 @@
             }
             in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
+            Compression compression = Compression.NONE;
             if (uncompress) {
                 final String contentType = getContentType();
                 Main.debug("Uncompressing input stream according to Content-Type header: {0}", contentType);
-                in = Compression.forContentType(contentType).getUncompressedInputStream(in);
-            }
-            if (uncompressAccordingToContentDisposition) {
+                compression = Compression.forContentType(contentType);
+            }
+            if (uncompressAccordingToContentDisposition && Compression.NONE.equals(compression)) {
                 final String contentDisposition = getHeaderField("Content-Disposition");
                 final Matcher matcher = Pattern.compile("filename=\"([^\"]+)\"").matcher(contentDisposition);
                 if (matcher.find()) {
                     Main.debug("Uncompressing input stream according to Content-Disposition header: {0}", contentDisposition);
-                    in = Compression.byExtension(matcher.group(1)).getUncompressedInputStream(in);
+                    compression = Compression.byExtension(matcher.group(1));
                 }
             }
+            in = compression.getUncompressedInputStream(in);
             return in;
         }

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="));
         }