components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.java - Issue 2361413002: Obliterate legacy cronet API. All of its users have been migrated.

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

Issue 2361413002: Obliterate legacy cronet API. All of its users have been migrated. (Closed)

Patch Set: Created 4 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

« no previous file with comments | « components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/TestHttpUrlRequestListener.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d419b21846e0f135683c34e5c6105c93930e9259..a8704b98819d030d578fe0c62f53a1143473ec1d 100644

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

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

@@ -9,7 +9,6 @@ import android.test.suitebuilder.annotation.SmallTest;

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

import org.chromium.net.CronetTestBase.OnlyRunNativeCronet;

-import org.chromium.net.impl.ChromiumUrlRequestFactory;

import org.chromium.net.impl.CronetUrlRequestContext;

import org.json.JSONException;

import org.json.JSONObject;

@@ -19,9 +18,7 @@ import java.io.FileReader;

import java.io.IOException;

import java.util.ArrayList;

import java.util.Arrays;

-import java.util.HashMap;

import java.util.List;

-import java.util.Map;

/**

* Tests Sdch support.

@@ -34,13 +31,8 @@ public class SdchTest extends CronetTestBase {

DISABLED,

}

- private enum Api {

- LEGACY,

- ASYNC,

- }

@SuppressWarnings("deprecation")

- private void setUp(Sdch setting, Api api) throws JSONException {

+ private void setUp(Sdch setting) throws JSONException {

List<String> commandLineArgs = new ArrayList<String>();

commandLineArgs.add(CronetTestFramework.CACHE_KEY);

commandLineArgs.add(CronetTestFramework.CACHE_DISK);

@@ -49,13 +41,8 @@ public class SdchTest extends CronetTestBase {

commandLineArgs.add(CronetTestFramework.SDCH_ENABLE);

}

- if (api == Api.LEGACY) {

- commandLineArgs.add(CronetTestFramework.LIBRARY_INIT_KEY);

- commandLineArgs.add(CronetTestFramework.LibraryInitType.LEGACY);

- } else {

- commandLineArgs.add(CronetTestFramework.LIBRARY_INIT_KEY);

- commandLineArgs.add(CronetTestFramework.LibraryInitType.CRONET);

- }

+ commandLineArgs.add(CronetTestFramework.LIBRARY_INIT_KEY);

+ commandLineArgs.add(CronetTestFramework.LibraryInitType.CRONET);

String[] args = new String[commandLineArgs.size()];

CronetEngine.Builder builder = new CronetEngine.Builder(getContext());

@@ -77,83 +64,13 @@ public class SdchTest extends CronetTestBase {

@SmallTest

@Feature({"Cronet"})

- @SuppressWarnings("deprecation")

- @OnlyRunNativeCronet

- public void testSdchEnabled_LegacyApi() throws Exception {

- setUp(Sdch.ENABLED, Api.LEGACY);

- String targetUrl = NativeTestServer.getSdchURL() + "/sdch/test";

- long contextAdapter =

- getContextAdapter((ChromiumUrlRequestFactory) mTestFramework.mRequestFactory);

- DictionaryAddedObserver observer =

- new DictionaryAddedObserver(targetUrl, contextAdapter, true /** Legacy Api */);

- // Make a request to /sdch/index which advertises the dictionary.

- TestHttpUrlRequestListener listener1 =

- startAndWaitForComplete_LegacyApi(mTestFramework.mRequestFactory,

- NativeTestServer.getSdchURL() + "/sdch/index?q=LeQxM80O");

- assertEquals(200, listener1.mHttpStatusCode);

- assertEquals("This is an index page.\n", listener1.mResponseAsString);

- assertEquals(Arrays.asList("/sdch/dict/LeQxM80O"),

- listener1.mResponseHeaders.get("Get-Dictionary"));

- observer.waitForDictionaryAdded();

- // Make a request to fetch encoded response at /sdch/test.

- TestHttpUrlRequestListener listener2 =

- startAndWaitForComplete_LegacyApi(mTestFramework.mRequestFactory, targetUrl);

- assertEquals(200, listener2.mHttpStatusCode);

- assertEquals("The quick brown fox jumps over the lazy dog.\n", listener2.mResponseAsString);

- }

- @SmallTest

- @Feature({"Cronet"})

- @SuppressWarnings("deprecation")

- @OnlyRunNativeCronet

- public void testSdchDisabled_LegacyApi() throws Exception {

- setUp(Sdch.DISABLED, Api.LEGACY);

- // Make a request to /sdch/index.

- // Since Sdch is not enabled, no dictionary should be advertised.

- TestHttpUrlRequestListener listener =

- startAndWaitForComplete_LegacyApi(mTestFramework.mRequestFactory,

- NativeTestServer.getSdchURL() + "/sdch/index?q=LeQxM80O");

- assertEquals(200, listener.mHttpStatusCode);

- assertEquals("This is an index page.\n", listener.mResponseAsString);

- assertEquals(null, listener.mResponseHeaders.get("Get-Dictionary"));

- }

- @SmallTest

- @Feature({"Cronet"})

- @SuppressWarnings("deprecation")

