android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java - Issue 568873002: Start server thread in new TestWebServer.start() method rather than constructor

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

Issue 568873002: Start server thread in new TestWebServer.start() method rather than constructor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: silence findbugs static assignment warning Created 6 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

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientVisitedHistoryTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

index 53185ce14e5c8777d46f5de8faccbcb966176728..68ff13726c702fd5213f52ca183947b3898441bd 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

@@ -207,9 +207,8 @@ public class AwContentsTest extends AwTestBase {

createAwTestContainerViewOnMainSync(mContentsClient);

final AwContents awContents = testContainer.getAwContents();

- TestWebServer webServer = null;

+ TestWebServer webServer = TestWebServer.start();

try {

- webServer = new TestWebServer(false);

final String pagePath = "/clear_cache_test.html";

List<Pair<String, String>> headers = new ArrayList<Pair<String, String>>();

// Set Cache-Control headers to cache this request. One century should be long enough.

@@ -249,7 +248,7 @@ public class AwContentsTest extends AwTestBase {

pageUrl);

assertEquals(2, webServer.getRequestCount(pagePath));

} finally {

- if (webServer != null) webServer.shutdown();

+ webServer.shutdown();

}

@@ -277,10 +276,8 @@ public class AwContentsTest extends AwTestBase {

final AwTestContainerView testView = createAwTestContainerViewOnMainSync(mContentsClient);

final AwContents awContents = testView.getAwContents();

- TestWebServer webServer = null;

+ TestWebServer webServer = TestWebServer.start();

try {

- webServer = new TestWebServer(false);

final String faviconUrl = webServer.setResponseBase64(

"/" + CommonResources.FAVICON_FILENAME, CommonResources.FAVICON_DATA_BASE64,

CommonResources.getImagePngHeaders(false));

@@ -310,7 +307,7 @@ public class AwContentsTest extends AwTestBase {

assertTrue(awContents.getFavicon().sameAs(originalFavicon));

} finally {

- if (webServer != null) webServer.shutdown();

+ webServer.shutdown();

}

@@ -329,9 +326,8 @@ public class AwContentsTest extends AwTestBase {

downloadHeaders.add(Pair.create("Content-Type", mimeType));

downloadHeaders.add(Pair.create("Content-Length", Integer.toString(data.length())));

- TestWebServer webServer = null;

+ TestWebServer webServer = TestWebServer.start();

try {

- webServer = new TestWebServer(false);

final String pageUrl = webServer.setResponse(

"/download.txt", data, downloadHeaders);

final OnDownloadStartHelper downloadStartHelper =

@@ -345,7 +341,7 @@ public class AwContentsTest extends AwTestBase {

assertEquals(mimeType, downloadStartHelper.getMimeType());

assertEquals(data.length(), downloadStartHelper.getContentLength());

} finally {

- if (webServer != null) webServer.shutdown();

+ webServer.shutdown();

}

@@ -433,9 +429,8 @@ public class AwContentsTest extends AwTestBase {

createAwTestContainerViewOnMainSync(mContentsClient);

final AwContents awContents = testContainer.getAwContents();

- TestWebServer webServer = null;

+ TestWebServer webServer = TestWebServer.start();

try {

- webServer = new TestWebServer(false);

final String pagePath = "/test_can_inject_headers.html";

final String pageUrl = webServer.setResponse(

pagePath, "<html><body>foo</body></html>", null);

@@ -458,7 +453,7 @@ public class AwContentsTest extends AwTestBase {

assertEquals(value.getValue(), matchingHeaders[0].getValue());

}

} finally {

- if (webServer != null) webServer.shutdown();

+ webServer.shutdown();

}