components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/UploadTest.java - Issue 873593006: [Cronet] Rename UploadTestServer.java to NativeTestServer.java

Unified Diff: components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/UploadTest.java

Issue 873593006: [Cronet] Rename UploadTestServer.java to NativeTestServer.java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 5 years, 11 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/javatests/src/org/chromium/cronet_test_apk/CronetUrlRequestTest.java ('k') | components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/urlconnection/CronetHttpURLConnectionTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/UploadTest.java

diff --git a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/UploadTest.java b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/UploadTest.java

index 3044bd37e559c89cf634eed3732e0403b549f3ee..8039ae5d87d2c00aa02ae057671d97e2f6b29d9a 100644

--- a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/UploadTest.java

+++ b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/UploadTest.java

@@ -34,7 +34,7 @@ public class UploadTest extends CronetTestBase {

super.setUp();

mActivity = launchCronetTestApp();

assertNotNull(mActivity);

- assertTrue(UploadTestServer.startUploadTestServer(

+ assertTrue(NativeTestServer.startNativeTestServer(

getInstrumentation().getTargetContext()));

}

@@ -70,7 +70,7 @@ public class UploadTest extends CronetTestBase {

public void testUploadData() throws Exception {

TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();

HttpUrlRequest request = createRequest(

- UploadTestServer.getEchoBodyURL(), listener);

+ NativeTestServer.getEchoBodyURL(), listener);

request.setUploadData("text/plain", UPLOAD_DATA.getBytes("UTF8"));

request.start();

listener.blockForComplete();

@@ -88,7 +88,7 @@ public class UploadTest extends CronetTestBase {

public void testUploadDataWithRedirect() throws Exception {

TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();

HttpUrlRequest request = createRequest(

- UploadTestServer.getRedirectToEchoBody(), listener);

+ NativeTestServer.getRedirectToEchoBody(), listener);

request.setUploadData("text/plain", UPLOAD_DATA.getBytes("UTF8"));

request.start();

listener.blockForComplete();

@@ -108,7 +108,7 @@ public class UploadTest extends CronetTestBase {

TestHttpUrlRequestListener listener =

new TestHttpUrlRequestListener();

HttpUrlRequest request = createRequest(

- UploadTestServer.getEchoHeaderURL("Content-Type"),

+ NativeTestServer.getEchoHeaderURL("Content-Type"),

listener);

request.setUploadData(contentType, UPLOAD_DATA.getBytes("UTF8"));

request.start();

@@ -127,7 +127,7 @@ public class UploadTest extends CronetTestBase {

public void testDefaultUploadMethod() throws Exception {

TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();

HttpUrlRequest request = createRequest(

- UploadTestServer.getEchoMethodURL(), listener);

+ NativeTestServer.getEchoMethodURL(), listener);

request.setUploadData("text/plain", UPLOAD_DATA.getBytes("UTF8"));

request.start();

listener.blockForComplete();

@@ -147,7 +147,7 @@ public class UploadTest extends CronetTestBase {

TestHttpUrlRequestListener listener =

new TestHttpUrlRequestListener();

HttpUrlRequest request = createRequest(

- UploadTestServer.getEchoMethodURL(), listener);

+ NativeTestServer.getEchoMethodURL(), listener);

request.setHttpMethod(uploadMethod);

request.setUploadData("text/plain", UPLOAD_DATA.getBytes("UTF8"));

request.start();

@@ -166,7 +166,7 @@ public class UploadTest extends CronetTestBase {

public void testUploadChannel() throws Exception {

TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();

HttpUrlRequest request = createRequest(

- UploadTestServer.getEchoBodyURL(), listener);

+ NativeTestServer.getEchoBodyURL(), listener);

setUploadChannel(request, "text/plain", UPLOAD_CHANNEL_DATA,

UPLOAD_CHANNEL_DATA.length());

request.start();

@@ -186,7 +186,7 @@ public class UploadTest extends CronetTestBase {

public void testUploadChannelWithRedirect() throws Exception {

TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();

HttpUrlRequest request = createRequest(

- UploadTestServer.getRedirectToEchoBody(), listener);

+ NativeTestServer.getRedirectToEchoBody(), listener);

setUploadChannel(request, "text/plain", UPLOAD_CHANNEL_DATA,

UPLOAD_CHANNEL_DATA.length());

request.start();

@@ -207,7 +207,7 @@ public class UploadTest extends CronetTestBase {

public void testUploadChannelWithReadError() throws Exception {

TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();

HttpUrlRequest request = createRequest(

- UploadTestServer.getEchoBodyURL(), listener);

+ NativeTestServer.getEchoBodyURL(), listener);

setUploadChannel(request, "text/plain", UPLOAD_CHANNEL_DATA,

UPLOAD_CHANNEL_DATA.length() + 2);

request.start();

@@ -228,7 +228,7 @@ public class UploadTest extends CronetTestBase {

TestHttpUrlRequestListener listener =

new TestHttpUrlRequestListener();

HttpUrlRequest request = createRequest(

- UploadTestServer.getEchoHeaderURL("Content-Type"),

+ NativeTestServer.getEchoHeaderURL("Content-Type"),

listener);

setUploadChannel(request, contentType, UPLOAD_CHANNEL_DATA,

UPLOAD_CHANNEL_DATA.length());

@@ -286,7 +286,7 @@ public class UploadTest extends CronetTestBase {

TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();

ChromiumUrlRequest request = (ChromiumUrlRequest) createRequest(

- UploadTestServer.getEchoBodyURL(), listener);

+ NativeTestServer.getEchoBodyURL(), listener);

request.setChunkedUpload("dangerous/crocodile");

try {

request.appendChunk(byteBuffer, false);