Diff
Modified: trunk/Source/WebKit2/ChangeLog (118763 => 118764)
--- trunk/Source/WebKit2/ChangeLog 2012-05-29 13:21:43 UTC (rev 118763)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-29 13:26:03 UTC (rev 118764)
@@ -1,3 +1,18 @@
+2012-05-29 Kenneth Rohde Christiansen <kenn...@webkit.org>
+
+ [Qt] Move tests from DesktopBehavior which can be made to work
+ https://bugs.webkit.org/show_bug.cgi?id=87736
+
+ Rubberstamped by Simon Hausmann.
+
+ Move and modify the following tests to WebView/ and make them
+ use touch events.
+
+ * UIProcess/API/qt/tests/qmltests/WebView/tst_itemSelector.qml: Renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_itemSelector.qml.
+ * UIProcess/API/qt/tests/qmltests/WebView/tst_messaging.qml: Renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml.
+ * UIProcess/API/qt/tests/qmltests/WebView/tst_multiFileUpload.qml: Renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_multiFileUpload.qml.
+ * UIProcess/API/qt/tests/qmltests/WebView/tst_singleFileUpload.qml: Renamed from Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_singleFileUpload.qml.
+
2012-05-29 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
[Qt] Sync up favicon-implementation with WebView url changes in r118158
Deleted: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_itemSelector.qml (118763 => 118764)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_itemSelector.qml 2012-05-29 13:21:43 UTC (rev 118763)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_itemSelector.qml 2012-05-29 13:26:03 UTC (rev 118764)
@@ -1,119 +0,0 @@
-import QtQuick 2.0
-import QtTest 1.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
-import "../common"
-
-// FIXME: Moved to Desktop tests because we want to have mouseClick() to open the <select> tag. We can move it back
-// when TestCase starts supporting touch events, see https://bugreports.qt.nokia.com/browse/QTBUG-23083.
-TestWebView {
- id: webView
-
- width: 400
- height: 400
-
- property int initialSelection
- property int finalSelection
- property bool useAcceptDirectly
- property bool selectorLoaded
-
- experimental.itemSelector: Item {
- Component.onCompleted: {
- if (WebView.view.initialSelection != -1)
- model.items.select(WebView.view.initialSelection)
-
- if (WebView.view.finalSelection == -1)
- model.reject()
- else {
- if (useAcceptDirectly) {
- model.accept(WebView.view.finalSelection)
- } else {
- model.items.select(WebView.view.finalSelection)
- model.accept()
- }
- }
-
- WebView.view.selectorLoaded = true
- }
- }
-
- SignalSpy {
- id: titleSpy
- target: webView
- signalName: "titleChanged"
- }
-
- TestCase {
- id: test
- name: "WebViewItemSelector"
- when: windowShown
-
- function init() {
- webView.initialSelection = -1
- webView.finalSelection = -1
- webView.useAcceptDirectly = false
- webView.selectorLoaded = false
- webView.url = ""
- verify(webView.waitForLoadSucceeded())
- titleSpy.clear()
- }
-
- function openItemSelector() {
- mouseClick(webView, 15, 15, Qt.LeftButton)
- }
-
- function test_accept() {
- webView.finalSelection = 1
- openItemSelector()
- titleSpy.wait()
- compare(webView.title, "__closed__")
- }
-
- function test_acceptDirectly() {
- webView.finalSelection = 1
- webView.useAcceptDirectly = true
- openItemSelector()
- titleSpy.wait()
- compare(webView.title, "__closed__")
- }
-
- function test_selectFirstThenAccept() {
- webView.initialSelection = 1
- webView.finalSelection = 2
- openItemSelector()
- titleSpy.wait()
- compare(webView.title, "__all__")
- }
-
- function test_selectFirstThenAcceptDirectly() {
- webView.initialSelection = 1
- webView.finalSelection = 2
- webView.useAcceptDirectly = true
- openItemSelector()
- titleSpy.wait()
- compare(webView.title, "__all__")
- }
-
- function test_reject() {
- openItemSelector()
- tryCompare(webView, "selectorLoaded", true)
- compare(webView.title, "No new selection was made")
- }
-
- function test_selectFirstThenReject() {
- webView.initialSelection = 1
- webView.finalSelection = -1
- openItemSelector()
- tryCompare(webView, "selectorLoaded", true)
- compare(webView.title, "No new selection was made")
- }
-
- function test_selectWithSize() {
- webView.url = ""
- verify(webView.waitForLoadSucceeded())
- titleSpy.clear()
-
- test_selectFirstThenAcceptDirectly()
- }
- }
-}
Deleted: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml (118763 => 118764)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml 2012-05-29 13:21:43 UTC (rev 118763)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml 2012-05-29 13:26:03 UTC (rev 118764)
@@ -1,89 +0,0 @@
-import QtQuick 2.0
-import QtTest 1.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
-import "../common"
-
-Item {
- TestWebView {
- id: webView
- property variant lastMessage
- experimental.preferences.navigatorQtObjectEnabled: true
- experimental.onMessageReceived: {
- lastMessage = message
- }
- }
-
- TestWebView {
- id: otherWebView
- property variant lastMessage
- experimental.preferences.navigatorQtObjectEnabled: true
- experimental.onMessageReceived: {
- lastMessage = message
- }
- }
-
- TestWebView {
- id: disabledWebView
- property bool receivedMessage
- experimental.preferences.navigatorQtObjectEnabled: false
- experimental.onMessageReceived: {
- receivedMessage = true
- }
- }
-
- SignalSpy {
- id: messageSpy
- target: webView.experimental
- signalName: "messageReceived"
- }
-
- SignalSpy {
- id: otherMessageSpy
- target: otherWebView.experimental
- signalName: "messageReceived"
- }
-
- TestCase {
- name: "DesktopWebViewMessaging"
- property url testUrl: Qt.resolvedUrl("../common/messaging.html")
-
- function init() {
- messageSpy.clear()
- webView.lastMessage = null
- otherMessageSpy.clear()
- otherWebView.lastMessage = null
- }
-
- function test_basic() {
- webView.url = ""
- verify(webView.waitForLoadSucceeded())
- webView.experimental.postMessage("HELLO")
- messageSpy.wait()
- compare(webView.lastMessage.data, "OLLEH")
- compare(webView.lastMessage.origin.toString(), testUrl.toString())
- }
-
- function test_twoWebViews() {
- webView.url = ""
- otherWebView.url = ""
- verify(webView.waitForLoadSucceeded())
- verify(otherWebView.waitForLoadSucceeded())
- webView.experimental.postMessage("FIRST")
- otherWebView.experimental.postMessage("SECOND")
- messageSpy.wait()
- otherMessageSpy.wait()
- compare(webView.lastMessage.data, "TSRIF")
- compare(otherWebView.lastMessage.data, "DNOCES")
- }
-
- function test_disabled() {
- disabledWebView.url = ""
- verify(!disabledWebView.experimental.preferences.navigatorQtObjectEnabled)
- verify(disabledWebView.waitForLoadSucceeded())
- disabledWebView.experimental.postMessage("HI")
- wait(1000)
- verify(!disabledWebView.receivedMessage)
- }
- }
-}
Deleted: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_multiFileUpload.qml (118763 => 118764)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_multiFileUpload.qml 2012-05-29 13:21:43 UTC (rev 118763)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_multiFileUpload.qml 2012-05-29 13:26:03 UTC (rev 118764)
@@ -1,66 +0,0 @@
-import QtQuick 2.0
-import QtTest 1.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
-import "../common"
-
-// FIXME: Added to Desktop tests because we want to have mouseClick() to open the <input> tag. We can move it back
-// when TestCase starts supporting touch events, see https://bugreports.qt.nokia.com/browse/QTBUG-23083.
-TestWebView {
- id: webView
-
- width: 400
- height: 400
-
- property bool selectFile
-
- experimental.filePicker: Item {
- Timer {
- running: true
- interval: 1
- onTriggered: {
- var selectedFiles = ["filename1", "filename2"]
- if (selectFile)
- model.accept(selectedFiles)
- else
- model.reject();
- }
- }
- }
-
- SignalSpy {
- id: titleSpy
- target: webView
- signalName: "titleChanged"
- }
-
- TestCase {
- id: test
- name: "WebViewMultiFilePicker"
- when: windowShown
-
- function init() {
- webView.url = ""
- verify(webView.waitForLoadSucceeded())
- titleSpy.clear()
- }
-
- function openItemSelector() {
- mouseClick(webView, 15, 15, Qt.LeftButton)
- }
-
- function test_accept() {
- webView.selectFile = true;
- openItemSelector()
- titleSpy.wait()
- compare(webView.title, "filename1,filename2")
- }
-
- function test_reject() {
- var oldTitle = webView.title
- webView.selectFile = false;
- openItemSelector()
- compare(webView.title, oldTitle)
- }
- }
-}
Deleted: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_singleFileUpload.qml (118763 => 118764)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_singleFileUpload.qml 2012-05-29 13:21:43 UTC (rev 118763)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_singleFileUpload.qml 2012-05-29 13:26:03 UTC (rev 118764)
@@ -1,79 +0,0 @@
-import QtQuick 2.0
-import QtTest 1.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
-import "../common"
-
-// FIXME: Added to Desktop tests because we want to have mouseClick() to open the <input> tag. We can move it back
-// when TestCase starts supporting touch events, see https://bugreports.qt.nokia.com/browse/QTBUG-23083.
-TestWebView {
- id: webView
-
- width: 400
- height: 400
-
- property bool selectFile
- property bool acceptMultiple: false
-
- experimental.filePicker: Item {
- Timer {
- running: true
- interval: 1
- onTriggered: {
- var selectedFiles = ["filename1", "filename2"]
- if (selectFile) {
- if (acceptMultiple)
- model.accept(selectedFiles)
- else
- model.accept("acceptedfilename");
- }
- else
- model.reject();
- }
- }
- }
-
- SignalSpy {
- id: titleSpy
- target: webView
- signalName: "titleChanged"
- }
-
- TestCase {
- id: test
- name: "WebViewSingleFilePicker"
- when: windowShown
-
- function init() {
- webView.url = ""
- verify(webView.waitForLoadSucceeded())
- titleSpy.clear()
- }
-
- function openItemSelector() {
- mouseClick(webView, 15, 15, Qt.LeftButton)
- }
-
- function test_accept() {
- webView.selectFile = true;
- openItemSelector()
- titleSpy.wait()
- compare(webView.title, "acceptedfilename")
- }
-
- function test_multiple() {
- webView.selectFile = true;
- webView.acceptMultiple = true;
- openItemSelector()
- titleSpy.wait()
- compare(webView.title, "filename1")
- }
-
- function test_reject() {
- var oldTitle = webView.title
- webView.selectFile = false;
- openItemSelector()
- compare(webView.title, oldTitle)
- }
- }
-}
Copied: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_itemSelector.qml (from rev 118763, trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_itemSelector.qml) (0 => 118764)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_itemSelector.qml (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_itemSelector.qml 2012-05-29 13:26:03 UTC (rev 118764)
@@ -0,0 +1,117 @@
+import QtQuick 2.0
+import QtTest 1.0
+import QtWebKit 3.0
+import QtWebKit.experimental 1.0
+import "../common"
+
+TestWebView {
+ id: webView
+
+ width: 400
+ height: 400
+
+ property int initialSelection
+ property int finalSelection
+ property bool useAcceptDirectly
+ property bool selectorLoaded
+
+ experimental.itemSelector: Item {
+ Component.onCompleted: {
+ if (WebView.view.initialSelection != -1)
+ model.items.select(WebView.view.initialSelection)
+
+ if (WebView.view.finalSelection == -1)
+ model.reject()
+ else {
+ if (useAcceptDirectly) {
+ model.accept(WebView.view.finalSelection)
+ } else {
+ model.items.select(WebView.view.finalSelection)
+ model.accept()
+ }
+ }
+
+ WebView.view.selectorLoaded = true
+ }
+ }
+
+ SignalSpy {
+ id: titleSpy
+ target: webView
+ signalName: "titleChanged"
+ }
+
+ TestCase {
+ id: test
+ name: "WebViewItemSelector"
+ when: windowShown
+
+ function init() {
+ webView.initialSelection = -1
+ webView.finalSelection = -1
+ webView.useAcceptDirectly = false
+ webView.selectorLoaded = false
+ webView.url = ""
+ verify(webView.waitForLoadSucceeded())
+ titleSpy.clear()
+ }
+
+ function openItemSelector() {
+ webView.experimental.test.touchTap(webView, 15, 15)
+ }
+
+ function test_accept() {
+ webView.finalSelection = 1
+ openItemSelector()
+ titleSpy.wait()
+ compare(webView.title, "__closed__")
+ }
+
+ function test_acceptDirectly() {
+ webView.finalSelection = 1
+ webView.useAcceptDirectly = true
+ openItemSelector()
+ titleSpy.wait()
+ compare(webView.title, "__closed__")
+ }
+
+ function test_selectFirstThenAccept() {
+ webView.initialSelection = 1
+ webView.finalSelection = 2
+ openItemSelector()
+ titleSpy.wait()
+ compare(webView.title, "__all__")
+ }
+
+ function test_selectFirstThenAcceptDirectly() {
+ webView.initialSelection = 1
+ webView.finalSelection = 2
+ webView.useAcceptDirectly = true
+ openItemSelector()
+ titleSpy.wait()
+ compare(webView.title, "__all__")
+ }
+
+ function test_reject() {
+ openItemSelector()
+ tryCompare(webView, "selectorLoaded", true)
+ compare(webView.title, "No new selection was made")
+ }
+
+ function test_selectFirstThenReject() {
+ webView.initialSelection = 1
+ webView.finalSelection = -1
+ openItemSelector()
+ tryCompare(webView, "selectorLoaded", true)
+ compare(webView.title, "No new selection was made")
+ }
+
+ function test_selectWithSize() {
+ webView.url = ""
+ verify(webView.waitForLoadSucceeded())
+ titleSpy.clear()
+
+ test_selectFirstThenAcceptDirectly()
+ }
+ }
+}
Copied: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_messaging.qml (from rev 118763, trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml) (0 => 118764)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_messaging.qml (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_messaging.qml 2012-05-29 13:26:03 UTC (rev 118764)
@@ -0,0 +1,89 @@
+import QtQuick 2.0
+import QtTest 1.0
+import QtWebKit 3.0
+import QtWebKit.experimental 1.0
+import "../common"
+
+Item {
+ TestWebView {
+ id: webView
+ property variant lastMessage
+ experimental.preferences.navigatorQtObjectEnabled: true
+ experimental.onMessageReceived: {
+ lastMessage = message
+ }
+ }
+
+ TestWebView {
+ id: otherWebView
+ property variant lastMessage
+ experimental.preferences.navigatorQtObjectEnabled: true
+ experimental.onMessageReceived: {
+ lastMessage = message
+ }
+ }
+
+ TestWebView {
+ id: disabledWebView
+ property bool receivedMessage
+ experimental.preferences.navigatorQtObjectEnabled: false
+ experimental.onMessageReceived: {
+ receivedMessage = true
+ }
+ }
+
+ SignalSpy {
+ id: messageSpy
+ target: webView.experimental
+ signalName: "messageReceived"
+ }
+
+ SignalSpy {
+ id: otherMessageSpy
+ target: otherWebView.experimental
+ signalName: "messageReceived"
+ }
+
+ TestCase {
+ name: "WebViewMessaging"
+ property url testUrl: Qt.resolvedUrl("../common/messaging.html")
+
+ function init() {
+ messageSpy.clear()
+ webView.lastMessage = null
+ otherMessageSpy.clear()
+ otherWebView.lastMessage = null
+ }
+
+ function test_basic() {
+ webView.url = ""
+ verify(webView.waitForLoadSucceeded())
+ webView.experimental.postMessage("HELLO")
+ messageSpy.wait()
+ compare(webView.lastMessage.data, "OLLEH")
+ compare(webView.lastMessage.origin.toString(), testUrl.toString())
+ }
+
+ function test_twoWebViews() {
+ webView.url = ""
+ otherWebView.url = ""
+ verify(webView.waitForLoadSucceeded())
+ verify(otherWebView.waitForLoadSucceeded())
+ webView.experimental.postMessage("FIRST")
+ otherWebView.experimental.postMessage("SECOND")
+ messageSpy.wait()
+ otherMessageSpy.wait()
+ compare(webView.lastMessage.data, "TSRIF")
+ compare(otherWebView.lastMessage.data, "DNOCES")
+ }
+
+ function test_disabled() {
+ disabledWebView.url = ""
+ verify(!disabledWebView.experimental.preferences.navigatorQtObjectEnabled)
+ verify(disabledWebView.waitForLoadSucceeded())
+ disabledWebView.experimental.postMessage("HI")
+ wait(1000)
+ verify(!disabledWebView.receivedMessage)
+ }
+ }
+}
Copied: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_multiFileUpload.qml (from rev 118763, trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_multiFileUpload.qml) (0 => 118764)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_multiFileUpload.qml (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_multiFileUpload.qml 2012-05-29 13:26:03 UTC (rev 118764)
@@ -0,0 +1,64 @@
+import QtQuick 2.0
+import QtTest 1.0
+import QtWebKit 3.0
+import QtWebKit.experimental 1.0
+import "../common"
+
+TestWebView {
+ id: webView
+
+ width: 400
+ height: 400
+
+ property bool selectFile
+
+ experimental.filePicker: Item {
+ Timer {
+ running: true
+ interval: 1
+ onTriggered: {
+ var selectedFiles = ["filename1", "filename2"]
+ if (selectFile)
+ model.accept(selectedFiles)
+ else
+ model.reject();
+ }
+ }
+ }
+
+ SignalSpy {
+ id: titleSpy
+ target: webView
+ signalName: "titleChanged"
+ }
+
+ TestCase {
+ id: test
+ name: "WebViewMultiFilePicker"
+ when: windowShown
+
+ function init() {
+ webView.url = ""
+ verify(webView.waitForLoadSucceeded())
+ titleSpy.clear()
+ }
+
+ function openItemSelector() {
+ webView.experimental.test.touchTap(webView, 15, 15)
+ }
+
+ function test_accept() {
+ webView.selectFile = true;
+ openItemSelector()
+ titleSpy.wait()
+ compare(webView.title, "filename1,filename2")
+ }
+
+ function test_reject() {
+ var oldTitle = webView.title
+ webView.selectFile = false;
+ openItemSelector()
+ compare(webView.title, oldTitle)
+ }
+ }
+}
Copied: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_singleFileUpload.qml (from rev 118763, trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_singleFileUpload.qml) (0 => 118764)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_singleFileUpload.qml (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_singleFileUpload.qml 2012-05-29 13:26:03 UTC (rev 118764)
@@ -0,0 +1,77 @@
+import QtQuick 2.0
+import QtTest 1.0
+import QtWebKit 3.0
+import QtWebKit.experimental 1.0
+import "../common"
+
+TestWebView {
+ id: webView
+
+ width: 400
+ height: 400
+
+ property bool selectFile
+ property bool acceptMultiple: false
+
+ experimental.filePicker: Item {
+ Timer {
+ running: true
+ interval: 1
+ onTriggered: {
+ var selectedFiles = ["filename1", "filename2"]
+ if (selectFile) {
+ if (acceptMultiple)
+ model.accept(selectedFiles)
+ else
+ model.accept("acceptedfilename");
+ }
+ else
+ model.reject();
+ }
+ }
+ }
+
+ SignalSpy {
+ id: titleSpy
+ target: webView
+ signalName: "titleChanged"
+ }
+
+ TestCase {
+ id: test
+ name: "WebViewSingleFilePicker"
+ when: windowShown
+
+ function init() {
+ webView.url = ""
+ verify(webView.waitForLoadSucceeded())
+ titleSpy.clear()
+ }
+
+ function openItemSelector() {
+ webView.experimental.test.touchTap(webView, 15, 15)
+ }
+
+ function test_accept() {
+ webView.selectFile = true;
+ openItemSelector()
+ titleSpy.wait()
+ compare(webView.title, "acceptedfilename")
+ }
+
+ function test_multiple() {
+ webView.selectFile = true;
+ webView.acceptMultiple = true;
+ openItemSelector()
+ titleSpy.wait()
+ compare(webView.title, "filename1")
+ }
+
+ function test_reject() {
+ var oldTitle = webView.title
+ webView.selectFile = false;
+ openItemSelector()
+ compare(webView.title, oldTitle)
+ }
+ }
+}
