android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java - Issue 2705963002: (Android) Removing deprecated org.apache.http.* classes

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java

Issue 2705963002: (Android) Removing deprecated org.apache.http.* classes (Closed)

Patch Set: 2nd version - cleanups/fixes Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java ('k') | net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java

index 3c9c995b32c12133fa6f983f8909f8e7f639dae6..9f402a79dbde720be5cda7a0eaec48e38103e264 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java

@@ -7,9 +7,6 @@ package org.chromium.android_webview.test;

import android.support.test.filters.SmallTest;

import android.util.Pair;

-import org.apache.http.Header;

-import org.apache.http.HttpRequest;

import org.chromium.android_webview.AwContents;

import org.chromium.android_webview.AwSettings;

import org.chromium.android_webview.test.util.CommonResources;

@@ -23,7 +20,6 @@ import org.chromium.net.test.util.TestWebServer;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

-import java.util.Locale;

import java.util.Map;

import java.util.concurrent.TimeUnit;

@@ -115,21 +111,20 @@ public class LoadUrlTest extends AwTestBase {

return result;

}

- private void validateRequestHeaders(String[] refNamesAndValues, HttpRequest request) {

+ private void validateRequestHeaders(String[] refNamesAndValues, List<String> request) {

+ List<String> matchingHeaders;

for (int i = 0; i < refNamesAndValues.length; i += 2) {

- Header[] matchingHeaders = request.getHeaders(refNamesAndValues[i]);

- assertEquals(1, matchingHeaders.length);

- Header header = matchingHeaders[0];

- assertEquals(refNamesAndValues[i].toLowerCase(Locale.ENGLISH), header.getName());

- assertEquals(refNamesAndValues[i + 1], header.getValue());

+ matchingHeaders = TestWebServer.getMatchingHeadersValues(request, refNamesAndValues[i]);

+ assertEquals(1, matchingHeaders.size());

+ assertEquals(refNamesAndValues[i + 1], matchingHeaders.get(0));

}

- private void validateNoRequestHeaders(String[] refNamesAndValues, HttpRequest request) {

+ private void validateNoRequestHeaders(String[] refNamesAndValues, List<String> request) {

+ List<String> matchingHeaders;

for (int i = 0; i < refNamesAndValues.length; i += 2) {

- Header[] matchingHeaders = request.getHeaders(refNamesAndValues[i]);

- assertEquals(0, matchingHeaders.length);

+ matchingHeaders = TestWebServer.getMatchingHeadersValues(request, refNamesAndValues[i]);

+ assertEquals(0, matchingHeaders.size());

}

@@ -183,22 +178,18 @@ public class LoadUrlTest extends AwTestBase {

path,

"<html><body>foo</body></html>",

null);

- String[] extraHeaders = {

- "user-agent", "007"

- };

+ String[] extraHeaders = {"user-agent", "Borewicz 07 & Bond 007"};

loadUrlWithExtraHeadersSync(awContents,

contentsClient.getOnPageFinishedHelper(),

url,

createHeadersMap(extraHeaders));

- Header[] matchingHeaders = webServer.getLastRequest(path).getHeaders(extraHeaders[0]);

- assertEquals(1, matchingHeaders.length);

- Header header = matchingHeaders[0];

- assertEquals(extraHeaders[0].toLowerCase(Locale.ENGLISH),

- header.getName().toLowerCase(Locale.ENGLISH));

+ List<String> matchingHeaders = TestWebServer.getMatchingHeadersValues(

+ webServer.getLastRequest(path), extraHeaders[0]);

+ assertEquals(1, matchingHeaders.size());

// Just check that the value is there, and it's not the one we provided.

- assertTrue(header.getValue().length() > 0);

- assertFalse(extraHeaders[1].equals(header.getValue()));

+ assertTrue(matchingHeaders.get(0).length() > 0);

+ assertFalse(extraHeaders[1].equals(matchingHeaders.get(0)));

} finally {

webServer.shutdown();

}