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

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

Issue 1363723002: [Cronet] Create Builders, rename UrlRequestContext to CronetEngine (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make old API work without renaming 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.net; 5 package org.chromium.net;
6 6
7 import android.os.ConditionVariable; 7 import android.os.ConditionVariable;
8 import android.test.suitebuilder.annotation.SmallTest; 8 import android.test.suitebuilder.annotation.SmallTest;
9 9
10 import org.chromium.base.test.util.Feature; 10 import org.chromium.base.test.util.Feature;
(...skipping 27 matching lines...) Expand all
38 @Override 38 @Override
39 protected void setUp() throws Exception { 39 protected void setUp() throws Exception {
40 super.setUp(); 40 super.setUp();
41 mActivity = launchCronetTestApp(); 41 mActivity = launchCronetTestApp();
42 assertTrue(NativeTestServer.startNativeTestServer(getInstrumentation().g etTargetContext())); 42 assertTrue(NativeTestServer.startNativeTestServer(getInstrumentation().g etTargetContext()));
43 } 43 }
44 44
45 @Override 45 @Override
46 protected void tearDown() throws Exception { 46 protected void tearDown() throws Exception {
47 NativeTestServer.shutdownNativeTestServer(); 47 NativeTestServer.shutdownNativeTestServer();
48 mActivity.mUrlRequestContext.shutdown(); 48 mActivity.mCronetEngine.shutdown();
49 super.tearDown(); 49 super.tearDown();
50 } 50 }
51 51
52 @SmallTest 52 @SmallTest
53 @Feature({"Cronet"}) 53 @Feature({"Cronet"})
54 public void testSimpleGet() throws Exception { 54 public void testSimpleGet() throws Exception {
55 String url = NativeTestServer.getEchoMethodURL(); 55 String url = NativeTestServer.getEchoMethodURL();
56 TestUrlRequestListener listener = new TestUrlRequestListener(); 56 TestUrlRequestListener listener = new TestUrlRequestListener();
57 listener.setAutoAdvance(false); 57 listener.setAutoAdvance(false);
58 UrlRequest urlRequest = 58 UrlRequest.Builder builder = new UrlRequest.Builder(
59 mActivity.mUrlRequestContext.createRequest(url, listener, listen er.getExecutor()); 59 url, listener, listener.getExecutor(), mActivity.mCronetEngine);
60 // Calling before request is started should give Status.INVALID, 60 UrlRequest urlRequest = builder.build();
61 // since the native adapter is not created.
62 TestStatusListener statusListener0 = new TestStatusListener();
mef 2015/10/02 16:46:58 Can't do that, nice!
pauljensen 2015/10/02 18:23:15 Oops, actually you can now that we added back star
63 urlRequest.getStatus(statusListener0);
64 statusListener0.waitUntilOnStatusCalled();
65 assertTrue(statusListener0.mOnStatusCalled);
66 assertEquals(Status.INVALID, statusListener0.mStatus);
67
68 urlRequest.start(); 61 urlRequest.start();
69 62
70 // Should receive a valid status. 63 // Should receive a valid status.
71 TestStatusListener statusListener1 = new TestStatusListener(); 64 TestStatusListener statusListener1 = new TestStatusListener();
72 urlRequest.getStatus(statusListener1); 65 urlRequest.getStatus(statusListener1);
73 statusListener1.waitUntilOnStatusCalled(); 66 statusListener1.waitUntilOnStatusCalled();
74 assertTrue(statusListener1.mOnStatusCalled); 67 assertTrue(statusListener1.mOnStatusCalled);
75 assertTrue(statusListener1.mStatus >= Status.IDLE); 68 assertTrue(statusListener1.mStatus >= Status.IDLE);
76 assertTrue(statusListener1.mStatus <= Status.READING_RESPONSE); 69 assertTrue(statusListener1.mStatus <= Status.READING_RESPONSE);
77 70
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 Status.convertLoadState(16); 122 Status.convertLoadState(16);
130 fail(); 123 fail();
131 } catch (AssertionError e) { 124 } catch (AssertionError e) {
132 // Expected. 125 // Expected.
133 } catch (IllegalArgumentException e) { 126 } catch (IllegalArgumentException e) {
134 // If assertions are disabled, an IllegalArgumentException should be thrown. 127 // If assertions are disabled, an IllegalArgumentException should be thrown.
135 assertEquals("No request status found.", e.getMessage()); 128 assertEquals("No request status found.", e.getMessage());
136 } 129 }
137 } 130 }
138 } 131 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698