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..2dbcf3092196020b4259a2734eba2c70915b90a1 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 |
@@ -8,8 +8,6 @@ import android.os.ConditionVariable; |
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 +17,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. |
@@ -58,7 +54,8 @@ public class SdchTest extends CronetTestBase { |
} |
String[] args = new String[commandLineArgs.size()]; |
- CronetEngine.Builder builder = new CronetEngine.Builder(getContext()); |
+ ExperimentalCronetEngine.Builder builder = |
+ new ExperimentalCronetEngine.Builder(getContext()); |
JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules(); |
JSONObject experimentalOptions = |
new JSONObject().put("HostResolverRules", hostResolverParams); |
@@ -77,75 +74,6 @@ 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); |
@@ -248,32 +176,15 @@ 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(); |
UrlRequest.Builder builder = |
- new UrlRequest.Builder(url, callback, callback.getExecutor(), cronetEngine); |
+ cronetEngine.newUrlRequestBuilder(url, callback, callback.getExecutor()); |
builder.build().start(); |
callback.blockForDone(); |
return callback; |