android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.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/ClientOnPageFinishedTest.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/AwSettingsTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.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/ClientOnPageFinishedTest.java

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

index 26a0fda611470c9462aa861f80c9b96091a76e5a..f418d0f42f3dab157eecb92759448fce8068c1c6 100644

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

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

@@ -118,9 +118,8 @@ public class ClientOnPageFinishedTest extends AwTestBase {

* 4. url2 onPageFinishedCalled

- TestWebServer webServer = null;

+ TestWebServer webServer = TestWebServer.start();

try {

- webServer = new TestWebServer(false);

final String redirectTargetPath = "/redirect_target.html";

final String redirectTargetUrl = webServer.setResponse(redirectTargetPath,

"<html><body>hello world</body></html>", null);

@@ -141,7 +140,7 @@ public class ClientOnPageFinishedTest extends AwTestBase {

// onPageFinished needs to be called for redirectTargetUrl, but not for redirectUrl

assertEquals(redirectTargetUrl, onPageFinishedHelper.getUrl());

} finally {

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

+ webServer.shutdown();

}

@@ -151,10 +150,8 @@ public class ClientOnPageFinishedTest extends AwTestBase {

TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =

mContentsClient.getOnPageFinishedHelper();

- TestWebServer webServer = null;

+ TestWebServer webServer = TestWebServer.start();

try {

- webServer = new TestWebServer(false);

final String testHtml = "<html><head>Header</head><body>Body</body></html>";

final String testPath = "/test.html";

final String syncPath = "/sync.html";

@@ -181,9 +178,8 @@ public class ClientOnPageFinishedTest extends AwTestBase {

onPageFinishedHelper.waitForCallback(synchronizationPageCallCount);

assertEquals(syncUrl, onPageFinishedHelper.getUrl());

assertEquals(2, onPageFinishedHelper.getCallCount());

} finally {

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

+ webServer.shutdown();

}

@@ -194,10 +190,8 @@ public class ClientOnPageFinishedTest extends AwTestBase {

mContentsClient.getOnPageFinishedHelper();

enableJavaScriptOnUiThread(mAwContents);

- TestWebServer webServer = null;

+ TestWebServer webServer = TestWebServer.start();

try {

- webServer = new TestWebServer(false);

final String testHtml = "<html><head>Header</head><body>Body</body></html>";

final String testPath = "/test.html";

final String historyPath = "/history.html";

@@ -223,9 +217,8 @@ public class ClientOnPageFinishedTest extends AwTestBase {

onPageFinishedHelper.waitForCallback(synchronizationPageCallCount);

assertEquals(syncUrl, onPageFinishedHelper.getUrl());

assertEquals(2, onPageFinishedHelper.getCallCount());

} finally {

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

+ webServer.shutdown();

}

@@ -248,10 +241,8 @@ public class ClientOnPageFinishedTest extends AwTestBase {

mContentsClient.getOnPageStartedHelper();

enableJavaScriptOnUiThread(mAwContents);

- TestWebServer webServer = null;

+ TestWebServer webServer = TestWebServer.start();

try {

- webServer = new TestWebServer(false);

final String testHtml = CommonResources.makeHtmlPageFrom("",

"<a href=\"#anchor\" id=\"link\">anchor</a>");

final String testPath = "/test.html";

@@ -282,7 +273,7 @@ public class ClientOnPageFinishedTest extends AwTestBase {

onPageFinishedHelper.waitForCallback(onPageFinishedCallCount);

assertEquals(onPageStartedCallCount, onPageStartedHelper.getCallCount());

} finally {

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

+ webServer.shutdown();

}