Modified: branches/chromium/963/Source/WebKit/chromium/WebKit.gyp (102686 => 102687)
--- branches/chromium/963/Source/WebKit/chromium/WebKit.gyp 2011-12-13 18:12:45 UTC (rev 102686)
+++ branches/chromium/963/Source/WebKit/chromium/WebKit.gyp 2011-12-13 18:19:59 UTC (rev 102687)
@@ -729,6 +729,7 @@
'tests/WebFrameTest.cpp',
'tests/WebPageNewSerializerTest.cpp',
'tests/WebPageSerializerTest.cpp',
+ 'tests/WebViewTest.cpp',
],
'conditions': [
['OS=="win" or OS=="mac"', {
Modified: branches/chromium/963/Source/WebKit/chromium/WebKit.gypi (102686 => 102687)
--- branches/chromium/963/Source/WebKit/chromium/WebKit.gypi 2011-12-13 18:12:45 UTC (rev 102686)
+++ branches/chromium/963/Source/WebKit/chromium/WebKit.gypi 2011-12-13 18:19:59 UTC (rev 102687)
@@ -70,6 +70,8 @@
'tests/CCSchedulerTestCommon.h',
'tests/CCThreadTaskTest.cpp',
'tests/FloatQuadTest.cpp',
+ 'tests/FrameTestHelpers.cpp',
+ 'tests/FrameTestHelpers.h',
'tests/IDBBindingUtilitiesTest.cpp',
'tests/IDBKeyPathTest.cpp',
'tests/IDBLevelDBCodingTest.cpp',
@@ -94,6 +96,7 @@
'tests/WebPageNewSerializerTest.cpp',
'tests/WebPageSerializerTest.cpp',
'tests/WebURLRequestTest.cpp',
+ 'tests/WebViewTest.cpp',
],
'conditions': [
Modified: branches/chromium/963/Source/WebKit/chromium/tests/WebFrameTest.cpp (102686 => 102687)
--- branches/chromium/963/Source/WebKit/chromium/tests/WebFrameTest.cpp 2011-12-13 18:12:45 UTC (rev 102686)
+++ branches/chromium/963/Source/WebKit/chromium/tests/WebFrameTest.cpp 2011-12-13 18:19:59 UTC (rev 102687)
@@ -30,6 +30,7 @@
#include "config.h"
+#include "FrameTestHelpers.h"
#include "ResourceError.h"
#include "WebDocument.h"
#include "WebFormElement.h"
@@ -39,14 +40,8 @@
#include "WebSearchableFormData.h"
#include "WebSecurityPolicy.h"
#include "WebSettings.h"
-#include "WebString.h"
-#include "WebURL.h"
-#include "WebURLRequest.h"
-#include "WebURLResponse.h"
-#include "WebViewClient.h"
#include "WebViewImpl.h"
#include "v8.h"
-#include <googleurl/src/gurl.h>
#include <gtest/gtest.h>
#include <webkit/support/webkit_support.h>
@@ -57,8 +52,8 @@
class WebFrameTest : public testing::Test {
public:
WebFrameTest()
- : baseURL("http://www.test.com/"),
- chromeURL("chrome://")
+ : m_baseURL("http://www.test.com/"),
+ m_chromeURL("chrome://")
{
}
@@ -69,61 +64,19 @@
void registerMockedHttpURLLoad(const std::string& fileName)
{
- registerMockedURLLoad(baseURL, fileName);
+ FrameTestHelpers::registerMockedURLLoad(m_baseURL, fileName);
}
void registerMockedChromeURLLoad(const std::string& fileName)
{
- registerMockedURLLoad(chromeURL, fileName);
+ FrameTestHelpers::registerMockedURLLoad(m_chromeURL, fileName);
}
- void serveRequests()
- {
- webkit_support::ServeAsynchronousMockedRequests();
- }
-
- void loadHttpFrame(WebFrame* frame, const std::string& fileName)
- {
- loadFrame(frame, baseURL, fileName);
- }
-
- void loadChromeFrame(WebFrame* frame, const std::string& fileName)
- {
- loadFrame(frame, chromeURL, fileName);
- }
-
- void registerMockedURLLoad(const std::string& base, const std::string& fileName)
- {
- WebURLResponse response;
- response.initialize();
- response.setMIMEType("text/html");
-
- std::string filePath = webkit_support::GetWebKitRootDir().utf8();
- filePath += "/Source/WebKit/chromium/tests/data/";
- filePath += fileName;
-
- webkit_support::RegisterMockedURL(WebURL(GURL(base + fileName)), response, WebString::fromUTF8(filePath));
- }
-
- void loadFrame(WebFrame* frame, const std::string& base, const std::string& fileName)
- {
- WebURLRequest urlRequest;
- urlRequest.initialize();
- urlRequest.setURL(WebURL(GURL(base + fileName)));
- frame->loadRequest(urlRequest);
- }
-
protected:
- std::string baseURL;
- std::string chromeURL;
+ std::string m_baseURL;
+ std::string m_chromeURL;
};
-class TestWebFrameClient : public WebFrameClient {
-};
-
-class TestWebViewClient : public WebViewClient {
-};
-
TEST_F(WebFrameTest, ContentText)
{
registerMockedHttpURLLoad("iframes_test.html");
@@ -131,14 +84,8 @@
registerMockedHttpURLLoad("invisible_iframe.html");
registerMockedHttpURLLoad("zero_sized_iframe.html");
- // Create and initialize the WebView.
- TestWebFrameClient webFrameClient;
- WebView* webView = WebView::create(0);
- webView->initializeMainFrame(&webFrameClient);
+ WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "iframes_test.html");
- loadHttpFrame(webView->mainFrame(), "iframes_test.html");
- serveRequests();
-
// Now retrieve the frames text and test it only includes visible elements.
std::string content = webView->mainFrame()->contentAsText(1024).utf8();
EXPECT_NE(std::string::npos, content.find(" visible paragraph"));
@@ -157,15 +104,8 @@
registerMockedHttpURLLoad("invisible_iframe.html");
registerMockedHttpURLLoad("zero_sized_iframe.html");
- // Create and initialize the WebView.
- TestWebFrameClient webFrameClient;
- WebView* webView = WebView::create(0);
- webView->settings()->setJavaScriptEnabled(true);
- webView->initializeMainFrame(&webFrameClient);
+ WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "iframes_test.html", true);
- loadHttpFrame(webView->mainFrame(), "iframes_test.html");
- serveRequests();
-
v8::HandleScope scope;
EXPECT_EQ(webView->mainFrame(),
WebFrame::frameForContext(
@@ -181,13 +121,8 @@
{
registerMockedHttpURLLoad("form.html");
- TestWebFrameClient webFrameClient;
- WebView* webView = WebView::create(0);
- webView->initializeMainFrame(&webFrameClient);
+ WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "form.html");
- loadHttpFrame(webView->mainFrame(), "form.html");
- serveRequests();
-
WebVector<WebFormElement> forms;
webView->mainFrame()->document().forms(forms);
webView->close();
@@ -202,18 +137,11 @@
{
registerMockedChromeURLLoad("history.html");
- // Create and initialize the WebView.
- TestWebFrameClient webFrameClient;
- WebView* webView = WebView::create(0);
- webView->settings()->setJavaScriptEnabled(true);
- webView->initializeMainFrame(&webFrameClient);
+ WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_chromeURL + "history.html", true);
- loadChromeFrame(webView->mainFrame(), "history.html");
- serveRequests();
-
// Try to run JS against the chrome-style URL.
WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs("chrome");
- loadFrame(webView->mainFrame(), "_javascript_:", "document.body.appendChild(document.createTextNode('Clobbered'))");
+ FrameTestHelpers::loadFrame(webView->mainFrame(), "_javascript_:document.body.appendChild(document.createTextNode('Clobbered'))");
// Now retrieve the frames text and see if it was clobbered.
std::string content = webView->mainFrame()->contentAsText(1024).utf8();
@@ -247,17 +175,12 @@
registerMockedHttpURLLoad("form.html");
TestReloadDoesntRedirectWebFrameClient webFrameClient;
- WebView* webView = WebView::create(0);
- webView->initializeMainFrame(&webFrameClient);
+ WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "form.html", false, &webFrameClient);
- loadHttpFrame(webView->mainFrame(), "form.html");
- serveRequests();
- // Frame is loaded.
-
webView->mainFrame()->reload(true);
// start reload before request is delivered.
webView->mainFrame()->reload(true);
- serveRequests();
+ webkit_support::ServeAsynchronousMockedRequests();
}
TEST_F(WebFrameTest, ClearFocusedNodeTest)
@@ -265,16 +188,8 @@
registerMockedHttpURLLoad("iframe_clear_focused_node_test.html");
registerMockedHttpURLLoad("autofocus_input_field_iframe.html");
- // Create and initialize the WebView.
- TestWebFrameClient webFrameClient;
- TestWebViewClient webviewClient;
- WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(WebView::create(&webviewClient));
- webViewImpl->settings()->setJavaScriptEnabled(true);
- webViewImpl->initializeMainFrame(&webFrameClient);
+ WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "iframe_clear_focused_node_test.html", true));
- loadHttpFrame(webViewImpl->mainFrame(), "iframe_clear_focused_node_test.html");
- serveRequests();
-
// Clear the focused node.
webViewImpl->clearFocusedNode();
@@ -353,11 +268,7 @@
// Load a frame with an iframe, make sure we get the right create notifications.
ContextLifetimeTestWebFrameClient webFrameClient;
- WebView* webView = WebView::create(0);
- webView->settings()->setJavaScriptEnabled(true);
- webView->initializeMainFrame(&webFrameClient);
- loadHttpFrame(webView->mainFrame(), "context_notifications_test.html");
- serveRequests();
+ WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "context_notifications_test.html", true, &webFrameClient);
WebFrame* mainFrame = webView->mainFrame();
WebFrame* childFrame = mainFrame->firstChild();
@@ -395,15 +306,11 @@
registerMockedHttpURLLoad("context_notifications_test_frame.html");
ContextLifetimeTestWebFrameClient webFrameClient;
- WebView* webView = WebView::create(0);
- webView->settings()->setJavaScriptEnabled(true);
- webView->initializeMainFrame(&webFrameClient);
- loadHttpFrame(webView->mainFrame(), "context_notifications_test.html");
- serveRequests();
+ WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "context_notifications_test.html", true, &webFrameClient);
// Refresh, we should get two release notifications and two more create notifications.
webView->mainFrame()->reload(false);
- serveRequests();
+ webkit_support::ServeAsynchronousMockedRequests();
ASSERT_EQ(4u, webFrameClient.createNotifications.size());
ASSERT_EQ(2u, webFrameClient.releaseNotifications.size());
@@ -438,11 +345,7 @@
registerMockedHttpURLLoad("context_notifications_test_frame.html");
ContextLifetimeTestWebFrameClient webFrameClient;
- WebView* webView = WebView::create(0);
- webView->settings()->setJavaScriptEnabled(true);
- webView->initializeMainFrame(&webFrameClient);
- loadHttpFrame(webView->mainFrame(), "context_notifications_test.html");
- serveRequests();
+ WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "context_notifications_test.html", true, &webFrameClient);
// Add an isolated world.
webFrameClient.reset();
