Stabilize header test across SDKs

Author: jhy

src/test/java/org/jsoup/helper/HttpConnectionTest.java

@@ -18,6 +18,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -150,6 +151,24 @@ public void caseInsensitiveHeaders(Locale locale) {
         assertNull(headers.get("Accept"));
     }
 
+    @Test void responseHeadersPreserveInsertOrder() throws IOException {
+        // linkedhashmap preserves the response header order
+        Connection.Response res = new HttpConnection.Response();
+        res.addHeader("5", "5");
+        res.addHeader("4", "4");
+        res.addHeader("3", "3");
+        res.addHeader("2", "2");
+        res.addHeader("1", "1");
+
+        String[] expected = {"5", "4", "3", "2", "1"};
+        int i = 0;
+        for (String key : res.headers().keySet()) {
+            assertEquals(expected[i++], key);
+        }
+
+        assertInstanceOf(LinkedHashMap.class, res.headers());
+    }
+
     @Test public void ignoresEmptySetCookies() {
         // prep http response header map
         Map<String, List<String>> headers = new HashMap<>();

src/test/java/org/jsoup/integration/ConnectTest.java

@@ -10,7 +10,6 @@
 import org.jsoup.helper.W3CDom;
 import org.jsoup.integration.servlets.*;
 import org.jsoup.internal.SharedConstants;
-import org.jsoup.internal.StringUtil;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.nodes.FormElement;
@@ -22,7 +21,6 @@
 import org.jsoup.parser.XmlTreeBuilder;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -41,11 +39,8 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collection;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
@@ -769,21 +764,6 @@ public void combinesSameHeadersWithComma() throws IOException {
         assertEquals("no-store", header.get(1));
     }
 
-    @Test void responseHeadersPreserveInsertOrder() throws IOException {
-        // linkedhashmap preserves the response header order
-        Connection con = Jsoup.connect(echoUrl);
-        con.get();
-        Connection.Response res = con.response();
-        Map<String, String> headers = res.headers();
-        assertInstanceOf(LinkedHashMap.class, headers);
-        assertEquals(5, headers.size());
-        String[] expected = {"Date", "Content-Type", "Cache-Control", "Content-Length", "Server"};
-        int i = 0;
-        for (String key : headers.keySet()) {
-            assertEquals(expected[i++], key);
-        }
-    }
-
     @Test
     public void sendHeadRequest() throws IOException {
         String url = FileServlet.urlTo("/htmltests/xml-test.xml");