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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/web/tests/WebViewTest.cpp

Issue 2654933003: platform/testing/{URL|Unit}TestHelpers improvements (Closed)
Patch Set: baseURL bug Created 3 years, 11 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
« third_party/WebKit/Source/platform/testing/UnitTestHelpers.cpp ('K') | « third_party/WebKit/Source/web/tests/WebSearchableFormDataTest.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/tests/WebViewTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
index 4a6c50ac3461a07c840df711d5e91835bfb8d77c..4a47b40fdf961ebdd820f46f20fe5e1273c0be79 100644
--- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
@@ -234,10 +234,12 @@ class WebViewTest
}
protected:
- void registerMockedHttpURLLoad(const std::string& fileName) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8(fileName.c_str()));
+ std::string registerMockedHttpURLLoad(const std::string& fileName) {
+ return URLTestHelpers::registerMockedURLLoadFromBase(
+ WebString::fromUTF8(m_baseURL), testing::webTestDataPath(),
+ WebString::fromUTF8(fileName))
+ .string()
+ .utf8();
}
void testAutoResize(const WebSize& minAutoResize,
@@ -275,9 +277,8 @@ static std::string hitTestElementId(WebView* view, int x, int y) {
INSTANTIATE_TEST_CASE_P(All, WebViewTest, ::testing::Bool());
TEST_P(WebViewTest, HitTestContentEditableImageMaps) {
- std::string url = m_baseURL + "content-editable-image-maps.html";
- URLTestHelpers::registerMockedURLLoad(toKURL(url),
- "content-editable-image-maps.html");
+ std::string url =
+ registerMockedHttpURLLoad("content-editable-image-maps.html");
WebView* webView = m_webViewHelper.initializeAndLoad(url, true, 0);
webView->resize(WebSize(500, 500));
@@ -315,8 +316,7 @@ static WebElement hitTestUrlElement(WebView* view, int x, int y) {
}
TEST_P(WebViewTest, ImageMapUrls) {
- std::string url = m_baseURL + "image-map.html";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "image-map.html");
+ std::string url = registerMockedHttpURLLoad("image-map.html");
WebView* webView = m_webViewHelper.initializeAndLoad(url, true, 0);
webView->resize(WebSize(400, 400));
@@ -336,8 +336,7 @@ TEST_P(WebViewTest, ImageMapUrls) {
TEST_P(WebViewTest, BrokenImage) {
URLTestHelpers::registerMockedErrorURLLoad(
KURL(toKURL(m_baseURL), "non_existent.png"));
- std::string url = m_baseURL + "image-broken.html";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "image-broken.html");
+ std::string url = registerMockedHttpURLLoad("image-broken.html");
WebView* webView = m_webViewHelper.initialize();
webView->settings()->setLoadsImagesAutomatically(true);
@@ -354,8 +353,7 @@ TEST_P(WebViewTest, BrokenImage) {
TEST_P(WebViewTest, BrokenInputImage) {
URLTestHelpers::registerMockedErrorURLLoad(
KURL(toKURL(m_baseURL), "non_existent.png"));
- std::string url = m_baseURL + "input-image-broken.html";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "input-image-broken.html");
+ std::string url = registerMockedHttpURLLoad("input-image-broken.html");
WebView* webView = m_webViewHelper.initialize();
webView->settings()->setLoadsImagesAutomatically(true);
@@ -486,8 +484,7 @@ TEST_P(WebViewTest, SetBaseBackgroundColorAndBlendWithExistingContent) {
}
TEST_P(WebViewTest, FocusIsInactive) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), "visible_iframe.html");
+ registerMockedHttpURLLoad("visible_iframe.html");
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "visible_iframe.html");
@@ -513,8 +510,7 @@ TEST_P(WebViewTest, FocusIsInactive) {
}
TEST_P(WebViewTest, ActiveState) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), "visible_iframe.html");
+ registerMockedHttpURLLoad("visible_iframe.html");
WebView* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "visible_iframe.html");
@@ -532,7 +528,8 @@ TEST_P(WebViewTest, ActiveState) {
TEST_P(WebViewTest, HitTestResultAtWithPageScale) {
std::string url = m_baseURL + "specify_size.html?" + "50px" + ":" + "50px";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "specify_size.html");
+ URLTestHelpers::registerMockedURLLoad(
+ toKURL(url), testing::webTestDataPath("specify_size.html"));
WebView* webView = m_webViewHelper.initializeAndLoad(url, true, 0);
webView->resize(WebSize(100, 100));
WebPoint hitPoint(75, 75);
@@ -551,7 +548,8 @@ TEST_P(WebViewTest, HitTestResultAtWithPageScale) {
TEST_P(WebViewTest, HitTestResultAtWithPageScaleAndPan) {
std::string url = m_baseURL + "specify_size.html?" + "50px" + ":" + "50px";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "specify_size.html");
+ URLTestHelpers::registerMockedURLLoad(
+ toKURL(url), testing::webTestDataPath("specify_size.html"));
WebView* webView = m_webViewHelper.initialize(true);
loadFrame(webView->mainFrame(), url);
webView->resize(WebSize(100, 100));
@@ -576,8 +574,7 @@ TEST_P(WebViewTest, HitTestResultAtWithPageScaleAndPan) {
}
TEST_P(WebViewTest, HitTestResultForTapWithTapArea) {
- std::string url = m_baseURL + "hit_test.html";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "hit_test.html");
+ std::string url = registerMockedHttpURLLoad("hit_test.html");
WebView* webView = m_webViewHelper.initializeAndLoad(url, true, 0);
webView->resize(WebSize(100, 100));
WebPoint hitPoint(55, 55);
@@ -603,8 +600,7 @@ TEST_P(WebViewTest, HitTestResultForTapWithTapArea) {
}
TEST_P(WebViewTest, HitTestResultForTapWithTapAreaPageScaleAndPan) {
- std::string url = m_baseURL + "hit_test.html";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "hit_test.html");
+ std::string url = registerMockedHttpURLLoad("hit_test.html");
WebView* webView = m_webViewHelper.initialize(true);
loadFrame(webView->mainFrame(), url);
webView->resize(WebSize(100, 100));
@@ -643,7 +639,8 @@ void WebViewTest::testAutoResize(
AutoResizeWebViewClient client;
std::string url =
m_baseURL + "specify_size.html?" + pageWidth + ":" + pageHeight;
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "specify_size.html");
+ URLTestHelpers::registerMockedURLLoad(
+ toKURL(url), testing::webTestDataPath("specify_size.html"));
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(url, true, 0, &client);
client.testData().setWebView(webView);
@@ -752,9 +749,7 @@ TEST_P(WebViewTest, AutoResizeMaxSize) {
void WebViewTest::testTextInputType(WebTextInputType expectedType,
const std::string& htmlFile) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8(htmlFile.c_str()));
+ registerMockedHttpURLLoad(htmlFile);
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + htmlFile);
WebInputMethodControllerImpl* controller =
@@ -816,9 +811,7 @@ TEST_P(WebViewTest, TextInputInfoUpdateStyleAndLayout) {
void WebViewTest::testInputMode(WebTextInputMode expectedInputMode,
const std::string& htmlFile) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8(htmlFile.c_str()));
+ registerMockedHttpURLLoad(htmlFile);
WebViewImpl* webViewImpl =
m_webViewHelper.initializeAndLoad(m_baseURL + htmlFile);
webViewImpl->setInitialFocus(false);
@@ -866,10 +859,10 @@ TEST_P(WebViewTest, InputMode) {
}
TEST_P(WebViewTest, TextInputInfoWithReplacedElements) {
- std::string url = m_baseURL + "div_with_image.html";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "div_with_image.html");
- URLTestHelpers::registerMockedURLLoad(toKURL("http://www.test.com/foo.png"),
- "white-1x1.png");
+ std::string url = registerMockedHttpURLLoad("div_with_image.html");
+ URLTestHelpers::registerMockedURLLoad(
+ toKURL("http://www.test.com/foo.png"),
+ testing::webTestDataPath("white-1x1.png"));
WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url);
webViewImpl->setInitialFocus(false);
WebTextInputInfo info =
@@ -879,9 +872,7 @@ TEST_P(WebViewTest, TextInputInfoWithReplacedElements) {
}
TEST_P(WebViewTest, SetEditableSelectionOffsetsAndTextInputInfo) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
webView->setInitialFocus(false);
@@ -897,9 +888,7 @@ TEST_P(WebViewTest, SetEditableSelectionOffsetsAndTextInputInfo) {
EXPECT_EQ(-1, info.compositionStart);
EXPECT_EQ(-1, info.compositionEnd);
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("content_editable_populated.html"));
+ registerMockedHttpURLLoad("content_editable_populated.html");
webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "content_editable_populated.html");
webView->setInitialFocus(false);
@@ -917,9 +906,7 @@ TEST_P(WebViewTest, SetEditableSelectionOffsetsAndTextInputInfo) {
// Regression test for crbug.com/663645
TEST_P(WebViewTest, FinishComposingTextDoesNotAssert) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_default.html"));
+ registerMockedHttpURLLoad("input_field_default.html");
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "input_field_default.html");
webView->setInitialFocus(false);
@@ -948,9 +935,7 @@ TEST_P(WebViewTest, FinishComposingTextDoesNotAssert) {
}
TEST_P(WebViewTest, FinishComposingTextCursorPositionChange) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
webView->setInitialFocus(false);
@@ -1000,9 +985,7 @@ TEST_P(WebViewTest, FinishComposingTextCursorPositionChange) {
}
TEST_P(WebViewTest, SetCompositionForNewCaretPositions) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
webView->setInitialFocus(false);
@@ -1109,9 +1092,7 @@ TEST_P(WebViewTest, SetCompositionForNewCaretPositions) {
}
TEST_P(WebViewTest, SetCompositionWithEmptyText) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
webView->setInitialFocus(false);
@@ -1151,9 +1132,7 @@ TEST_P(WebViewTest, SetCompositionWithEmptyText) {
}
TEST_P(WebViewTest, CommitTextForNewCaretPositions) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
webView->setInitialFocus(false);
@@ -1220,9 +1199,7 @@ TEST_P(WebViewTest, CommitTextForNewCaretPositions) {
}
TEST_P(WebViewTest, CommitTextWhileComposing) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
webView->setInitialFocus(false);
@@ -1289,9 +1266,7 @@ TEST_P(WebViewTest, CommitTextWhileComposing) {
}
TEST_P(WebViewTest, FinishCompositionDoesNotRevealSelection) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("form_with_input.html"));
+ registerMockedHttpURLLoad("form_with_input.html");
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "form_with_input.html");
webView->resize(WebSize(800, 600));
@@ -1325,9 +1300,7 @@ TEST_P(WebViewTest, FinishCompositionDoesNotRevealSelection) {
}
TEST_P(WebViewTest, InsertNewLinePlacementAfterFinishComposingText) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("text_area_populated.html"));
+ registerMockedHttpURLLoad("text_area_populated.html");
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "text_area_populated.html");
webView->setInitialFocus(false);
@@ -1369,9 +1342,7 @@ TEST_P(WebViewTest, InsertNewLinePlacementAfterFinishComposingText) {
}
TEST_P(WebViewTest, ExtendSelectionAndDelete) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
WebLocalFrameImpl* frame = webView->mainFrameImpl();
@@ -1390,9 +1361,7 @@ TEST_P(WebViewTest, ExtendSelectionAndDelete) {
}
TEST_P(WebViewTest, DeleteSurroundingText) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
WebView* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
WebLocalFrameImpl* frame = toWebLocalFrameImpl(webView->mainFrame());
@@ -1435,9 +1404,7 @@ TEST_P(WebViewTest, DeleteSurroundingText) {
}
TEST_P(WebViewTest, SetCompositionFromExistingText) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
webView->setInitialFocus(false);
@@ -1463,9 +1430,7 @@ TEST_P(WebViewTest, SetCompositionFromExistingText) {
}
TEST_P(WebViewTest, SetCompositionFromExistingTextInTextArea) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("text_area_populated.html"));
+ registerMockedHttpURLLoad("text_area_populated.html");
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "text_area_populated.html");
webView->setInitialFocus(false);
@@ -1506,9 +1471,7 @@ TEST_P(WebViewTest, SetCompositionFromExistingTextInTextArea) {
}
TEST_P(WebViewTest, SetCompositionFromExistingTextInRichText) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("content_editable_rich_text.html"));
+ registerMockedHttpURLLoad("content_editable_rich_text.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "content_editable_rich_text.html");
webView->setInitialFocus(false);
@@ -1523,9 +1486,7 @@ TEST_P(WebViewTest, SetCompositionFromExistingTextInRichText) {
}
TEST_P(WebViewTest, SetEditableSelectionOffsetsKeepsComposition) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
webView->setInitialFocus(false);
@@ -1593,9 +1554,7 @@ TEST_P(WebViewTest, SetEditableSelectionOffsetsKeepsComposition) {
}
TEST_P(WebViewTest, IsSelectionAnchorFirst) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
WebLocalFrame* frame = webView->mainFrameImpl();
@@ -1611,9 +1570,7 @@ TEST_P(WebViewTest, IsSelectionAnchorFirst) {
}
TEST_P(WebViewTest, ExitingDeviceEmulationResetsPageScale) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("200-by-300.html"));
+ registerMockedHttpURLLoad("200-by-300.html");
WebViewImpl* webViewImpl =
m_webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html");
webViewImpl->resize(WebSize(200, 300));
@@ -1637,9 +1594,7 @@ TEST_P(WebViewTest, ExitingDeviceEmulationResetsPageScale) {
}
TEST_P(WebViewTest, HistoryResetScrollAndScaleState) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("200-by-300.html"));
+ registerMockedHttpURLLoad("200-by-300.html");
WebViewImpl* webViewImpl =
m_webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html");
webViewImpl->resize(WebSize(100, 150));
@@ -1674,9 +1629,7 @@ TEST_P(WebViewTest, HistoryResetScrollAndScaleState) {
}
TEST_P(WebViewTest, BackForwardRestoreScroll) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("back_forward_restore_scroll.html"));
+ registerMockedHttpURLLoad("back_forward_restore_scroll.html");
WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(
m_baseURL + "back_forward_restore_scroll.html");
webViewImpl->resize(WebSize(640, 480));
@@ -1735,9 +1688,7 @@ TEST_P(WebViewTest, BackForwardRestoreScroll) {
// Tests that we restore scroll and scale *after* the fullscreen styles are
// removed and the page is laid out. http://crbug.com/625683.
TEST_P(WebViewTest, FullscreenResetScrollAndScaleFullscreenStyles) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("fullscreen_style.html"));
+ registerMockedHttpURLLoad("fullscreen_style.html");
WebViewImpl* webViewImpl =
m_webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_style.html");
webViewImpl->resize(WebSize(800, 600));
@@ -1779,9 +1730,7 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleFullscreenStyles) {
// Tests that exiting and immediately reentering fullscreen doesn't cause the
// scroll and scale restoration to occur when we enter fullscreen again.
TEST_P(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("fullscreen_style.html"));
+ registerMockedHttpURLLoad("fullscreen_style.html");
WebViewImpl* webViewImpl =
m_webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_style.html");
webViewImpl->resize(WebSize(800, 600));
@@ -1832,9 +1781,7 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) {
}
TEST_P(WebViewTest, EnterFullscreenResetScrollAndScaleState) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("200-by-300.html"));
+ registerMockedHttpURLLoad("200-by-300.html");
WebViewImpl* webViewImpl =
m_webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html");
webViewImpl->resize(WebSize(100, 150));
@@ -1895,9 +1842,7 @@ class PrintWebViewClient : public FrameTestHelpers::TestWebViewClient {
TEST_P(WebViewTest, PrintWithXHRInFlight) {
PrintWebViewClient client;
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("print_with_xhr_inflight.html"));
+ registerMockedHttpURLLoad("print_with_xhr_inflight.html");
WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(
m_baseURL + "print_with_xhr_inflight.html", true, 0, &client);
@@ -1928,10 +1873,8 @@ static void DragAndDropURL(WebViewImpl* webView, const std::string& url) {
}
TEST_P(WebViewTest, DragDropURL) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), "foo.html");
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), "bar.html");
+ registerMockedHttpURLLoad("foo.html");
+ registerMockedHttpURLLoad("bar.html");
const std::string fooUrl = m_baseURL + "foo.html";
const std::string barUrl = m_baseURL + "bar.html";
@@ -2036,9 +1979,7 @@ bool WebViewTest::tapElementById(WebInputEvent::Type type,
}
TEST_P(WebViewTest, DetectContentAroundPosition) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("content_listeners.html"));
+ registerMockedHttpURLLoad("content_listeners.html");
ContentDetectorClient client;
WebView* webView = m_webViewHelper.initializeAndLoad(
@@ -2092,9 +2033,7 @@ TEST_P(WebViewTest, DetectContentAroundPosition) {
}
TEST_P(WebViewTest, ContentDetectionInIframe) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("content_listeners_iframe.html"));
+ registerMockedHttpURLLoad("content_listeners_iframe.html");
ContentDetectorClient client;
WebView* webView = m_webViewHelper.initializeAndLoad(
@@ -2170,9 +2109,7 @@ TEST_P(WebViewTest, ClientTapHandlingNullWebViewClient) {
}
TEST_P(WebViewTest, LongPressEmptyDiv) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("long_press_empty_div.html"));
+ registerMockedHttpURLLoad("long_press_empty_div.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "long_press_empty_div.html", true);
@@ -2193,9 +2130,7 @@ TEST_P(WebViewTest, LongPressEmptyDiv) {
}
TEST_P(WebViewTest, LongPressEmptyDivAlwaysShow) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("long_press_empty_div.html"));
+ registerMockedHttpURLLoad("long_press_empty_div.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "long_press_empty_div.html", true);
@@ -2216,9 +2151,7 @@ TEST_P(WebViewTest, LongPressEmptyDivAlwaysShow) {
}
TEST_P(WebViewTest, LongPressObject) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("long_press_object.html"));
+ registerMockedHttpURLLoad("long_press_object.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "long_press_object.html", true);
@@ -2243,9 +2176,7 @@ TEST_P(WebViewTest, LongPressObject) {
}
TEST_P(WebViewTest, LongPressObjectFallback) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("long_press_object_fallback.html"));
+ registerMockedHttpURLLoad("long_press_object_fallback.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "long_press_object_fallback.html", true);
@@ -2270,9 +2201,7 @@ TEST_P(WebViewTest, LongPressObjectFallback) {
}
TEST_P(WebViewTest, LongPressImage) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("long_press_image.html"));
+ registerMockedHttpURLLoad("long_press_image.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "long_press_image.html", true);
@@ -2293,9 +2222,7 @@ TEST_P(WebViewTest, LongPressImage) {
}
TEST_P(WebViewTest, LongPressVideo) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("long_press_video.html"));
+ registerMockedHttpURLLoad("long_press_video.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "long_press_video.html", true);
@@ -2316,9 +2243,7 @@ TEST_P(WebViewTest, LongPressVideo) {
}
TEST_P(WebViewTest, LongPressLink) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("long_press_link.html"));
+ registerMockedHttpURLLoad("long_press_link.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "long_press_link.html", true);
@@ -2339,12 +2264,11 @@ TEST_P(WebViewTest, LongPressLink) {
}
TEST_P(WebViewTest, showContextMenuOnLongPressingLinks) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("long_press_links_and_images.html"));
+ registerMockedHttpURLLoad("long_press_links_and_images.html");
- URLTestHelpers::registerMockedURLLoad(toKURL("http://www.test.com/foo.png"),
- "white-1x1.png");
+ URLTestHelpers::registerMockedURLLoad(
+ toKURL("http://www.test.com/foo.png"),
+ testing::webTestDataPath("white-1x1.png"));
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "long_press_links_and_images.html", true);
@@ -2366,9 +2290,7 @@ TEST_P(WebViewTest, showContextMenuOnLongPressingLinks) {
}
TEST_P(WebViewTest, LongPressEmptyEditableSelection) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("long_press_empty_editable_selection.html"));
+ registerMockedHttpURLLoad("long_press_empty_editable_selection.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "long_press_empty_editable_selection.html", true);
@@ -2389,9 +2311,7 @@ TEST_P(WebViewTest, LongPressEmptyEditableSelection) {
}
TEST_P(WebViewTest, LongPressEmptyNonEditableSelection) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("long_press_image.html"));
+ registerMockedHttpURLLoad("long_press_image.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "long_press_image.html", true);
@@ -2413,9 +2333,7 @@ TEST_P(WebViewTest, LongPressEmptyNonEditableSelection) {
}
TEST_P(WebViewTest, LongPressSelection) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("longpress_selection.html"));
+ registerMockedHttpURLLoad("longpress_selection.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "longpress_selection.html", true);
@@ -2436,9 +2354,7 @@ TEST_P(WebViewTest, LongPressSelection) {
#if !OS(MACOSX)
TEST_P(WebViewTest, TouchDoesntSelectEmptyTextarea) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("longpress_textarea.html"));
+ registerMockedHttpURLLoad("longpress_textarea.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "longpress_textarea.html", true);
@@ -2481,9 +2397,7 @@ TEST_P(WebViewTest, TouchDoesntSelectEmptyTextarea) {
#endif
TEST_P(WebViewTest, LongPressImageTextarea) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("longpress_image_contenteditable.html"));
+ registerMockedHttpURLLoad("longpress_image_contenteditable.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "longpress_image_contenteditable.html", true);
@@ -2501,9 +2415,7 @@ TEST_P(WebViewTest, LongPressImageTextarea) {
}
TEST_P(WebViewTest, BlinkCaretAfterLongPress) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("blink_caret_on_typing_after_long_press.html"));
+ registerMockedHttpURLLoad("blink_caret_on_typing_after_long_press.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "blink_caret_on_typing_after_long_press.html", true);
@@ -2519,8 +2431,7 @@ TEST_P(WebViewTest, BlinkCaretAfterLongPress) {
}
TEST_P(WebViewTest, BlinkCaretOnClosingContextMenu) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("form.html"));
+ registerMockedHttpURLLoad("form.html");
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "form.html", true);
@@ -2554,9 +2465,7 @@ TEST_P(WebViewTest, BlinkCaretOnClosingContextMenu) {
}
TEST_P(WebViewTest, SelectionOnReadOnlyInput) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("selection_readonly.html"));
+ registerMockedHttpURLLoad("selection_readonly.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "selection_readonly.html", true);
webView->resize(WebSize(640, 480));
@@ -2575,9 +2484,7 @@ TEST_P(WebViewTest, SelectionOnReadOnlyInput) {
}
TEST_P(WebViewTest, KeyDownScrollsHandled) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("content-width-1000.html"));
+ registerMockedHttpURLLoad("content-width-1000.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "content-width-1000.html", true);
@@ -2754,9 +2661,7 @@ class MockAutofillClient : public WebAutofillClient {
};
TEST_P(WebViewTest, LosingFocusDoesNotTriggerAutofillTextChange) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
MockAutofillClient client;
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
@@ -2798,9 +2703,7 @@ static void verifySelectionAndComposition(WebViewImpl* webView,
}
TEST_P(WebViewTest, CompositionNotCancelledByBackspace) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("composition_not_cancelled_by_backspace.html"));
+ registerMockedHttpURLLoad("composition_not_cancelled_by_backspace.html");
MockAutofillClient client;
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "composition_not_cancelled_by_backspace.html");
@@ -2846,9 +2749,7 @@ TEST_P(WebViewTest, CompositionNotCancelledByBackspace) {
}
TEST_P(WebViewTest, FinishComposingTextTriggersAutofillTextChange) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
MockAutofillClient client;
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
@@ -2881,9 +2782,7 @@ TEST_P(WebViewTest, FinishComposingTextTriggersAutofillTextChange) {
}
TEST_P(WebViewTest, SetCompositionFromExistingTextTriggersAutofillTextChange) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
MockAutofillClient client;
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html", true);
@@ -2993,8 +2892,7 @@ TEST_P(WebViewTest, FocusExistingFrameOnNavigate) {
}
TEST_P(WebViewTest, DispatchesFocusOutFocusInOnViewToggleFocus) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), "focusout_focusin_events.html");
+ registerMockedHttpURLLoad("focusout_focusin_events.html");
WebView* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "focusout_focusin_events.html", true, 0);
@@ -3008,9 +2906,7 @@ TEST_P(WebViewTest, DispatchesFocusOutFocusInOnViewToggleFocus) {
}
TEST_P(WebViewTest, DispatchesDomFocusOutDomFocusInOnViewToggleFocus) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- "domfocusout_domfocusin_events.html");
+ registerMockedHttpURLLoad("domfocusout_domfocusin_events.html");
WebView* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "domfocusout_domfocusin_events.html", true, 0);
@@ -3048,8 +2944,7 @@ TEST_P(WebViewTest, ChooseValueFromDateTimeChooser) {
RuntimeEnabledFeatures::inputMultipleFieldsUIEnabled();
RuntimeEnabledFeatures::setInputMultipleFieldsUIEnabled(false);
DateTimeChooserWebViewClient client;
- std::string url = m_baseURL + "date_time_chooser.html";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "date_time_chooser.html");
+ std::string url = registerMockedHttpURLLoad("date_time_chooser.html");
WebViewImpl* webViewImpl =
m_webViewHelper.initializeAndLoad(url, true, 0, &client);
@@ -3125,8 +3020,7 @@ TEST_P(WebViewTest, ChooseValueFromDateTimeChooser) {
}
TEST_P(WebViewTest, DispatchesFocusBlurOnViewToggle) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), "focus_blur_events.html");
+ registerMockedHttpURLLoad("focus_blur_events.html");
WebView* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "focus_blur_events.html", true, 0);
@@ -3164,11 +3058,8 @@ TEST_P(WebViewTest, SmartClipData) {
WebString clipText;
WebString clipHtml;
WebRect clipRect;
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("Ahem.ttf"));
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("smartclip.html"));
+ registerMockedHttpURLLoad("Ahem.ttf");
+ registerMockedHttpURLLoad("smartclip.html");
WebView* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "smartclip.html");
webView->resize(WebSize(500, 500));
@@ -3203,11 +3094,8 @@ TEST_P(WebViewTest, SmartClipDataWithPinchZoom) {
WebString clipText;
WebString clipHtml;
WebRect clipRect;
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("Ahem.ttf"));
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("smartclip.html"));
+ registerMockedHttpURLLoad("Ahem.ttf");
+ registerMockedHttpURLLoad("smartclip.html");
WebView* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "smartclip.html");
webView->resize(WebSize(500, 500));
@@ -3224,11 +3112,8 @@ TEST_P(WebViewTest, SmartClipReturnsEmptyStringsWhenUserSelectIsNone) {
WebString clipText;
WebString clipHtml;
WebRect clipRect;
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("Ahem.ttf"));
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("smartclip_user_select_none.html"));
+ registerMockedHttpURLLoad("Ahem.ttf");
+ registerMockedHttpURLLoad("smartclip_user_select_none.html");
WebView* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "smartclip_user_select_none.html");
webView->resize(WebSize(500, 500));
@@ -3243,11 +3128,8 @@ TEST_P(WebViewTest, SmartClipDoesNotCrashPositionReversed) {
WebString clipText;
WebString clipHtml;
WebRect clipRect;
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("Ahem.ttf"));
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("smartclip_reversed_positions.html"));
+ registerMockedHttpURLLoad("Ahem.ttf");
+ registerMockedHttpURLLoad("smartclip_reversed_positions.html");
WebView* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "smartclip_reversed_positions.html");
webView->resize(WebSize(500, 500));
@@ -3288,9 +3170,7 @@ WebLocalFrame* CreateChildCounterFrameClient::createChildFrame(
}
TEST_P(WebViewTest, ChangeDisplayMode) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("display_mode.html"));
+ registerMockedHttpURLLoad("display_mode.html");
WebView* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "display_mode.html", true);
@@ -3306,9 +3186,7 @@ TEST_P(WebViewTest, ChangeDisplayMode) {
TEST_P(WebViewTest, AddFrameInCloseUnload) {
CreateChildCounterFrameClient frameClient;
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("add_frame_in_unload.html"));
+ registerMockedHttpURLLoad("add_frame_in_unload.html");
m_webViewHelper.initializeAndLoad(m_baseURL + "add_frame_in_unload.html",
true, &frameClient);
m_webViewHelper.reset();
@@ -3317,9 +3195,7 @@ TEST_P(WebViewTest, AddFrameInCloseUnload) {
TEST_P(WebViewTest, AddFrameInCloseURLUnload) {
CreateChildCounterFrameClient frameClient;
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("add_frame_in_unload.html"));
+ registerMockedHttpURLLoad("add_frame_in_unload.html");
m_webViewHelper.initializeAndLoad(m_baseURL + "add_frame_in_unload.html",
true, &frameClient);
m_webViewHelper.webView()->mainFrame()->dispatchUnloadEvent();
@@ -3329,9 +3205,7 @@ TEST_P(WebViewTest, AddFrameInCloseURLUnload) {
TEST_P(WebViewTest, AddFrameInNavigateUnload) {
CreateChildCounterFrameClient frameClient;
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("add_frame_in_unload.html"));
+ registerMockedHttpURLLoad("add_frame_in_unload.html");
m_webViewHelper.initializeAndLoad(m_baseURL + "add_frame_in_unload.html",
true, &frameClient);
FrameTestHelpers::loadFrame(m_webViewHelper.webView()->mainFrame(),
@@ -3342,12 +3216,8 @@ TEST_P(WebViewTest, AddFrameInNavigateUnload) {
TEST_P(WebViewTest, AddFrameInChildInNavigateUnload) {
CreateChildCounterFrameClient frameClient;
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("add_frame_in_unload_wrapper.html"));
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("add_frame_in_unload.html"));
+ registerMockedHttpURLLoad("add_frame_in_unload_wrapper.html");
+ registerMockedHttpURLLoad("add_frame_in_unload.html");
m_webViewHelper.initializeAndLoad(
m_baseURL + "add_frame_in_unload_wrapper.html", true, &frameClient);
FrameTestHelpers::loadFrame(m_webViewHelper.webView()->mainFrame(),
@@ -3386,9 +3256,7 @@ TEST_P(WebViewTest, HasTouchEventHandlers) {
// We need to create a LayerTreeView for the client before loading the page,
// otherwise ChromeClient will default to assuming there are touch handlers.
WebLayerTreeView* layerTreeView = client.initializeLayerTreeView();
- std::string url = m_baseURL + "has_touch_event_handlers.html";
- URLTestHelpers::registerMockedURLLoad(toKURL(url),
- "has_touch_event_handlers.html");
+ std::string url = registerMockedHttpURLLoad("has_touch_event_handlers.html");
WebViewImpl* webViewImpl =
m_webViewHelper.initializeAndLoad(url, true, 0, 0, &client);
ASSERT_TRUE(layerTreeView);
@@ -3514,8 +3382,7 @@ TEST_P(WebViewTest, HasTouchEventHandlers) {
// is different from detaching and re-attaching the same node, which is covered
// by layout tests under fast/events/.
TEST_P(WebViewTest, DeleteElementWithRegisteredHandler) {
- std::string url = m_baseURL + "simple_div.html";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "simple_div.html");
+ std::string url = registerMockedHttpURLLoad("simple_div.html");
WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true);
Persistent<Document> document =
@@ -3541,8 +3408,7 @@ TEST_P(WebViewTest, DeleteElementWithRegisteredHandler) {
// This test verifies the text input flags are correctly exposed to script.
TEST_P(WebViewTest, TextInputFlags) {
- std::string url = m_baseURL + "text_input_flags.html";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "text_input_flags.html");
+ std::string url = registerMockedHttpURLLoad("text_input_flags.html");
WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true);
webViewImpl->setInitialFocus(false);
@@ -3601,8 +3467,7 @@ TEST_P(WebViewTest, TextInputFlags) {
// Check that the WebAutofillClient is correctly notified about first user
// gestures after load, following various input events.
TEST_P(WebViewTest, FirstUserGestureObservedKeyEvent) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("form.html"));
+ registerMockedHttpURLLoad("form.html");
MockAutofillClient client;
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "form.html", true);
@@ -3626,8 +3491,7 @@ TEST_P(WebViewTest, FirstUserGestureObservedKeyEvent) {
}
TEST_P(WebViewTest, FirstUserGestureObservedMouseEvent) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("form.html"));
+ registerMockedHttpURLLoad("form.html");
MockAutofillClient client;
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "form.html", true);
@@ -3652,9 +3516,7 @@ TEST_P(WebViewTest, FirstUserGestureObservedMouseEvent) {
}
TEST_P(WebViewTest, FirstUserGestureObservedGestureTap) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("longpress_selection.html"));
+ registerMockedHttpURLLoad("longpress_selection.html");
MockAutofillClient client;
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "longpress_selection.html", true);
@@ -3672,9 +3534,7 @@ TEST_P(WebViewTest, FirstUserGestureObservedGestureTap) {
}
TEST_P(WebViewTest, CompositionIsUserGesture) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_populated.html"));
+ registerMockedHttpURLLoad("input_field_populated.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_populated.html");
WebLocalFrameImpl* frame = webView->mainFrameImpl();
@@ -3694,9 +3554,7 @@ TEST_P(WebViewTest, CompositionIsUserGesture) {
}
TEST_P(WebViewTest, CompareSelectAllToContentAsText) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("longpress_selection.html"));
+ registerMockedHttpURLLoad("longpress_selection.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "longpress_selection.html", true);
@@ -3713,8 +3571,7 @@ TEST_P(WebViewTest, CompareSelectAllToContentAsText) {
}
TEST_P(WebViewTest, AutoResizeSubtreeLayout) {
- std::string url = m_baseURL + "subtree-layout.html";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "subtree-layout.html");
+ std::string url = registerMockedHttpURLLoad("subtree-layout.html");
WebView* webView = m_webViewHelper.initialize(true);
webView->enableAutoResizeMode(WebSize(200, 200), WebSize(200, 200));
@@ -3731,7 +3588,8 @@ TEST_P(WebViewTest, AutoResizeSubtreeLayout) {
TEST_P(WebViewTest, PreferredSize) {
std::string url = m_baseURL + "specify_size.html?100px:100px";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "specify_size.html");
+ URLTestHelpers::registerMockedURLLoad(
+ toKURL(url), testing::webTestDataPath("specify_size.html"));
WebView* webView = m_webViewHelper.initializeAndLoad(url, true);
WebSize size = webView->contentsPreferredMinimumSize();
@@ -3756,7 +3614,8 @@ TEST_P(WebViewTest, PreferredSize) {
EXPECT_EQ(100, size.height);
url = m_baseURL + "specify_size.html?1.5px:1.5px";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "specify_size.html");
+ URLTestHelpers::registerMockedURLLoad(
+ toKURL(url), testing::webTestDataPath("specify_size.html"));
webView = m_webViewHelper.initializeAndLoad(url, true);
webView->setZoomLevel(WebView::zoomFactorToZoomLevel(1));
@@ -3767,7 +3626,8 @@ TEST_P(WebViewTest, PreferredSize) {
TEST_P(WebViewTest, PreferredSizeDirtyLayout) {
std::string url = m_baseURL + "specify_size.html?100px:100px";
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "specify_size.html");
+ URLTestHelpers::registerMockedURLLoad(
+ toKURL(url), testing::webTestDataPath("specify_size.html"));
WebView* webView = m_webViewHelper.initializeAndLoad(url, true);
WebElement documentElement =
webView->mainFrame()->document().documentElement();
@@ -3815,10 +3675,8 @@ class UnhandledTapWebViewClient : public FrameTestHelpers::TestWebViewClient {
TEST_P(WebViewTest, ShowUnhandledTapUIIfNeeded) {
std::string testFile = "show_unhandled_tap.html";
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("Ahem.ttf"));
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8(testFile));
+ registerMockedHttpURLLoad("Ahem.ttf");
+ registerMockedHttpURLLoad(testFile);
UnhandledTapWebViewClient client;
WebView* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + testFile, true, 0, &client);
@@ -3886,10 +3744,8 @@ TEST_P(WebViewTest, ShowUnhandledTapUIIfNeeded) {
TEST_P(WebViewTest, ShowUnhandledTapUIIfNeededWithMutateDom) {
std::string testFile = "show_unhandled_tap.html";
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("Ahem.ttf"));
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8(testFile));
+ registerMockedHttpURLLoad("Ahem.ttf");
+ registerMockedHttpURLLoad(testFile);
UnhandledTapWebViewClient client;
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + testFile, true, 0, &client);
@@ -3913,10 +3769,8 @@ TEST_P(WebViewTest, ShowUnhandledTapUIIfNeededWithMutateDom) {
TEST_P(WebViewTest, ShowUnhandledTapUIIfNeededWithMutateStyle) {
std::string testFile = "show_unhandled_tap.html";
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("Ahem.ttf"));
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8(testFile));
+ registerMockedHttpURLLoad("Ahem.ttf");
+ registerMockedHttpURLLoad(testFile);
UnhandledTapWebViewClient client;
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + testFile, true, 0, &client);
@@ -3949,10 +3803,8 @@ TEST_P(WebViewTest, ShowUnhandledTapUIIfNeededWithMutateStyle) {
TEST_P(WebViewTest, ShowUnhandledTapUIIfNeededWithPreventDefault) {
std::string testFile = "show_unhandled_tap.html";
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("Ahem.ttf"));
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8(testFile));
+ registerMockedHttpURLLoad("Ahem.ttf");
+ registerMockedHttpURLLoad(testFile);
UnhandledTapWebViewClient client;
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + testFile, true, 0, &client);
@@ -3997,9 +3849,7 @@ TEST_P(WebViewTest, StopLoadingIfJavaScriptURLReturnsNoStringResult) {
#if OS(MACOSX)
TEST_P(WebViewTest, WebSubstringUtil) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("content_editable_populated.html"));
+ registerMockedHttpURLLoad("content_editable_populated.html");
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "content_editable_populated.html");
webView->settings()->setDefaultFontSize(12);
@@ -4030,12 +3880,8 @@ TEST_P(WebViewTest, WebSubstringUtil) {
}
TEST_P(WebViewTest, WebSubstringUtilIframe) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("single_iframe.html"));
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("visible_iframe.html"));
+ registerMockedHttpURLLoad("single_iframe.html");
+ registerMockedHttpURLLoad("visible_iframe.html");
WebViewImpl* webView =
m_webViewHelper.initializeAndLoad(m_baseURL + "single_iframe.html");
webView->settings()->setDefaultFontSize(12);
@@ -4073,9 +3919,7 @@ TEST_P(WebViewTest, WebSubstringUtilIframe) {
#endif
TEST_P(WebViewTest, PasswordFieldEditingIsUserGesture) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("input_field_password.html"));
+ registerMockedHttpURLLoad("input_field_password.html");
MockAutofillClient client;
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
m_baseURL + "input_field_password.html", true);
@@ -4196,9 +4040,7 @@ TEST_P(WebViewTest, ClosingPageIsSuspended) {
}
TEST_P(WebViewTest, ForceAndResetViewport) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("200-by-300.html"));
+ registerMockedHttpURLLoad("200-by-300.html");
WebViewImpl* webViewImpl =
m_webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html");
webViewImpl->resize(WebSize(100, 150));
@@ -4244,9 +4086,7 @@ TEST_P(WebViewTest, ForceAndResetViewport) {
}
TEST_P(WebViewTest, ViewportOverrideIntegratesDeviceMetricsOffsetAndScale) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("200-by-300.html"));
+ registerMockedHttpURLLoad("200-by-300.html");
WebViewImpl* webViewImpl =
m_webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html");
webViewImpl->resize(WebSize(100, 150));
@@ -4276,9 +4116,7 @@ TEST_P(WebViewTest, ViewportOverrideIntegratesDeviceMetricsOffsetAndScale) {
}
TEST_P(WebViewTest, ViewportOverrideAdaptsToScaleAndScroll) {
- URLTestHelpers::registerMockedURLFromBaseURL(
- WebString::fromUTF8(m_baseURL.c_str()),
- WebString::fromUTF8("200-by-300.html"));
+ registerMockedHttpURLLoad("200-by-300.html");
WebViewImpl* webViewImpl =
m_webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html");
webViewImpl->resize(WebSize(100, 150));
« third_party/WebKit/Source/platform/testing/UnitTestHelpers.cpp ('K') | « third_party/WebKit/Source/web/tests/WebSearchableFormDataTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698