Index: components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java |
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java |
index 4d7b672bd79a876fb300228de848540699029fd4..43b30a2e6c9dceacb5b7623072ca7dcd7fc52bb6 100644 |
--- a/components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java |
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java |
@@ -11,18 +11,21 @@ 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 { |
+ private static class TestStatusListener extends UrlRequest.StatusListener { |
pauljensen
2016/10/03 15:22:38
why this change? this file imports StatusListener
kapishnikov
2016/10/03 23:49:29
Fixed.
|
boolean mOnStatusCalled = false; |
int mStatus = Integer.MAX_VALUE; |
private final ConditionVariable mBlock = new ConditionVariable(); |
@@ -59,8 +62,8 @@ public class GetStatusTest extends CronetTestBase { |
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. |
@@ -115,14 +118,14 @@ public class GetStatusTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testInvalidLoadState() throws Exception { |
try { |
- Status.convertLoadState(LoadState.WAITING_FOR_APPCACHE); |
+ UrlRequestBase.StatusConverter.convertLoadState(LoadState.WAITING_FOR_APPCACHE); |
fail(); |
} catch (IllegalArgumentException e) { |
// Expected because LoadState.WAITING_FOR_APPCACHE is not mapped. |
} |
try { |
- Status.convertLoadState(-1); |
+ UrlRequestBase.StatusConverter.convertLoadState(-1); |
fail(); |
} catch (AssertionError e) { |
// Expected. |
@@ -132,7 +135,7 @@ public class GetStatusTest extends CronetTestBase { |
} |
try { |
- Status.convertLoadState(16); |
+ UrlRequestBase.StatusConverter.convertLoadState(16); |
fail(); |
} catch (AssertionError e) { |
// Expected. |
@@ -148,8 +151,8 @@ public class GetStatusTest extends CronetTestBase { |
@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 |