Changeset 133916 in webkit

Timestamp:

Nov 8, 2012 10:33:22 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Cleanup IDBBindingUtilitiesTest
​https://bugs.webkit.org/show_bug.cgi?id=100860

Patch by Dan Carney <​dcarney@google.com> on 2012-11-08
Reviewed by Adam Barth.

Small cleanup of IDBBindingUtilitiesTest as per
​https://bugs.webkit.org/show_bug.cgi?id=99975#c38

• tests/IDBBindingUtilitiesTest.cpp:

(IDBKeyFromValueAndKeyPathTest):
(WebKit::IDBKeyFromValueAndKeyPathTest::IDBKeyFromValueAndKeyPathTest):
(WebKit::IDBKeyFromValueAndKeyPathTest::context):
(WebKit):
(WebKit::TEST_F):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• tests/IDBBindingUtilitiesTest.cpp (modified) (5 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-11-08  Dan Carney  <dcarney@google.com>
+
+        Cleanup IDBBindingUtilitiesTest
+        https://bugs.webkit.org/show_bug.cgi?id=100860
+
+        Reviewed by Adam Barth.
+
+        Small cleanup of IDBBindingUtilitiesTest as per
+        https://bugs.webkit.org/show_bug.cgi?id=99975#c38
+
+        * tests/IDBBindingUtilitiesTest.cpp:
+        (IDBKeyFromValueAndKeyPathTest):
+        (WebKit::IDBKeyFromValueAndKeyPathTest::IDBKeyFromValueAndKeyPathTest):
+        (WebKit::IDBKeyFromValueAndKeyPathTest::context):
+        (WebKit):
+        (WebKit::TEST_F):
+
 2012-11-08  Keishi Hattori  <keishi@webkit.org>
 

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

@@ -100 +100 @@
 }
 
-static v8::Handle<v8::Context> context()
-{
-    static WebView* webView;
-    if (!webView) {
-        webView = FrameTestHelpers::createWebViewAndLoad("about:blank");
-        webView->setFocus(true);
-    }
-    ScriptExecutionContext* context = static_cast<WebFrameImpl*>(webView->mainFrame())->frame()->document();
-    return toV8Context(context, WorldContextHandle(UseCurrentWorld));
-}
-
-TEST(IDBKeyFromValueAndKeyPathTest, TopLevelPropertyStringValue)
+class IDBKeyFromValueAndKeyPathTest : public testing::Test {
+public:
+    IDBKeyFromValueAndKeyPathTest()
+        : 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();
+    }
+
+private:
+    WebView* m_webView;
+};
+
+TEST_F(IDBKeyFromValueAndKeyPathTest, TopLevelPropertyStringValue)
 {
     v8::HandleScope handleScope;
@@ -125 +141 @@
 }
 
-TEST(IDBKeyFromValueAndKeyPathTest, TopLevelPropertyNumberValue)
+TEST_F(IDBKeyFromValueAndKeyPathTest, TopLevelPropertyNumberValue)
 {
     v8::HandleScope handleScope;
@@ -139 +155 @@
 }
 
-TEST(IDBKeyFromValueAndKeyPathTest, SubProperty)
+TEST_F(IDBKeyFromValueAndKeyPathTest, SubProperty)
 {
     v8::HandleScope handleScope;
@@ -155 +171 @@
 }
 
-TEST(InjectIDBKeyTest, TopLevelPropertyStringValue)
+class InjectIDBKeyTest : public IDBKeyFromValueAndKeyPathTest {
+};
+
+TEST_F(InjectIDBKeyTest, TopLevelPropertyStringValue)
 {
     v8::HandleScope handleScope;
@@ -170 +189 @@
 }
 
-TEST(InjectIDBKeyTest, SubProperty)
+TEST_F(InjectIDBKeyTest, SubProperty)
 {
     v8::HandleScope handleScope;