Modified: trunk/Source/WebKit/qt/ChangeLog (92185 => 92186)
--- trunk/Source/WebKit/qt/ChangeLog 2011-08-02 13:54:24 UTC (rev 92185)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-08-02 13:58:55 UTC (rev 92186)
@@ -1,5 +1,17 @@
2011-08-02 Kristóf Kosztyó <[email protected]>
+ [Qt] Fix tst_QDeclarativeWebView::basicProperties() and historyNav() autotests
+ https://bugs.webkit.org/show_bug.cgi?id=61042
+ Remove mark as expected fail where unexpected pass and mark failing test case as expected fail
+
+ Reviewed by Csaba Osztrogonác.
+
+ * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp:
+ (tst_QDeclarativeWebView::basicProperties):
+ (tst_QDeclarativeWebView::historyNav):
+
+2011-08-02 Kristóf Kosztyó <[email protected]>
+
[Qt] Fix tst_QWebPage::viewModes() API test
https://bugs.webkit.org/show_bug.cgi?id=65531
Modified: trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp (92185 => 92186)
--- trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp 2011-08-02 13:54:24 UTC (rev 92185)
+++ trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp 2011-08-02 13:58:55 UTC (rev 92186)
@@ -104,7 +104,6 @@
QVERIFY(wv);
QTRY_COMPARE(wv->property("progress").toDouble(), 1.0);
QCOMPARE(wv->property("title").toString(), QLatin1String("Basic"));
- QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=61042", Continue);
QTRY_COMPARE(qvariant_cast<QPixmap>(wv->property("icon")).width(), 48);
QEXPECT_FAIL("", "'icon' property isn't working", Continue);
QCOMPARE(qvariant_cast<QPixmap>(wv->property("icon")), QPixmap("qrc:///resources/basic.png"));
@@ -182,7 +181,6 @@
for (int i = 1; i <= 2; ++i) {
QTRY_COMPARE(wv->property("progress").toDouble(), 1.0);
QCOMPARE(wv->property("title").toString(), QLatin1String("Basic"));
- QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=61042", Continue);
QTRY_COMPARE(qvariant_cast<QPixmap>(wv->property("icon")).width(), 48);
QEXPECT_FAIL("", "'icon' property isn't working", Continue);
QCOMPARE(qvariant_cast<QPixmap>(wv->property("icon")), QPixmap("qrc:///data/basic.png"));
@@ -202,7 +200,6 @@
wv->setProperty("url", QUrl("qrc:///resources/forward.html"));
QTRY_COMPARE(wv->property("progress").toDouble(), 1.0);
QCOMPARE(wv->property("title").toString(), QLatin1String("Forward"));
- QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=61042", Continue);
QTRY_COMPARE(qvariant_cast<QPixmap>(wv->property("icon")).width(), 32);
QEXPECT_FAIL("", "'icon' property isn't working", Continue);
QCOMPARE(qvariant_cast<QPixmap>(wv->property("icon")), QPixmap("qrc:///resources/forward.png"));
@@ -211,9 +208,11 @@
QCOMPARE(wv->property("status").toInt(), int(QDeclarativeWebView::Ready));
QCOMPARE(wv->property("statusText").toString(), QString());
+ QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=61042", Continue);
QVERIFY(reloadAction->isEnabled());
QVERIFY(backAction->isEnabled());
QVERIFY(!forwardAction->isEnabled());
+ QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=61042", Continue);
QVERIFY(!stopAction->isEnabled());
backAction->trigger();
