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

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: Rebase + conflict resolution Created 4 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
« no previous file with comments | « components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java » ('j') | components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java » ('J')
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 41b3dd09a7a50159502a5f4dd215b0af50883d4a..f42520ae5f1d4e11f44078523e0ebc4a987c54d7 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
@@ -11,7 +11,6 @@ import android.test.suitebuilder.annotation.SmallTest;
import org.json.JSONObject;
import org.chromium.base.test.util.Feature;
-import org.chromium.net.CronetTestBase.OnlyRunNativeCronet;
import org.chromium.net.MetricsTestUtil.TestRequestFinishedListener;
import java.nio.ByteBuffer;
@@ -31,7 +30,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());
@@ -49,7 +49,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);
}
@@ -69,11 +70,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());
@@ -97,15 +98,15 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
callback.addWriteData("woot!".getBytes());
TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener();
mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener);
- BidirectionalStream stream = new BidirectionalStream
- .Builder(quicURL, callback, callback.getExecutor(),
- mTestFramework.mCronetEngine)
- .addHeader("foo", "bar")
- .addHeader("empty", "")
- .addHeader("Content-Type", "zebra")
- .addRequestAnnotation("request annotation")
- .addRequestAnnotation(this)
- .build();
+ BidirectionalStream stream =
+ mTestFramework.mCronetEngine
+ .newBidirectionalStreamBuilder(quicURL, callback, callback.getExecutor())
+ .addHeader("foo", "bar")
+ .addHeader("empty", "")
+ .addHeader("Content-Type", "zebra")
+ .addRequestAnnotation("request annotation")
+ .addRequestAnnotation(this)
+ .build();
Date startTime = new Date();
stream.start();
callback.blockForDone();
@@ -144,9 +145,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", "")
@@ -180,9 +181,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", "")
@@ -216,14 +217,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();
@@ -254,14 +255,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());
@@ -282,11 +283,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());
@@ -322,13 +323,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());
@@ -348,11 +349,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());
@@ -364,9 +365,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 =
« no previous file with comments | « components/cronet/android/test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java » ('j') | components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698