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

Unified Diff: webkit/glue/bookmarklet_unittest.cc

Issue 10913286: Convert test_shell_tests BookmarkletTest.* into a content_browsertest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « content/content_tests.gypi ('k') | webkit/tools/test_shell/test_shell.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/bookmarklet_unittest.cc
diff --git a/webkit/glue/bookmarklet_unittest.cc b/webkit/glue/bookmarklet_unittest.cc
deleted file mode 100644
index d7fada519c193323395178ddcb999112c6efde30..0000000000000000000000000000000000000000
--- a/webkit/glue/bookmarklet_unittest.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/file_util.h"
-#include "base/message_loop.h"
-#include "base/path_service.h"
-#include "base/string_util.h"
-#include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/tools/test_shell/test_shell_test.h"
-
-namespace {
-
-class BookmarkletTest : public TestShellTest {
- public:
- virtual void SetUp() {
- TestShellTest::SetUp();
-
- test_shell_->LoadURL(GURL("data:text/html,start page"));
- test_shell_->WaitTestFinished();
- }
-};
-
-TEST_F(BookmarkletTest, Redirect) {
- test_shell_->LoadURL(
- GURL("javascript:location.href='data:text/plain,SUCCESS'"));
- test_shell_->WaitTestFinished();
- string16 text = test_shell_->GetDocumentText();
- EXPECT_EQ("SUCCESS", UTF16ToASCII(text));
-}
-
-TEST_F(BookmarkletTest, RedirectVoided) {
- // This test should be redundant with the Redirect test above. The point
- // here is to emphasize that in either case the assignment to location during
- // the evaluation of the script should suppress loading the script result.
- // Here, because of the void() wrapping there is no script result.
- test_shell_->LoadURL(
- GURL("javascript:void(location.href='data:text/plain,SUCCESS')"));
- test_shell_->WaitTestFinished();
- string16 text = test_shell_->GetDocumentText();
- EXPECT_EQ("SUCCESS", UTF16ToASCII(text));
-}
-
-TEST_F(BookmarkletTest, NonEmptyResult) {
- string16 text;
-
- // TODO(darin): This test fails in a JSC build. WebCore+JSC does not really
- // need to support this usage until WebCore supports javascript: URLs that
- // generate content (https://bugs.webkit.org/show_bug.cgi?id=14959). It is
- // important to note that Safari does not support bookmarklets, and this is
- // really an edge case. Our behavior with V8 is consistent with FF and IE.
-#if 0
- test_shell_->LoadURL(L"javascript:false");
- MessageLoop::current()->RunAllPending();
- text = test_shell_->GetDocumentText();
- EXPECT_EQ("false", UTF16ToASCII(text));
-#endif
-
- test_shell_->LoadURL(GURL("javascript:'hello world'"));
- MessageLoop::current()->RunAllPending();
- text = test_shell_->GetDocumentText();
- EXPECT_EQ("hello world", UTF16ToASCII(text));
-}
-
-TEST_F(BookmarkletTest, DocumentWrite) {
- test_shell_->LoadURL(GURL(
- "javascript:document.open();"
- "document.write('hello world');"
- "document.close()"));
- MessageLoop::current()->RunAllPending();
- string16 text = test_shell_->GetDocumentText();
- EXPECT_EQ("hello world", UTF16ToASCII(text));
-}
-
-} // namespace
« no previous file with comments | « content/content_tests.gypi ('k') | webkit/tools/test_shell/test_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698