Cronet API Refactoring

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 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;
 
 import java.io.BufferedReader;
 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.
  */
 public class SdchTest extends CronetTestBase {
     private CronetTestFramework mTestFramework;
 
     private enum Sdch {
         ENABLED,
         DISABLED,
@@ skipping 16 matching lines @@
 
         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);
         }
 
         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);
         builder.setExperimentalOptions(experimentalOptions.toString());
         mTestFramework =
                 new CronetTestFramework(null, commandLineArgs.toArray(args), getContext(), builder);
         // Start NativeTestServer.
         assertTrue(NativeTestServer.startNativeTestServer(getContext()));
     }
 
     @Override
     protected void tearDown() throws Exception {
         NativeTestServer.shutdownNativeTestServer();
         super.tearDown();
     }
 
     @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);
         String targetUrl = NativeTestServer.getSdchURL() + "/sdch/test";
         long contextAdapter =
                 getContextAdapter((CronetUrlRequestContext) mTestFramework.mCronetEngine);
         DictionaryAddedObserver observer =
                 new DictionaryAddedObserver(targetUrl, contextAdapter, false /** Legacy Api */);
 
         // Make a request to /sdch which advertises the dictionary.
@@ skipping 82 matching lines @@
         }
 
         public void waitForDictionaryAdded() {
             if (!mDictionaryAlreadyPresent) {
                 mBlock.block();
                 mBlock.close();
             }
         }
     }
 
-    @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;
     }
 
     // Returns whether a file contains a particular string.
     private boolean fileContainsString(String filename, String content) throws IOException {
         BufferedReader reader = new BufferedReader(new FileReader(
                 CronetTestFramework.getTestStorage(getContext()) + "/prefs/" + filename));
         String line;
         while ((line = reader.readLine()) != null) {
             if (line.contains(content)) {
                 reader.close();
                 return true;
             }
         }
         reader.close();
         return false;
     }
 }