Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

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

Issue 1417973002: [Cronet] Switch from InstrumentationTest to junit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Download patch
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 f14669555a42be1d41c3d2810e06732d515b5dee..fe939dafa44c725c4a738eff224a29c055e9779e 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
@@ -16,7 +16,7 @@ import org.chromium.net.UrlRequest.StatusListener;
* Tests that {@link CronetUrlRequest#getStatus} works as expected.
*/
public class GetStatusTest extends CronetTestBase {
- private CronetTestActivity mActivity;
+ private CronetTestFramework mTestFramework;
private static class TestStatusListener extends StatusListener {
boolean mOnStatusCalled = false;
@@ -38,14 +38,14 @@ public class GetStatusTest extends CronetTestBase {
@Override
protected void setUp() throws Exception {
super.setUp();
- mActivity = launchCronetTestApp();
- assertTrue(NativeTestServer.startNativeTestServer(getInstrumentation().getTargetContext()));
+ mTestFramework = startCronetTestFramework();
+ assertTrue(NativeTestServer.startNativeTestServer(getContext()));
}
@Override
protected void tearDown() throws Exception {
NativeTestServer.shutdownNativeTestServer();
- mActivity.mCronetEngine.shutdown();
+ mTestFramework.mCronetEngine.shutdown();
super.tearDown();
}
@@ -56,7 +56,7 @@ public class GetStatusTest extends CronetTestBase {
TestUrlRequestListener listener = new TestUrlRequestListener();
listener.setAutoAdvance(false);
UrlRequest.Builder builder = new UrlRequest.Builder(
- url, listener, listener.getExecutor(), mActivity.mCronetEngine);
+ url, listener, listener.getExecutor(), mTestFramework.mCronetEngine);
UrlRequest urlRequest = builder.build();
// Calling before request is started should give Status.INVALID,
// since the native adapter is not created.

Powered by Google App Engine
This is Rietveld 408576698