| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.android_webview.test; | 5 package org.chromium.android_webview.test; |
| 6 | 6 |
| 7 import android.os.Build; | 7 import android.os.Build; |
| 8 import android.test.suitebuilder.annotation.SmallTest; | 8 import android.test.suitebuilder.annotation.SmallTest; |
| 9 import android.util.Pair; | 9 import android.util.Pair; |
| 10 | 10 |
| 11 import org.apache.http.Header; | 11 import org.apache.http.Header; |
| 12 import org.apache.http.HttpRequest; | 12 import org.apache.http.HttpRequest; |
| 13 import org.chromium.android_webview.AwContents; | 13 import org.chromium.android_webview.AwContents; |
| 14 import org.chromium.android_webview.AwSettings; | 14 import org.chromium.android_webview.AwSettings; |
| 15 import org.chromium.android_webview.test.util.CommonResources; | 15 import org.chromium.android_webview.test.util.CommonResources; |
| 16 import org.chromium.android_webview.test.util.JSUtils; | 16 import org.chromium.android_webview.test.util.JSUtils; |
| 17 import org.chromium.base.annotations.SuppressFBWarnings; |
| 17 import org.chromium.base.test.util.Feature; | 18 import org.chromium.base.test.util.Feature; |
| 18 import org.chromium.base.test.util.MinAndroidSdkLevel; | 19 import org.chromium.base.test.util.MinAndroidSdkLevel; |
| 19 import org.chromium.content.browser.test.util.CallbackHelper; | 20 import org.chromium.content.browser.test.util.CallbackHelper; |
| 20 import org.chromium.content.browser.test.util.HistoryUtils; | 21 import org.chromium.content.browser.test.util.HistoryUtils; |
| 21 import org.chromium.content_public.browser.LoadUrlParams; | 22 import org.chromium.content_public.browser.LoadUrlParams; |
| 22 import org.chromium.net.test.util.TestWebServer; | 23 import org.chromium.net.test.util.TestWebServer; |
| 23 | 24 |
| 24 import java.util.ArrayList; | 25 import java.util.ArrayList; |
| 25 import java.util.HashMap; | 26 import java.util.HashMap; |
| 26 import java.util.List; | 27 import java.util.List; |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 validateRequestHeaders(extraHeaders, webServer.getLastRequest(path))
; | 234 validateRequestHeaders(extraHeaders, webServer.getLastRequest(path))
; |
| 234 | 235 |
| 235 reloadSync(awContents, contentsClient.getOnPageFinishedHelper()); | 236 reloadSync(awContents, contentsClient.getOnPageFinishedHelper()); |
| 236 assertEquals(2, webServer.getRequestCount(path)); | 237 assertEquals(2, webServer.getRequestCount(path)); |
| 237 validateRequestHeaders(extraHeaders, webServer.getLastRequest(path))
; | 238 validateRequestHeaders(extraHeaders, webServer.getLastRequest(path))
; |
| 238 } finally { | 239 } finally { |
| 239 webServer.shutdown(); | 240 webServer.shutdown(); |
| 240 } | 241 } |
| 241 } | 242 } |
| 242 | 243 |
| 244 @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") |
| 243 @SmallTest | 245 @SmallTest |
| 244 @Feature({"AndroidWebView"}) | 246 @Feature({"AndroidWebView"}) |
| 245 public void testRedirectAndReloadWithExtraHeaders() throws Throwable { | 247 public void testRedirectAndReloadWithExtraHeaders() throws Throwable { |
| 246 final TestAwContentsClient contentsClient = new TestAwContentsClient(); | 248 final TestAwContentsClient contentsClient = new TestAwContentsClient(); |
| 247 final AwTestContainerView testContainerView = | 249 final AwTestContainerView testContainerView = |
| 248 createAwTestContainerViewOnMainSync(contentsClient); | 250 createAwTestContainerViewOnMainSync(contentsClient); |
| 249 final AwContents awContents = testContainerView.getAwContents(); | 251 final AwContents awContents = testContainerView.getAwContents(); |
| 250 | 252 |
| 251 TestWebServer webServer = TestWebServer.start(); | 253 TestWebServer webServer = TestWebServer.start(); |
| 252 try { | 254 try { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 271 // WebView will only reload the main page. | 273 // WebView will only reload the main page. |
| 272 reloadSync(awContents, contentsClient.getOnPageFinishedHelper()); | 274 reloadSync(awContents, contentsClient.getOnPageFinishedHelper()); |
| 273 assertEquals(2, webServer.getRequestCount(path)); | 275 assertEquals(2, webServer.getRequestCount(path)); |
| 274 // No extra headers. This is consistent with legacy behavior. | 276 // No extra headers. This is consistent with legacy behavior. |
| 275 validateNoRequestHeaders(extraHeaders, webServer.getLastRequest(path
)); | 277 validateNoRequestHeaders(extraHeaders, webServer.getLastRequest(path
)); |
| 276 } finally { | 278 } finally { |
| 277 webServer.shutdown(); | 279 webServer.shutdown(); |
| 278 } | 280 } |
| 279 } | 281 } |
| 280 | 282 |
| 283 @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") |
| 281 @SmallTest | 284 @SmallTest |
| 282 @Feature({"AndroidWebView"}) | 285 @Feature({"AndroidWebView"}) |
| 283 public void testRendererNavigationAndGoBackWithExtraHeaders() throws Throwab
le { | 286 public void testRendererNavigationAndGoBackWithExtraHeaders() throws Throwab
le { |
| 284 final TestAwContentsClient contentsClient = new TestAwContentsClient(); | 287 final TestAwContentsClient contentsClient = new TestAwContentsClient(); |
| 285 final AwTestContainerView testContainerView = | 288 final AwTestContainerView testContainerView = |
| 286 createAwTestContainerViewOnMainSync(contentsClient); | 289 createAwTestContainerViewOnMainSync(contentsClient); |
| 287 final AwContents awContents = testContainerView.getAwContents(); | 290 final AwContents awContents = testContainerView.getAwContents(); |
| 288 final AwSettings settings = getAwSettingsOnUiThread(awContents); | 291 final AwSettings settings = getAwSettingsOnUiThread(awContents); |
| 289 settings.setJavaScriptEnabled(true); | 292 settings.setJavaScriptEnabled(true); |
| 290 | 293 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 HistoryUtils.goBackSync(getInstrumentation(), | 325 HistoryUtils.goBackSync(getInstrumentation(), |
| 323 awContents.getWebContents(), | 326 awContents.getWebContents(), |
| 324 contentsClient.getOnPageFinishedHelper()); | 327 contentsClient.getOnPageFinishedHelper()); |
| 325 assertEquals(2, webServer.getRequestCount(path)); | 328 assertEquals(2, webServer.getRequestCount(path)); |
| 326 validateRequestHeaders(extraHeaders, webServer.getLastRequest(path))
; | 329 validateRequestHeaders(extraHeaders, webServer.getLastRequest(path))
; |
| 327 } finally { | 330 } finally { |
| 328 webServer.shutdown(); | 331 webServer.shutdown(); |
| 329 } | 332 } |
| 330 } | 333 } |
| 331 } | 334 } |
| OLD | NEW |