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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 508233002: Always close the server in finally block. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix my bug... Created 6 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index ea0f68a74bb3ef083d756ac2311d9ff09a8baba1..a62f663837c760a6c1547928f3f8e158a02b0ba0 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -2778,42 +2778,50 @@ public class AwSettingsTest extends AwTestBase {
awSettings.setJavaScriptEnabled(true);
- TestWebServer httpsServer = new TestWebServer(true);
- TestWebServer httpServer = new TestWebServer(false);
+ TestWebServer httpsServer = null;
+ TestWebServer httpServer = null;
+ try {
+ httpsServer = new TestWebServer(true);
+ httpServer = new TestWebServer(false);
- final String JS_URL = "/insecure.js";
- final String IMG_URL = "/insecure.png";
- final String SECURE_URL = "/secure.html";
- httpServer.setResponse(JS_URL, "window.loaded_js = 42;", null);
- httpServer.setResponseBase64(IMG_URL, CommonResources.FAVICON_DATA_BASE64, null);
+ final String JS_URL = "/insecure.js";
+ final String IMG_URL = "/insecure.png";
+ final String SECURE_URL = "/secure.html";
+ httpServer.setResponse(JS_URL, "window.loaded_js = 42;", null);
+ httpServer.setResponseBase64(IMG_URL, CommonResources.FAVICON_DATA_BASE64, null);
- final String JS_HTML = "<script src=\"" + httpServer.getResponseUrl(JS_URL) +
+ final String JS_HTML = "<script src=\"" + httpServer.getResponseUrl(JS_URL) +
"\"></script>";
- final String IMG_HTML = "<img src=\"" + httpServer.getResponseUrl(IMG_URL) + "\" />";
- final String SECURE_HTML = "<body>" + IMG_HTML + " " + JS_HTML + "</body>";
-
- String secureUrl = httpsServer.setResponse(SECURE_URL, SECURE_HTML, null);
-
- awSettings.setMixedContentMode(AwSettings.MIXED_CONTENT_NEVER_ALLOW);
- loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), secureUrl);
- assertEquals(1, httpsServer.getRequestCount(SECURE_URL));
- assertEquals(0, httpServer.getRequestCount(JS_URL));
- assertEquals(0, httpServer.getRequestCount(IMG_URL));
-
- awSettings.setMixedContentMode(AwSettings.MIXED_CONTENT_ALWAYS_ALLOW);
- loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), secureUrl);
- assertEquals(2, httpsServer.getRequestCount(SECURE_URL));
- assertEquals(1, httpServer.getRequestCount(JS_URL));
- assertEquals(1, httpServer.getRequestCount(IMG_URL));
-
- awSettings.setMixedContentMode(AwSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
- loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), secureUrl);
- assertEquals(3, httpsServer.getRequestCount(SECURE_URL));
- assertEquals(1, httpServer.getRequestCount(JS_URL));
- assertEquals(2, httpServer.getRequestCount(IMG_URL));
-
- httpServer.shutdown();
- httpsServer.shutdown();
+ final String IMG_HTML = "<img src=\"" + httpServer.getResponseUrl(IMG_URL) + "\" />";
+ final String SECURE_HTML = "<body>" + IMG_HTML + " " + JS_HTML + "</body>";
+
+ String secureUrl = httpsServer.setResponse(SECURE_URL, SECURE_HTML, null);
+
+ awSettings.setMixedContentMode(AwSettings.MIXED_CONTENT_NEVER_ALLOW);
+ loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), secureUrl);
+ assertEquals(1, httpsServer.getRequestCount(SECURE_URL));
+ assertEquals(0, httpServer.getRequestCount(JS_URL));
+ assertEquals(0, httpServer.getRequestCount(IMG_URL));
+
+ awSettings.setMixedContentMode(AwSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+ loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), secureUrl);
+ assertEquals(2, httpsServer.getRequestCount(SECURE_URL));
+ assertEquals(1, httpServer.getRequestCount(JS_URL));
+ assertEquals(1, httpServer.getRequestCount(IMG_URL));
+
+ awSettings.setMixedContentMode(AwSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
+ loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), secureUrl);
+ assertEquals(3, httpsServer.getRequestCount(SECURE_URL));
+ assertEquals(1, httpServer.getRequestCount(JS_URL));
+ assertEquals(2, httpServer.getRequestCount(IMG_URL));
+ } finally {
+ if (httpServer != null) {
+ httpServer.shutdown();
+ }
+ if (httpsServer != null) {
+ httpsServer.shutdown();
+ }
+ }
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698