- @OnlyRunNativeCronet

- public void testDictionaryNotFound_LegacyApi() throws Exception {

- setUp(Sdch.ENABLED, Api.LEGACY);

- // Make a request to /sdch/index which advertises a bad dictionary that

- // does not exist.

- TestHttpUrlRequestListener listener1 =

- startAndWaitForComplete_LegacyApi(mTestFramework.mRequestFactory,

- NativeTestServer.getSdchURL() + "/sdch/index?q=NotFound");

- assertEquals(200, listener1.mHttpStatusCode);

- assertEquals("This is an index page.\n", listener1.mResponseAsString);

- assertEquals(Arrays.asList("/sdch/dict/NotFound"),

- listener1.mResponseHeaders.get("Get-Dictionary"));

- // Make a request to fetch /sdch/test, and make sure request succeeds.

- TestHttpUrlRequestListener listener2 = startAndWaitForComplete_LegacyApi(

- mTestFramework.mRequestFactory, NativeTestServer.getSdchURL() + "/sdch/test");

- assertEquals(200, listener2.mHttpStatusCode);

- assertEquals("Sdch is not used.\n", listener2.mResponseAsString);

- }

- @SmallTest

- @Feature({"Cronet"})

@OnlyRunNativeCronet

public void testSdchEnabled() throws Exception {

- setUp(Sdch.ENABLED, Api.ASYNC);

+ setUp(Sdch.ENABLED);

String targetUrl = NativeTestServer.getSdchURL() + "/sdch/test";

long contextAdapter =

getContextAdapter((CronetUrlRequestContext) mTestFramework.mCronetEngine);

- DictionaryAddedObserver observer =

- new DictionaryAddedObserver(targetUrl, contextAdapter, false /** Legacy Api */);

+ DictionaryAddedObserver observer = new DictionaryAddedObserver(targetUrl, contextAdapter);

// Make a request to /sdch which advertises the dictionary.

TestUrlRequestCallback callback1 = startAndWaitForComplete(mTestFramework.mCronetEngine,

@@ -184,7 +101,7 @@ public class SdchTest extends CronetTestBase {

CronetUrlRequestContext newContext = (CronetUrlRequestContext) mTestFramework.mCronetEngine;

long newContextAdapter = getContextAdapter(newContext);

DictionaryAddedObserver newObserver =

- new DictionaryAddedObserver(targetUrl, newContextAdapter, false /** Legacy Api */);

+ new DictionaryAddedObserver(targetUrl, newContextAdapter);

newObserver.waitForDictionaryAdded();

// Make a request to fetch encoded response at /sdch/test.

@@ -197,7 +114,7 @@ public class SdchTest extends CronetTestBase {

@Feature({"Cronet"})

@OnlyRunNativeCronet

public void testSdchDisabled() throws Exception {

- setUp(Sdch.DISABLED, Api.ASYNC);

+ setUp(Sdch.DISABLED);

// Make a request to /sdch.

// Since Sdch is not enabled, no dictionary should be advertised.

TestUrlRequestCallback callback = startAndWaitForComplete(mTestFramework.mCronetEngine,

@@ -211,7 +128,7 @@ public class SdchTest extends CronetTestBase {

@Feature({"Cronet"})

@OnlyRunNativeCronet

public void testDictionaryNotFound() throws Exception {

- setUp(Sdch.ENABLED, Api.ASYNC);

+ setUp(Sdch.ENABLED);

// Make a request to /sdch/index which advertises a bad dictionary that

// does not exist.

TestUrlRequestCallback callback1 = startAndWaitForComplete(mTestFramework.mCronetEngine,

@@ -231,8 +148,8 @@ public class SdchTest extends CronetTestBase {

private static class DictionaryAddedObserver extends SdchObserver {

ConditionVariable mBlock = new ConditionVariable();

- public DictionaryAddedObserver(String targetUrl, long contextAdapter, boolean isLegacyAPI) {

- super(targetUrl, contextAdapter, isLegacyAPI);

+ public DictionaryAddedObserver(String targetUrl, long contextAdapter) {

+ super(targetUrl, contextAdapter);

}

@Override

@@ -248,27 +165,10 @@ public class SdchTest extends CronetTestBase {

}

- @SuppressWarnings("deprecation")

- private long getContextAdapter(ChromiumUrlRequestFactory factory) {

- return factory.getRequestContext().getUrlRequestContextAdapter();

- }

private long getContextAdapter(CronetUrlRequestContext requestContext) {

return requestContext.getUrlRequestContextAdapter();

}

- @SuppressWarnings("deprecation")

- private TestHttpUrlRequestListener startAndWaitForComplete_LegacyApi(

- HttpUrlRequestFactory factory, String url) throws Exception {

- Map<String, String> headers = new HashMap<String, String>();

- TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();

- HttpUrlRequest request = factory.createRequest(

- url, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);

- request.start();

- listener.blockForComplete();

- return listener;

- }

private TestUrlRequestCallback startAndWaitForComplete(CronetEngine cronetEngine, String url)

throws Exception {

TestUrlRequestCallback callback = new TestUrlRequestCallback();