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

Timestamp:

2016-07-25T21:41:53+02:00 (8 years ago)

Author:

Don-vip

Message:

move unit tests from UtilsTest to HttpClientTest (should have been done in r9720)

File:

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

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

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.net.URL;
 import java.util.Arrays;
 import java.util.Collections;
@@ -14 +11 @@
 import org.junit.Assert;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -87 +83 @@
         Assert.assertEquals("127f", Utils.toHexString(new byte[]{0x12, 0x7f}));
         Assert.assertEquals("fedc", Utils.toHexString(new byte[]{(byte) 0xfe, (byte) 0xdc}));
-    }
-
-    /**
-     * Test of {@link Utils#openURLReaderAndDecompress} method with Gzip compression.
-     * @throws IOException if any I/O error occurs
-     */
-    @Test
-    public void testOpenUrlGzip() throws IOException {
-        Main.initApplicationPreferences();
-        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="));
-        }
-    }
-
-    /**
-     * Test of {@link Utils#openURLReaderAndDecompress} method with Bzip compression.
-     * @throws IOException if any I/O error occurs
-     */
-    @Test
-    public void testOpenUrlBzip() throws IOException {
-        Main.initApplicationPreferences();
-        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="));
-        }
     }