[Qt][WK2] Fix zero sized views in all QML tests

https://bugs.webkit.org/show_bug.cgi?id=72633

Reviewed by Noam Rosenthal.

After r100590, zero sized WebViews are no longer supported and,
therefore, the QML API tests need to be fixed.

* UIProcess/API/qt/tests/qmltests/WebView/tst_loadFail.qml:
* UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgress.qml:
* UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgressSignal.qml:
* UIProcess/API/qt/tests/qmltests/WebView/tst_loadZeroSizeView.qml: Removed.
* UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml:
* UIProcess/API/qt/tests/qmltests/WebView/tst_properties.qml:
* UIProcess/API/qt/tests/qmltests/qmltests.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@100653 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index a246e7d..d27228a 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,21 @@
+2011-11-17  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        [Qt][WK2] Fix zero sized views in all QML tests
+        https://bugs.webkit.org/show_bug.cgi?id=72633
+
+        Reviewed by Noam Rosenthal.
+
+        After r100590, zero sized WebViews are no longer supported and,
+        therefore, the QML API tests need to be fixed.
+
+        * UIProcess/API/qt/tests/qmltests/WebView/tst_loadFail.qml:
+        * UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgress.qml:
+        * UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgressSignal.qml:
+        * UIProcess/API/qt/tests/qmltests/WebView/tst_loadZeroSizeView.qml: Removed.
+        * UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml:
+        * UIProcess/API/qt/tests/qmltests/WebView/tst_properties.qml:
+        * UIProcess/API/qt/tests/qmltests/qmltests.pro:
+
 2011-11-17  Alexis Menard  <alexis.menard@openbossa.org>
 
         [Qt][WK2] Don't export the private QQuickView.

diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadFail.qml b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadFail.qml
index 28dcbd4..5f565a3 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadFail.qml
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadFail.qml
@@ -4,6 +4,8 @@ import QtWebKit 3.0
 
 WebView {
     id: webView
+    width: 400
+    height: 300
 
     property variant testUrl
 

diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgress.qml b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgress.qml
index b46801c..a51d6f6 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgress.qml
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgress.qml
@@ -4,6 +4,8 @@ import QtWebKit 3.0
 
 WebView {
     id: webView
+    width: 400
+    height: 300
 
     SignalSpy {
         id: spy

diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgressSignal.qml b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgressSignal.qml
index b0b0a23..10ac879 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgressSignal.qml
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadProgressSignal.qml
@@ -4,6 +4,8 @@ import QtWebKit 3.0
 
 WebView {
     id: webView
+    width: 400
+    height: 300
 
     SignalSpy {
         id: spy

diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadZeroSizeView.qml b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadZeroSizeView.qml
deleted file mode 100644 (file)
index 20c9848..0000000
--- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadZeroSizeView.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-import QtQuick 2.0
-import QtTest 1.0
-import QtWebKit 3.0
-
-WebView {
-    id: webView
-    height: 0
-    width: 0
-
-    SignalSpy {
-        id: spy
-        target: webView
-        signalName: "loadSucceeded"
-    }
-
-    TestCase {
-        name: "WebViewLoad"
-
-        function test_loadZeroSizeView() {
-            compare(spy.count, 0)
-            webView.load(Qt.resolvedUrl("../common/test1.html"))
-            spy.wait()
-            compare(webView.title, "Test page 1")
-            compare(webView.width, 0)
-            compare(webView.height, 0)
-        }
-    }
-}

diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml
index b1a53f1..37ee9b1 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml
@@ -4,6 +4,8 @@ import QtWebKit 3.0
 
 WebView {
     id: webView
+    width: 400
+    height: 300
 
     preferences {
         javascriptEnabled: true

diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_properties.qml b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_properties.qml
index 996b885..4761cd3 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_properties.qml
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_properties.qml
@@ -4,6 +4,8 @@ import QtWebKit 3.0
 
 WebView {
     id: webView
+    width: 400
+    height: 300
 
     SignalSpy {
         id: spy

diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro
index 59947b0..56e499f 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro
@@ -17,7 +17,6 @@ DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\"
 
 OTHER_FILES += \
     WebView/tst_properties.qml \
-    WebView/tst_loadZeroSizeView.qml \
     WebView/tst_loadFail.qml \
     WebView/tst_loadProgress.qml \
     WebView/tst_loadProgressSignal.qml \