Index: trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java	(revision 10640)
+++ trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java	(revision 10641)
@@ -7,4 +7,5 @@
 import static org.junit.Assert.assertThat;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -17,8 +18,10 @@
 import javax.json.spi.JsonProvider;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Version;
@@ -38,10 +41,10 @@
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         progress = TestUtils.newTestProgressMonitor();
     }
 
     @Test
-    public void testConstructorGetterSetter() throws Exception {
+    public void testConstructorGetterSetter() throws IOException {
         final HttpClient client = HttpClient.create(new URL("https://httpbin.org/"));
         assertThat(client.getURL(), is(new URL("https://httpbin.org/")));
@@ -60,5 +63,5 @@
 
     @Test
-    public void testGet() throws Exception {
+    public void testGet() throws IOException {
         final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/get?foo=bar")).connect(progress);
         assertThat(response.getRequestMethod(), is("GET"));
@@ -79,5 +82,5 @@
 
     @Test
-    public void testUserAgent() throws Exception {
+    public void testUserAgent() throws IOException {
         try (final InputStream in = HttpClient.create(new URL("https://httpbin.org/user-agent")).connect(progress).getContent();
              final JsonReader json = JsonProvider.provider().createReader(in)) {
@@ -87,5 +90,5 @@
 
     @Test
-    public void testFetchUtf8Content() throws Exception {
+    public void testFetchUtf8Content() throws IOException {
         final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/encoding/utf8")).connect(progress);
         assertThat(response.getResponseCode(), is(200));
@@ -96,5 +99,5 @@
 
     @Test
-    public void testPost() throws Exception {
+    public void testPost() throws IOException {
         final String text = "Hello World!\nGeetings from JOSM, the Java OpenStreetMap Editor";
         final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/post"), "POST")
@@ -111,5 +114,5 @@
 
     @Test
-    public void testPostZero() throws Exception {
+    public void testPostZero() throws IOException {
         final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/post"), "POST")
                 .setHeader("Content-Type", "text/plain")
@@ -125,5 +128,5 @@
 
     @Test
-    public void testRelativeRedirects() throws Exception {
+    public void testRelativeRedirects() throws IOException {
         final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/relative-redirect/5")).connect(progress);
         assertThat(response.getResponseCode(), is(200));
@@ -132,5 +135,5 @@
 
     @Test
-    public void testAbsoluteRedirects() throws Exception {
+    public void testAbsoluteRedirects() throws IOException {
         final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/absolute-redirect/5")).connect(progress);
         assertThat(response.getResponseCode(), is(200));
@@ -139,10 +142,10 @@
 
     @Test(expected = IOException.class)
-    public void testTooMuchRedirects() throws Exception {
+    public void testTooMuchRedirects() throws IOException {
         HttpClient.create(new URL("https://httpbin.org/redirect/5")).setMaxRedirects(4).connect(progress);
     }
 
     @Test
-    public void test418() throws Exception {
+    public void test418() throws IOException {
         // https://tools.ietf.org/html/rfc2324
         final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/status/418")).connect(progress);
@@ -154,5 +157,5 @@
 
     @Test
-    public void testRequestInTime() throws Exception {
+    public void testRequestInTime() throws IOException {
         final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/delay/3")).setReadTimeout(3500).connect(progress);
         assertThat(response.getResponseCode(), is(200));
@@ -160,6 +163,46 @@
 
     @Test(expected = IOException.class)
-    public void testTakesTooLong() throws Exception {
+    public void testTakesTooLong() throws IOException {
         HttpClient.create(new URL("https://httpbin.org/delay/3")).setReadTimeout(2500).connect(progress);
     }
+
+    /**
+     * Test of {@link HttpClient.Response#uncompress} 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 HttpClient.Response#uncompress} 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 HttpClient.Response#uncompress} 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="));
+        }
+    }
 }
Index: trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java	(revision 10640)
+++ trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java	(revision 10641)
@@ -4,7 +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,5 +11,4 @@
 import org.junit.Assert;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -87,44 +83,4 @@
         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="));
-        }
     }