Diff
Modified: trunk/Source/WebKit2/ChangeLog (99072 => 99073)
--- trunk/Source/WebKit2/ChangeLog 2011-11-02 16:45:47 UTC (rev 99072)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-02 16:46:58 UTC (rev 99073)
@@ -1,3 +1,21 @@
+2011-11-02 Jocelyn Turcotte <[email protected]>
+
+ [Qt] Fix qmltest API test failures related to r98973.
+ https://bugs.webkit.org/show_bug.cgi?id=71280
+
+ Reviewed by Noam Rosenthal.
+
+ Most of the API was moved from TouchWebView.page to TouchWebView directly.
+ Fixed the qml tests to reflect this change.
+
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_load.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadFail.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadNegativeSizeView.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgress.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgressSignal.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadZeroSizeView.qml:
+ * UIProcess/API/qt/tests/qmltests/TouchWebView/tst_properties.qml:
+
2011-11-02 Kenneth Rohde Christiansen <[email protected]>
[Qt] Handle interruption of page interaction better
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_load.qml (99072 => 99073)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_load.qml 2011-11-02 16:45:47 UTC (rev 99072)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_load.qml 2011-11-02 16:46:58 UTC (rev 99073)
@@ -9,7 +9,7 @@
SignalSpy {
id: spy
- target: webView.page
+ target: webView
signalName: "loadSucceeded"
}
@@ -18,9 +18,9 @@
function test_load() {
compare(spy.count, 0)
- webView.page.load(Qt.resolvedUrl("../common/test1.html"))
+ webView.load(Qt.resolvedUrl("../common/test1.html"))
spy.wait()
- compare(webView.page.title, "Test page 1")
+ compare(webView.title, "Test page 1")
compare(webView.width, 400)
compare(webView.height, 600)
}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadFail.qml (99072 => 99073)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadFail.qml 2011-11-02 16:45:47 UTC (rev 99072)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadFail.qml 2011-11-02 16:46:58 UTC (rev 99073)
@@ -9,7 +9,7 @@
SignalSpy {
id: spy
- target: webView.page
+ target: webView
signalName: "loadFailed"
}
@@ -21,17 +21,17 @@
skip("Fails due to https://bugreports.qt.nokia.com/browse/QTBUG-21537")
compare(spy.count, 0)
testUrl = Qt.resolvedUrl("file_that_does_not_exist.html")
- webView.page.load(testUrl)
+ webView.load(testUrl)
spy.wait()
compare(spy.count, 1)
}
}
Connections {
- target: webView.page
+ target: webView
onLoadFailed: {
test.compare(url, testUrl)
test.compare(errorCode, NetworkReply.ContentNotFoundError)
- test.compare(errorType, TouchWebPage.NetworkError)
+ test.compare(errorType, TouchWebView.NetworkError)
}
}
}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadNegativeSizeView.qml (99072 => 99073)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadNegativeSizeView.qml 2011-11-02 16:45:47 UTC (rev 99072)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadNegativeSizeView.qml 2011-11-02 16:46:58 UTC (rev 99073)
@@ -9,7 +9,7 @@
SignalSpy {
id: spy
- target: webView.page
+ target: webView
signalName: "loadSucceeded"
}
@@ -18,9 +18,9 @@
function test_loadNegativeSizeView() {
compare(spy.count, 0)
- webView.page.load(Qt.resolvedUrl("../common/test1.html"))
+ webView.load(Qt.resolvedUrl("../common/test1.html"))
spy.wait()
- compare(webView.page.title, "Test page 1")
+ compare(webView.title, "Test page 1")
compare(webView.width, -400)
compare(webView.height, -600)
}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgress.qml (99072 => 99073)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgress.qml 2011-11-02 16:45:47 UTC (rev 99072)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgress.qml 2011-11-02 16:46:58 UTC (rev 99073)
@@ -7,7 +7,7 @@
SignalSpy {
id: spy
- target: webView.page
+ target: webView
signalName: "loadSucceeded"
}
@@ -17,10 +17,10 @@
function test_loadProgress() {
compare(spy.count, 0)
var testUrl = Qt.resolvedUrl("../common/test1.html")
- webView.page.load(testUrl)
- compare(webView.page.loadProgress, 0)
+ webView.load(testUrl)
+ compare(webView.loadProgress, 0)
spy.wait()
- compare(webView.page.loadProgress, 100)
+ compare(webView.loadProgress, 100)
}
}
}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgressSignal.qml (99072 => 99073)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgressSignal.qml 2011-11-02 16:45:47 UTC (rev 99072)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadProgressSignal.qml 2011-11-02 16:46:58 UTC (rev 99073)
@@ -7,13 +7,13 @@
SignalSpy {
id: spy
- target: webView.page
+ target: webView
signalName: "loadSucceeded"
}
SignalSpy {
id: spyProgress
- target: webView.page
+ target: webView
signalName: "loadProgressChanged"
}
@@ -22,14 +22,14 @@
function test_loadProgressSignal() {
compare(spyProgress.count, 0)
- compare(webView.page.loadProgress, 0)
- webView.page.load(Qt.resolvedUrl("../common/test1.html"))
+ compare(webView.loadProgress, 0)
+ webView.load(Qt.resolvedUrl("../common/test1.html"))
spyProgress.wait()
- compare(true, webView.page.loadProgress > -1 && webView.page.loadProgress < 101)
- if (webView.page.loadProgress > 0 && webView.page.loadProgress < 100) {
+ compare(true, webView.loadProgress > -1 && webView.loadProgress < 101)
+ if (webView.loadProgress > 0 && webView.loadProgress < 100) {
spy.wait()
spyProgress.wait()
- compare(webView.page.loadProgress, 100)
+ compare(webView.loadProgress, 100)
}
}
}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadZeroSizeView.qml (99072 => 99073)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadZeroSizeView.qml 2011-11-02 16:45:47 UTC (rev 99072)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_loadZeroSizeView.qml 2011-11-02 16:46:58 UTC (rev 99073)
@@ -9,7 +9,7 @@
SignalSpy {
id: spy
- target: webView.page
+ target: webView
signalName: "loadSucceeded"
}
@@ -18,9 +18,9 @@
function test_loadZeroSizeView() {
compare(spy.count, 0)
- webView.page.load(Qt.resolvedUrl("../common/test1.html"))
+ webView.load(Qt.resolvedUrl("../common/test1.html"))
spy.wait()
- compare(webView.page.title, "Test page 1")
+ compare(webView.title, "Test page 1")
compare(webView.width, 0)
compare(webView.height, 0)
}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_properties.qml (99072 => 99073)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_properties.qml 2011-11-02 16:45:47 UTC (rev 99072)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/TouchWebView/tst_properties.qml 2011-11-02 16:46:58 UTC (rev 99073)
@@ -7,7 +7,7 @@
SignalSpy {
id: spy
- target: webView.page
+ target: webView
signalName: "loadSucceeded"
}
@@ -16,17 +16,17 @@
function test_title() {
compare(spy.count, 0)
- webView.page.load(Qt.resolvedUrl("../common/test1.html"))
+ webView.load(Qt.resolvedUrl("../common/test1.html"))
spy.wait()
- compare(webView.page.title, "Test page 1")
+ compare(webView.title, "Test page 1")
}
function test_url() {
compare(spy.count, 1)
var testUrl = Qt.resolvedUrl("../common/test1.html")
- webView.page.load(testUrl)
+ webView.load(testUrl)
spy.wait()
- compare(webView.page.url, testUrl)
+ compare(webView.url, testUrl)
}
}
