components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java - Issue 1359343005: Update ResponseInfo to UrlResponseInfo with API review comments.

Unified Diff: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java

Issue 1359343005: Update ResponseInfo to UrlResponseInfo with API review comments. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Pass the integration tests. Created 5 years, 3 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

Download patch

« components/cronet/android/java/src/org/chromium/net/UrlResponseInfo.java ('K') | « components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java

diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java

index 6eae9aec804b12375059608ea3bc3bb2fe1b75c4..7eb629621d4f39d5c4f354dc0727ddbcf33b7349 100644

--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java

+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java

@@ -6,7 +6,6 @@ package org.chromium.net;

import android.os.ConditionVariable;

import android.test.suitebuilder.annotation.SmallTest;

-import android.util.Pair;

import org.chromium.base.test.util.Feature;

import org.chromium.net.TestUrlRequestListener.FailureType;

@@ -64,11 +63,12 @@ public class CronetUrlRequestTest extends CronetTestBase {

String expectedUrl, int expectedHttpStatusCode,

String expectedHttpStatusText) {

assertEquals(expectedUrl, responseInfo.getUrl());

- assertEquals(expectedUrl, responseInfo.getUrlChain()[

- responseInfo.getUrlChain().length - 1]);

+ assertEquals(

+ expectedUrl, responseInfo.getUrlChain().get(responseInfo.getUrlChain().size() - 1));

assertEquals(expectedHttpStatusCode, responseInfo.getHttpStatusCode());

assertEquals(expectedHttpStatusText, responseInfo.getHttpStatusText());

assertFalse(responseInfo.wasCached());

+ assertTrue(responseInfo.toString().length() > 0);

}

