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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2339223002: Cronet API Refactoring (Closed)
Patch Set: Javadoc + rebase Created 4 years, 3 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
« components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java ('K') | « components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java
index 021d35ef1c02fd8b76c933c198704f9a1c536632..bc8a83a15bcb88bc9ad856d253a0923e33fbf2f5 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java
@@ -7,7 +7,6 @@ package org.chromium.net;
import android.test.suitebuilder.annotation.SmallTest;
import org.chromium.base.test.util.Feature;
-import org.chromium.net.CronetTestBase.OnlyRunNativeCronet;
import org.json.JSONObject;
import java.nio.ByteBuffer;
@@ -25,7 +24,8 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
private void setUp(QuicBidirectionalStreams enabled) throws Exception {
// Load library first to create MockCertVerifier.
System.loadLibrary("cronet_tests");
- CronetEngine.Builder builder = new CronetEngine.Builder(getContext());
+ ExperimentalCronetEngine.Builder builder =
+ new ExperimentalCronetEngine.Builder(getContext());
QuicTestServer.startQuicTestServer(getContext());
@@ -43,7 +43,8 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
builder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getServerPort(),
QuicTestServer.getServerPort());
- builder.setMockCertVerifierForTesting(QuicTestServer.createMockCertVerifier());
+ CronetTestUtil.setMockCertVerifierForTesting(
+ builder, QuicTestServer.createMockCertVerifier());
mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, builder);
}
@@ -63,11 +64,11 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
String path = "/simple.txt";
String quicURL = QuicTestServer.getServerURL() + path;
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();
- BidirectionalStream stream = new BidirectionalStream
- .Builder(quicURL, callback, callback.getExecutor(),
- mTestFramework.mCronetEngine)
- .setHttpMethod("GET")
- .build();
+ BidirectionalStream stream =
+ mTestFramework.mCronetEngine
+ .newBidirectionalStreamBuilder(quicURL, callback, callback.getExecutor())
+ .setHttpMethod("GET")
+ .build();
stream.start();
callback.blockForDone();
assertTrue(stream.isDone());
@@ -89,13 +90,13 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
callback.addWriteData("Test String".getBytes());
callback.addWriteData("1234567890".getBytes());
callback.addWriteData("woot!".getBytes());
- BidirectionalStream stream = new BidirectionalStream
- .Builder(quicURL, callback, callback.getExecutor(),
- mTestFramework.mCronetEngine)
- .addHeader("foo", "bar")
- .addHeader("empty", "")
- .addHeader("Content-Type", "zebra")
- .build();
+ BidirectionalStream stream =
+ mTestFramework.mCronetEngine
+ .newBidirectionalStreamBuilder(quicURL, callback, callback.getExecutor())
+ .addHeader("foo", "bar")
+ .addHeader("empty", "")
+ .addHeader("Content-Type", "zebra")
+ .build();
stream.start();
callback.blockForDone();
assertTrue(stream.isDone());
@@ -119,9 +120,9 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
callback.addWriteData("Test String".getBytes(), false);
callback.addWriteData("1234567890".getBytes(), false);
callback.addWriteData("woot!".getBytes(), true);
- BidirectionalStream stream = new BidirectionalStream
- .Builder(quicURL, callback, callback.getExecutor(),
- mTestFramework.mCronetEngine)
+ BidirectionalStream stream = mTestFramework.mCronetEngine
+ .newBidirectionalStreamBuilder(
+ quicURL, callback, callback.getExecutor())
.delayRequestHeadersUntilFirstFlush(i == 0)
.addHeader("foo", "bar")
.addHeader("empty", "")
@@ -155,9 +156,9 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
callback.addWriteData("Test String".getBytes(), false);
callback.addWriteData("1234567890".getBytes(), false);
callback.addWriteData("woot!".getBytes(), true);
- BidirectionalStream stream = new BidirectionalStream
- .Builder(quicURL, callback, callback.getExecutor(),
- mTestFramework.mCronetEngine)
+ BidirectionalStream stream = mTestFramework.mCronetEngine
+ .newBidirectionalStreamBuilder(
+ quicURL, callback, callback.getExecutor())
.delayRequestHeadersUntilFirstFlush(i == 0)
.addHeader("foo", "bar")
.addHeader("empty", "")
@@ -191,14 +192,14 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
super.onStreamReady(stream);
}
};
- BidirectionalStream stream = new BidirectionalStream
- .Builder(url, callback, callback.getExecutor(),
- mTestFramework.mCronetEngine)
- .setHttpMethod("GET")
- .delayRequestHeadersUntilFirstFlush(i == 0)
- .addHeader("foo", "bar")
- .addHeader("empty", "")
- .build();
+ BidirectionalStream stream =
+ mTestFramework.mCronetEngine
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor())
+ .setHttpMethod("GET")
+ .delayRequestHeadersUntilFirstFlush(i == 0)
+ .addHeader("foo", "bar")
+ .addHeader("empty", "")
+ .build();
// Flush before stream is started should not crash.
stream.flush();
@@ -229,14 +230,14 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();
callback.addWriteData("Test String".getBytes(), true);
- BidirectionalStream stream = new BidirectionalStream
- .Builder(url, callback, callback.getExecutor(),
- mTestFramework.mCronetEngine)
- .delayRequestHeadersUntilFirstFlush(i == 0)
- .addHeader("foo", "bar")
- .addHeader("empty", "")
- .addHeader("Content-Type", "zebra")
- .build();
+ BidirectionalStream stream =
+ mTestFramework.mCronetEngine
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor())
+ .delayRequestHeadersUntilFirstFlush(i == 0)
+ .addHeader("foo", "bar")
+ .addHeader("empty", "")
+ .addHeader("Content-Type", "zebra")
+ .build();
stream.start();
callback.blockForDone();
assertTrue(stream.isDone());
@@ -257,11 +258,11 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
String quicURL = QuicTestServer.getServerURL() + path;
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();
- BidirectionalStream stream = new BidirectionalStream
- .Builder(quicURL, callback, callback.getExecutor(),
- mTestFramework.mCronetEngine)
- .setHttpMethod("GET")
- .build();
+ BidirectionalStream stream =
+ mTestFramework.mCronetEngine
+ .newBidirectionalStreamBuilder(quicURL, callback, callback.getExecutor())
+ .setHttpMethod("GET")
+ .build();
stream.start();
callback.blockForDone();
assertTrue(stream.isDone());
@@ -297,13 +298,13 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
callback.addWriteData("1234567890".getBytes());
callback.addWriteData("woot!".getBytes());
- BidirectionalStream stream = new BidirectionalStream
- .Builder(quicURL, callback, callback.getExecutor(),
- mTestFramework.mCronetEngine)
- .addHeader("foo", "bar")
- .addHeader("empty", "")
- .addHeader("Content-Type", "zebra")
- .build();
+ BidirectionalStream stream =
+ mTestFramework.mCronetEngine
+ .newBidirectionalStreamBuilder(quicURL, callback, callback.getExecutor())
+ .addHeader("foo", "bar")
+ .addHeader("empty", "")
+ .addHeader("Content-Type", "zebra")
+ .build();
stream.start();
callback.blockForDone();
assertTrue(stream.isDone());
@@ -323,11 +324,11 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
String path = "/simple.txt";
String quicURL = QuicTestServer.getServerURL() + path;
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();
- BidirectionalStream stream = new BidirectionalStream
- .Builder(quicURL, callback, callback.getExecutor(),
- mTestFramework.mCronetEngine)
- .setHttpMethod("GET")
- .build();
+ BidirectionalStream stream =
+ mTestFramework.mCronetEngine
+ .newBidirectionalStreamBuilder(quicURL, callback, callback.getExecutor())
+ .setHttpMethod("GET")
+ .build();
stream.start();
callback.blockForDone();
assertTrue(stream.isDone());
@@ -339,9 +340,11 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
assertFalse(serialized_data.isEmpty());
// Create a new builder and verify that the |serialized_data| is deserialized correctly.
- CronetEngine.Builder builder = new CronetEngine.Builder(getContext());
+ ExperimentalCronetEngine.Builder builder =
+ new ExperimentalCronetEngine.Builder(getContext());
builder.enableQuic(true);
- builder.setMockCertVerifierForTesting(QuicTestServer.createMockCertVerifier());
+ CronetTestUtil.setMockCertVerifierForTesting(
+ builder, QuicTestServer.createMockCertVerifier());
builder.setCertVerifierData(serialized_data);
CronetTestFramework testFramework =
« components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java ('K') | « components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698