Changeset 135409 in webkit

Timestamp:

Nov 21, 2012, 9:17:07 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

IDBRequestTest needs a v8 context
​https://bugs.webkit.org/show_bug.cgi?id=102941

Patch by Dan Carney <​dcarney@google.com> on 2012-11-21
Reviewed by Jochen Eisinger.

Added v8 context to IDBRequestTest tests.

• tests/IDBRequestTest.cpp:

(IDBRequestTest):
(WebKit::IDBRequestTest::IDBRequestTest):
(WebKit::IDBRequestTest::context):
(WebKit::IDBRequestTest::scriptExecutionContext):
(WebKit):
(WebKit::TEST_F):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• tests/IDBRequestTest.cpp (modified) (3 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-11-21  Dan Carney  <dcarney@google.com>
+
+        IDBRequestTest needs a v8 context
+        https://bugs.webkit.org/show_bug.cgi?id=102941
+
+        Reviewed by Jochen Eisinger.
+
+        Added v8 context to IDBRequestTest tests.
+
+        * tests/IDBRequestTest.cpp:
+        (IDBRequestTest):
+        (WebKit::IDBRequestTest::IDBRequestTest):
+        (WebKit::IDBRequestTest::context):
+        (WebKit::IDBRequestTest::scriptExecutionContext):
+        (WebKit):
+        (WebKit::TEST_F):
+
 2012-11-21  Peter Beverloo  <peter@chromium.org>
 

trunk/Source/WebKit/chromium/tests/IDBRequestTest.cpp

@@ -29 +29 @@
 
 #include "DOMStringList.h"
+#include "Document.h"
+#include "Frame.h"
+#include "FrameTestHelpers.h"
 #include "IDBCursorBackendInterface.h"
 #include "IDBDatabaseBackendImpl.h"
 #include "IDBTransactionCoordinator.h"
+#include "WebFrame.h"
+#include "WebFrameImpl.h"
+#include "WebView.h"
 
 #include <gtest/gtest.h>
@@ -38 +44 @@
 
 using namespace WebCore;
+using namespace WebKit;
 
 namespace {
 
-TEST(IDBRequestTest, EventsAfterStopping)
+class IDBRequestTest : public testing::Test {
+public:
+    IDBRequestTest()
+        : m_webView(0)
+    {
+    }
+
+    void SetUp() OVERRIDE
+    {
+        m_webView = FrameTestHelpers::createWebViewAndLoad("about:blank");
+        m_webView->setFocus(true);
+    }
+
+    void TearDown() OVERRIDE
+    {
+        m_webView->close();
+    }
+
+    v8::Handle<v8::Context> context()
+    {
+        return static_cast<WebFrameImpl*>(m_webView->mainFrame())->frame()->script()->mainWorldContext();
+    }
+
+    ScriptExecutionContext* scriptExecutionContext()
+    {
+        return static_cast<WebFrameImpl*>(m_webView->mainFrame())->frame()->document();
+    }
+
+private:
+    WebView* m_webView;
+};
+
+TEST_F(IDBRequestTest, EventsAfterStopping)
 {
-    ScriptExecutionContext* context = 0;
+    v8::HandleScope handleScope;
+    v8::Context::Scope scope(context());
+
     IDBTransaction* transaction = 0;
-    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::createInvalid(), transaction);
+    RefPtr<IDBRequest> request = IDBRequest::create(scriptExecutionContext(), IDBAny::createInvalid(), transaction);
     EXPECT_EQ(request->readyState(), "pending");
     request->stop();
@@ -60 +101 @@
 }
 
-TEST(IDBRequestTest, AbortErrorAfterAbort)
+TEST_F(IDBRequestTest, AbortErrorAfterAbort)
 {
-    ScriptExecutionContext* context = 0;
+    v8::HandleScope handleScope;
+    v8::Context::Scope scope(context());
+
     IDBTransaction* transaction = 0;
-    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::createInvalid(), transaction);
+    RefPtr<IDBRequest> request = IDBRequest::create(scriptExecutionContext(), IDBAny::createInvalid(), transaction);
     EXPECT_EQ(request->readyState(), "pending");