private void checkResponseInfoHeader(ResponseInfo responseInfo,

@@ -117,8 +117,7 @@ public class CronetUrlRequestTest extends CronetTestBase {

assertEquals(1, listener.mRedirectResponseInfoList.size());

checkResponseInfo(listener.mRedirectResponseInfoList.get(0),

NativeTestServer.getRedirectURL(), 302, "Found");

- assertEquals(1,

- listener.mRedirectResponseInfoList.get(0).getUrlChain().length);

+ assertEquals(1, listener.mRedirectResponseInfoList.get(0).getUrlChain().size());

assertEquals(NativeTestServer.getSuccessURL(), listener.mRedirectUrlList.get(0));

checkResponseInfoHeader(listener.mRedirectResponseInfoList.get(0),

"redirect-header", "header-value");

@@ -137,9 +136,10 @@ public class CronetUrlRequestTest extends CronetTestBase {

assertEquals(1, listener.mRedirectResponseInfoList.size());

assertEquals(200, listener.mResponseInfo.getHttpStatusCode());

checkResponseInfo(listener.mResponseInfo, NativeTestServer.getSuccessURL(), 200, "OK");

- assertEquals(2, listener.mResponseInfo.getUrlChain().length);

- assertEquals(NativeTestServer.getRedirectURL(), listener.mResponseInfo.getUrlChain()[0]);

- assertEquals(NativeTestServer.getSuccessURL(), listener.mResponseInfo.getUrlChain()[1]);

+ assertEquals(2, listener.mResponseInfo.getUrlChain().size());

+ assertEquals(

+ NativeTestServer.getRedirectURL(), listener.mResponseInfo.getUrlChain().get(0));

+ assertEquals(NativeTestServer.getSuccessURL(), listener.mResponseInfo.getUrlChain().get(1));

// Wait for an unrelated request to finish. The request should not

// advance until read is invoked.

@@ -393,20 +393,19 @@ public class CronetUrlRequestTest extends CronetTestBase {

public void testResponseHeadersList() throws Exception {

TestUrlRequestListener listener = startAndWaitForComplete(NativeTestServer.getSuccessURL());

assertEquals(200, listener.mResponseInfo.getHttpStatusCode());

- List<Pair<String, String>> responseHeaders =

+ List<Map.Entry<String, String>> responseHeaders =

listener.mResponseInfo.getAllHeadersAsList();

assertEquals(5, responseHeaders.size());

- assertEquals("Content-Type", responseHeaders.get(0).first);

- assertEquals("text/plain", responseHeaders.get(0).second);

- assertEquals("Access-Control-Allow-Origin",

- responseHeaders.get(1).first);

- assertEquals("*", responseHeaders.get(1).second);

- assertEquals("header-name", responseHeaders.get(2).first);

- assertEquals("header-value", responseHeaders.get(2).second);

- assertEquals("multi-header-name", responseHeaders.get(3).first);

- assertEquals("header-value1", responseHeaders.get(3).second);

- assertEquals("multi-header-name", responseHeaders.get(4).first);

- assertEquals("header-value2", responseHeaders.get(4).second);

+ assertEquals("Content-Type", responseHeaders.get(0).getKey());

+ assertEquals("text/plain", responseHeaders.get(0).getValue());

+ assertEquals("Access-Control-Allow-Origin", responseHeaders.get(1).getKey());

+ assertEquals("*", responseHeaders.get(1).getValue());

+ assertEquals("header-name", responseHeaders.get(2).getKey());

+ assertEquals("header-value", responseHeaders.get(2).getValue());

+ assertEquals("multi-header-name", responseHeaders.get(3).getKey());

+ assertEquals("header-value1", responseHeaders.get(3).getValue());

+ assertEquals("multi-header-name", responseHeaders.get(4).getKey());

+ assertEquals("header-value2", responseHeaders.get(4).getValue());

}

@SmallTest

@@ -422,9 +421,9 @@ public class CronetUrlRequestTest extends CronetTestBase {

// Check first redirect (multiredirect.html -> redirect.html)

ResponseInfo firstRedirectResponseInfo =

listener.mRedirectResponseInfoList.get(0);

- assertEquals(1, firstRedirectResponseInfo.getUrlChain().length);

- assertEquals(

- NativeTestServer.getMultiRedirectURL(), firstRedirectResponseInfo.getUrlChain()[0]);

+ assertEquals(1, firstRedirectResponseInfo.getUrlChain().size());

+ assertEquals(NativeTestServer.getMultiRedirectURL(),

+ firstRedirectResponseInfo.getUrlChain().get(0));

checkResponseInfo(

firstRedirectResponseInfo, NativeTestServer.getMultiRedirectURL(), 302, "Found");

checkResponseInfoHeader(firstRedirectResponseInfo,

@@ -433,11 +432,11 @@ public class CronetUrlRequestTest extends CronetTestBase {

// Check second redirect (redirect.html -> success.txt)

ResponseInfo secondRedirectResponseInfo =

listener.mRedirectResponseInfoList.get(1);

- assertEquals(2, secondRedirectResponseInfo.getUrlChain().length);

+ assertEquals(2, secondRedirectResponseInfo.getUrlChain().size());

assertEquals(NativeTestServer.getMultiRedirectURL(),

- secondRedirectResponseInfo.getUrlChain()[0]);

+ secondRedirectResponseInfo.getUrlChain().get(0));

assertEquals(

- NativeTestServer.getRedirectURL(), secondRedirectResponseInfo.getUrlChain()[1]);

+ NativeTestServer.getRedirectURL(), secondRedirectResponseInfo.getUrlChain().get(1));

checkResponseInfo(

secondRedirectResponseInfo, NativeTestServer.getRedirectURL(), 302, "Found");

checkResponseInfoHeader(secondRedirectResponseInfo,

@@ -445,10 +444,10 @@ public class CronetUrlRequestTest extends CronetTestBase {

// Check final response (success.txt).

assertEquals(NativeTestServer.getSuccessURL(), mResponseInfo.getUrl());

- assertEquals(3, mResponseInfo.getUrlChain().length);

- assertEquals(NativeTestServer.getMultiRedirectURL(), mResponseInfo.getUrlChain()[0]);

- assertEquals(NativeTestServer.getRedirectURL(), mResponseInfo.getUrlChain()[1]);

- assertEquals(NativeTestServer.getSuccessURL(), mResponseInfo.getUrlChain()[2]);

+ assertEquals(3, mResponseInfo.getUrlChain().size());

+ assertEquals(NativeTestServer.getMultiRedirectURL(), mResponseInfo.getUrlChain().get(0));

+ assertEquals(NativeTestServer.getRedirectURL(), mResponseInfo.getUrlChain().get(1));

+ assertEquals(NativeTestServer.getSuccessURL(), mResponseInfo.getUrlChain().get(2));

assertTrue(listener.mHttpResponseDataLength != 0);

assertEquals(2, listener.mRedirectCount);

assertEquals(listener.mResponseStep, ResponseStep.ON_SUCCEEDED);