Cronet API Refactoring

components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.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.TestUrlRequestCallback.ResponseStep;
 import org.chromium.net.UrlRequest.Status;
 import org.chromium.net.UrlRequest.StatusListener;
+import org.chromium.net.impl.LoadState;
+import org.chromium.net.impl.UrlRequestBase;
 
 import java.io.IOException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
 /**
- * Tests that {@link CronetUrlRequest#getStatus} works as expected.
+ * Tests that {@link org.chromium.net.impl.CronetUrlRequest#getStatus(StatusListener)} works as
+ * expected.
  */
 public class GetStatusTest extends CronetTestBase {
     private CronetTestFramework mTestFramework;
 
     private static class TestStatusListener extends StatusListener {
         boolean mOnStatusCalled = false;
         int mStatus = Integer.MAX_VALUE;
         private final ConditionVariable mBlock = new ConditionVariable();
 
         @Override
@@ skipping 21 matching lines @@
         mTestFramework.mCronetEngine.shutdown();
         super.tearDown();
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testSimpleGet() throws Exception {
         String url = NativeTestServer.getEchoMethodURL();
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
         callback.setAutoAdvance(false);
-        UrlRequest.Builder builder = new UrlRequest.Builder(
-                url, callback, callback.getExecutor(), mTestFramework.mCronetEngine);
+        UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
+                url, callback, callback.getExecutor());
         UrlRequest urlRequest = builder.build();
         // Calling before request is started should give Status.INVALID,
         // since the native adapter is not created.
         TestStatusListener statusListener0 = new TestStatusListener();
         urlRequest.getStatus(statusListener0);
         statusListener0.waitUntilOnStatusCalled();
         assertTrue(statusListener0.mOnStatusCalled);
         assertEquals(Status.INVALID, statusListener0.mStatus);
 
         urlRequest.start();
@@ skipping 34 matching lines @@
         assertEquals(Status.INVALID, statusListener3.mStatus);
 
         assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
         assertEquals("GET", callback.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInvalidLoadState() throws Exception {
         try {
-            Status.convertLoadState(LoadState.WAITING_FOR_APPCACHE);
+            UrlRequestBase.convertLoadState(LoadState.WAITING_FOR_APPCACHE);
             fail();
         } catch (IllegalArgumentException e) {
             // Expected because LoadState.WAITING_FOR_APPCACHE is not mapped.
         }
 
         try {
-            Status.convertLoadState(-1);
+            UrlRequestBase.convertLoadState(-1);
             fail();
         } catch (AssertionError e) {
             // Expected.
         } catch (IllegalArgumentException e) {
             // If assertions are disabled, an IllegalArgumentException should be thrown.
             assertEquals("No request status found.", e.getMessage());
         }
 
         try {
-            Status.convertLoadState(16);
+            UrlRequestBase.convertLoadState(16);
             fail();
         } catch (AssertionError e) {
             // Expected.
         } catch (IllegalArgumentException e) {
             // If assertions are disabled, an IllegalArgumentException should be thrown.
             assertEquals("No request status found.", e.getMessage());
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     // Regression test for crbug.com/606872.
     @OnlyRunNativeCronet
     public void testGetStatusForUpload() throws Exception {
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
-        UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(),
-                callback, callback.getExecutor(), mTestFramework.mCronetEngine);
+        UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
+                NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor());
 
         final ConditionVariable block = new ConditionVariable();
         // Use a separate executor for UploadDataProvider so the upload can be
         // stalled while getStatus gets processed.
         Executor uploadProviderExecutor = Executors.newSingleThreadExecutor();
         TestUploadDataProvider dataProvider = new TestUploadDataProvider(
                 TestUploadDataProvider.SuccessCallbackMode.SYNC, uploadProviderExecutor) {
             @Override
             public long getLength() throws IOException {
                 // Pause the data provider.
@@ skipping 26 matching lines @@
         dataProvider.assertClosed();
 
         assertEquals(4, dataProvider.getUploadedLength());
         assertEquals(1, dataProvider.getNumReadCalls());
         assertEquals(0, dataProvider.getNumRewindCalls());
 
         assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
         assertEquals("test", callback.mResponseAsString);
     }
 }