diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 14:07:43 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 14:07:43 +0000 |
| commit | bbdaed3eb825b3dca34c6101c58fb8a1c0c84e55 (patch) | |
| tree | 549dd326fecf3bd2d6d78567f6492bf36930b746 /android_webview/javatests | |
| parent | 252147f6971447a2bd97e50a7d3684fe3c2584d5 (diff) | |
| download | chromium_src-bbdaed3eb825b3dca34c6101c58fb8a1c0c84e55.zip chromium_src-bbdaed3eb825b3dca34c6101c58fb8a1c0c84e55.tar.gz chromium_src-bbdaed3eb825b3dca34c6101c58fb8a1c0c84e55.tar.bz2 | |
[Android WebView] Update cross-origin tests after Blink's r154376
Finally, an exception is being thrown on attempts of cross-origin
window.location access, so update the tests accordingly.
BUG=261409
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/19771002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/javatests')
2 files changed, 23 insertions, 31 deletions
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 a8b53f9..4e2b8dc 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 @@ -550,9 +550,7 @@ public class AwSettingsTest extends AwTestBase { } class AwSettingsUniversalAccessFromFilesTestHelper extends AwSettingsTestHelper<Boolean> { - // TODO(mnaganov): Change to "Exception" once - // https://bugs.webkit.org/show_bug.cgi?id=43504 is fixed. - private static final String ACCESS_DENIED_TITLE = "undefined"; + private static final String ACCESS_DENIED_TITLE = "Exception"; AwSettingsUniversalAccessFromFilesTestHelper( AwContents awContents, @@ -601,9 +599,7 @@ public class AwSettingsTest extends AwTestBase { } class AwSettingsFileAccessFromFilesIframeTestHelper extends AwSettingsTestHelper<Boolean> { - // TODO(mnaganov): Change to "Exception" once - // https://bugs.webkit.org/show_bug.cgi?id=43504 is fixed. - private static final String ACCESS_DENIED_TITLE = "undefined"; + private static final String ACCESS_DENIED_TITLE = "Exception"; AwSettingsFileAccessFromFilesIframeTestHelper( AwContents awContents, @@ -1625,12 +1621,8 @@ public class AwSettingsTest extends AwTestBase { helper.ensureSettingHasInitialValue(); } - /** - * @SmallTest - * @Feature({"AndroidWebView", "Preferences"}) - * crbug.com/261409 - */ - @DisabledTest + @SmallTest + @Feature({"AndroidWebView", "Preferences"}) public void testUniversalAccessFromFilesWithTwoViews() throws Throwable { ViewPair views = createViews(); runPerViewSettingsTest( @@ -1659,12 +1651,8 @@ public class AwSettingsTest extends AwTestBase { assertEquals(imageHeight, getTitleOnUiThread(awContents)); } - /** - * @SmallTest - * @Feature({"AndroidWebView", "Preferences"}) - * crbug.com/261409 - */ - @DisabledTest + @SmallTest + @Feature({"AndroidWebView", "Preferences"}) public void testFileAccessFromFilesIframeWithTwoViews() throws Throwable { ViewPair views = createViews(); runPerViewSettingsTest( diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java index 4244201..365645d 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java @@ -82,10 +82,20 @@ public class LoadDataWithBaseUrlTest extends AwTestBase { private String getCrossOriginAccessTestPageHtml(final String iframeUrl) { return "<html>" + - " <body onload=\"" + - " document.title=document.getElementById('frame').contentWindow.location.href;" + - " \">" + - " <iframe id='frame' src='" + iframeUrl + "'>" + + " <head>" + + " <script>" + + " function onload() {" + + " try {" + + " document.title = " + + " document.getElementById('frame').contentWindow.location.href;" + + " } catch (e) {" + + " document.title = 'Exception';" + + " }" + + " }" + + " </script>" + + " </head>" + + " <body onload='onload()'>" + + " <iframe id='frame' src='" + iframeUrl + "'></iframe>" + " </body>" + "</html>"; } @@ -153,12 +163,8 @@ public class LoadDataWithBaseUrlTest extends AwTestBase { } } - /** - * @SmallTest - * @Feature({"AndroidWebView"}) - * crbug.com/261409 - */ - @DisabledTest + @SmallTest + @Feature({"AndroidWebView"}) public void testCrossOrigin() throws Throwable { TestWebServer webServer = null; try { @@ -171,9 +177,7 @@ public class LoadDataWithBaseUrlTest extends AwTestBase { getAwSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true); loadDataWithBaseUrlSync(html, "text/html", false, baseUrl, null); - // TODO(mnaganov): Catch a security exception and set the title accordingly, - // once https://bugs.webkit.org/show_bug.cgi?id=43504 is fixed. - assertEquals("undefined", getTitleOnUiThread(mAwContents)); + assertEquals("Exception", getTitleOnUiThread(mAwContents)); } finally { if (webServer != null) webServer.shutdown(); |