summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/data
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-10 20:47:06 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-10 20:47:06 +0000
commitdfd0c37f0ec380ee391cfec4494232ce7029d23d (patch)
tree4134522ed7cf8a59148ba38c24a00f194e7f5db4 /chrome_frame/test/data
parent6d11ff807a6e0d3f0e769dc8587da281230c9e89 (diff)
downloadchromium_src-dfd0c37f0ec380ee391cfec4494232ce7029d23d.zip
chromium_src-dfd0c37f0ec380ee391cfec4494232ce7029d23d.tar.gz
chromium_src-dfd0c37f0ec380ee391cfec4494232ce7029d23d.tar.bz2
Adding error handling to DeleteCookie test.
TEST=none TBR=ananta BUG=none Review URL: http://codereview.chromium.org/2000007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/data')
-rw-r--r--chrome_frame/test/data/fulltab_delete_cookie_test.html29
1 files changed, 16 insertions, 13 deletions
diff --git a/chrome_frame/test/data/fulltab_delete_cookie_test.html b/chrome_frame/test/data/fulltab_delete_cookie_test.html
index 975d290..c8909a5 100644
--- a/chrome_frame/test/data/fulltab_delete_cookie_test.html
+++ b/chrome_frame/test/data/fulltab_delete_cookie_test.html
@@ -4,8 +4,7 @@
<title>FullTab mode cookie deletion test</title>
</head>
- <script type="text/javascript"
- src="chrome_frame_tester_helpers.js"></script>
+ <script type="text/javascript" src="chrome_frame_tester_helpers.js"></script>
<script type="text/javascript">
function onLoad() {
@@ -20,19 +19,23 @@
// "CF_FullTabDeleteCookie=1".
// Then erase the first cookie and validate that it no longer contains
// this string.
- var original_cookies = document.cookie;
- var cookie_found = /CF_FullTabDeleteCookie=1/.test(document.cookie);
- if (cookie_found) {
- eraseCookie("CF_FullTabDeleteCookie");
- cookie_found = /CF_FullTabDeleteCookie=1/.test(document.cookie);
- if (!cookie_found) {
- onSuccess("FullTab_DeleteCookieTest", 1);
+ try {
+ var original_cookies = document.cookie;
+ var cookie_found = /CF_FullTabDeleteCookie=1/.test(document.cookie);
+ if (cookie_found) {
+ eraseCookie("CF_FullTabDeleteCookie");
+ cookie_found = /CF_FullTabDeleteCookie=1/.test(document.cookie);
+ if (!cookie_found) {
+ onSuccess("FullTab_DeleteCookieTest", 1);
+ } else {
+ onFailure("FullTab_DeleteCookieTest", 1,
+ "CF_FullTabDeleteCookie still exists: " + original_cookies);
+ }
} else {
- onFailure("FullTab_DeleteCookieTest", 1,
- "CF_FullTabDeleteCookie still exists: " + original_cookies);
+ onFailure("FullTab_DeleteCookieTest", 1, "Expected cookies not set");
}
- } else {
- onFailure("FullTab_DeleteCookieTest", 1, "Expected cookies not set");
+ } catch (e) {
+ onFailure("FullTab_DeleteCookieTest", 1, "exception: " + e.description);
}
}
</script>