Changeset 141454 in webkit

Timestamp:

Jan 31, 2013, 11:40:14 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

WebFrameTest.DisambiguationPopup is failing
​https://bugs.webkit.org/show_bug.cgi?id=108160

Patch by Dan Alcantara <​dfalcantara@chromium.org> on 2013-01-31
Reviewed by Adam Barth.

Fix the unit test so that it is using the right HTML file.

• tests/WebFrameTest.cpp:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• tests/WebFrameTest.cpp (modified) (4 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-31  Dan Alcantara  <dfalcantara@chromium.org>
+
+        WebFrameTest.DisambiguationPopup is failing
+        https://bugs.webkit.org/show_bug.cgi?id=108160
+
+        Reviewed by Adam Barth.
+
+        Fix the unit test so that it is using the right HTML file.
+
+        * tests/WebFrameTest.cpp:
+
 2013-01-31  Tony Chang  <tony@chromium.org>
 

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

@@ -1800 +1800 @@
 }
 
-TEST_F(WebFrameTest, DISABLED_DisambiguationPopup)
-{
-    registerMockedHttpURLLoad("disambiguation_popup.html");
+TEST_F(WebFrameTest, DisambiguationPopup)
+{
+    const std::string htmlFile = "disambiguation_popup.html";
+    registerMockedHttpURLLoad(htmlFile);
 
     DisambiguationPopupTestWebViewClient client;
@@ -1808 +1809 @@
     // Make sure we initialize to minimum scale, even if the window size
     // only becomes available after the load begins.
-    WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup.html", true, 0, &client));
+    WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client));
     webViewImpl->resize(WebSize(1000, 1000));
     webViewImpl->layout();
@@ -1861 +1862 @@
 }
 
-TEST_F(WebFrameTest, DISABLED_DisambiguationPopupMobileSite)
-{
-    registerMockedHttpURLLoad("disambiguation_popup_mobile_site.html");
+TEST_F(WebFrameTest, DisambiguationPopupMobileSite)
+{
+    const std::string htmlFile = "disambiguation_popup_mobile_site.html";
+    registerMockedHttpURLLoad(htmlFile);
 
     DisambiguationPopupTestWebViewClient client;
@@ -1869 +1871 @@
     // Make sure we initialize to minimum scale, even if the window size
     // only becomes available after the load begins.
-    WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup.html", true, 0, &client));
+    WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client));
     webViewImpl->resize(WebSize(1000, 1000));
     webViewImpl->layout();