projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ba995c3)
Fix autotest tst_qtextbrowser.cpp
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>
Mon, 24 Oct 2011 10:03:10 +0000 (12:03 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 25 Oct 2011 13:16:46 +0000 (15:16 +0200)
The qrc tests need further investigation.
Bring at least back the basic test.

Change-Id: I302a37b6c989af76db67716ffcf10a0960234156
Reviewed-by: Kristoffer Flottorp <kristoffer.flottorp@nokia.com>
tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro patch | blob | history
tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp patch | blob | history

diff --git a/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro b/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro
index d66adf7..24185b1 100644 (file)
--- a/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro
+++ b/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro
@@ -12,5 +12,3 @@ wince* {
    addDir.path = subdir
    DEPLOYMENT += addFiles addDir
 }
-
-CONFIG+=insignificant_test
diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
index a1592e5..faf0546 100644 (file)
--- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
+++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
@@ -140,7 +140,7 @@ void tst_QTextBrowser::cleanup()
 
 void tst_QTextBrowser::noReloadOnAnchorJump()
 {
-    QUrl url("anchor.html");
+    QUrl url = QUrl::fromLocalFile("anchor.html");
 
     browser->htmlLoadAttempts = 0;
     browser->setSource(url);
@@ -156,11 +156,11 @@ void tst_QTextBrowser::noReloadOnAnchorJump()
 
 void tst_QTextBrowser::bgColorOnSourceChange()
 {
-    browser->setSource(QUrl("pagewithbg.html"));
+    browser->setSource(QUrl::fromLocalFile("pagewithbg.html"));
     QVERIFY(browser->document()->rootFrame()->frameFormat().hasProperty(QTextFormat::BackgroundBrush));
     QVERIFY(browser->document()->rootFrame()->frameFormat().background().color() == Qt::blue);
 
-    browser->setSource(QUrl("pagewithoutbg.html"));
+    browser->setSource(QUrl::fromLocalFile("pagewithoutbg.html"));
     QVERIFY(!browser->document()->rootFrame()->frameFormat().hasProperty(QTextFormat::BackgroundBrush));
 }
 
@@ -173,7 +173,7 @@ void tst_QTextBrowser::forwardButton()
     QVERIFY(browser->historyTitle(0).isEmpty());
     QVERIFY(browser->historyTitle(1).isEmpty());
 
-    browser->setSource(QUrl("pagewithbg.html"));
+    browser->setSource(QUrl::fromLocalFile("pagewithbg.html"));
 
     QVERIFY(!forwardEmissions.isEmpty());
     QVariant val = forwardEmissions.takeLast()[0];
@@ -186,12 +186,12 @@ void tst_QTextBrowser::forwardButton()
     QVERIFY(val.toBool() == false);
 
     QVERIFY(browser->historyTitle(-1).isEmpty());
-    QCOMPARE(browser->historyUrl(0), QUrl("pagewithbg.html"));
+    QCOMPARE(browser->historyUrl(0), QUrl::fromLocalFile("pagewithbg.html"));
     QCOMPARE(browser->documentTitle(), QString("Page With BG"));
     QCOMPARE(browser->historyTitle(0), QString("Page With BG"));
     QVERIFY(browser->historyTitle(1).isEmpty());
 
-    browser->setSource(QUrl("anchor.html"));
+    browser->setSource(QUrl::fromLocalFile("anchor.html"));
 
     QVERIFY(!forwardEmissions.isEmpty());
     val = forwardEmissions.takeLast()[0];
@@ -238,11 +238,11 @@ void tst_QTextBrowser::forwardButton()
 
 void tst_QTextBrowser::viewportPositionInHistory()
 {
-    browser->setSource(QUrl("bigpage.html"));
+    browser->setSource(QUrl::fromLocalFile("bigpage.html"));
     browser->scrollToAnchor("bottom");
     QVERIFY(browser->verticalScrollBar()->value() > 0);
 
-    browser->setSource(QUrl("pagewithbg.html"));
+    browser->setSource(QUrl::fromLocalFile("pagewithbg.html"));
     QCOMPARE(browser->verticalScrollBar()->value(), 0);
 
     browser->backward();
@@ -277,11 +277,11 @@ void tst_QTextBrowser::relativeLinks()
 
 void tst_QTextBrowser::anchors()
 {
-    browser->setSource(QUrl("bigpage.html"));
+    browser->setSource(QUrl::fromLocalFile("bigpage.html"));
     browser->setSource(QUrl("#bottom"));
     QVERIFY(browser->verticalScrollBar()->value() > 0);
 
-    browser->setSource(QUrl("bigpage.html"));
+    browser->setSource(QUrl::fromLocalFile("bigpage.html"));
     browser->setSource(QUrl("#id-anchor"));
     QVERIFY(browser->verticalScrollBar()->value() > 0);
 }
@@ -289,6 +289,7 @@ void tst_QTextBrowser::anchors()
 void tst_QTextBrowser::resourceAutoDetection()
 {
     browser->setHtml("<img src=\":/some/resource\"/>");
+QEXPECT_FAIL("", "FIXME: Resource detection broken", Continue);
     QCOMPARE(browser->lastResource.toString(), QString("qrc:/some/resource"));
 }
 
@@ -300,7 +301,7 @@ void tst_QTextBrowser::forwardBackwardAvailable()
     QVERIFY(!browser->isBackwardAvailable());
     QVERIFY(!browser->isForwardAvailable());
 
-    browser->setSource(QUrl("anchor.html"));
+    browser->setSource(QUrl::fromLocalFile("anchor.html"));
     QVERIFY(!browser->isBackwardAvailable());
     QVERIFY(!browser->isForwardAvailable());
     QCOMPARE(backwardSpy.count(), 1);
@@ -311,7 +312,7 @@ void tst_QTextBrowser::forwardBackwardAvailable()
     backwardSpy.clear();
     forwardSpy.clear();
 
-    browser->setSource(QUrl("bigpage.html"));
+    browser->setSource(QUrl::fromLocalFile("bigpage.html"));
     QVERIFY(browser->isBackwardAvailable());
     QVERIFY(!browser->isForwardAvailable());
     QCOMPARE(backwardSpy.count(), 1);
@@ -322,7 +323,7 @@ void tst_QTextBrowser::forwardBackwardAvailable()
     backwardSpy.clear();
     forwardSpy.clear();
 
-    browser->setSource(QUrl("pagewithbg.html"));
+    browser->setSource(QUrl::fromLocalFile("pagewithbg.html"));
     QVERIFY(browser->isBackwardAvailable());
     QVERIFY(!browser->isForwardAvailable());
     QCOMPARE(backwardSpy.count(), 1);
@@ -400,7 +401,7 @@ void tst_QTextBrowser::clearHistory()
     backwardSpy.clear();
     forwardSpy.clear();
 
-    browser->setSource(QUrl("anchor.html"));
+    browser->setSource(QUrl::fromLocalFile("anchor.html"));
     QVERIFY(!browser->isBackwardAvailable());
     QVERIFY(!browser->isForwardAvailable());
     QCOMPARE(backwardSpy.count(), 1);
@@ -411,7 +412,7 @@ void tst_QTextBrowser::clearHistory()
     backwardSpy.clear();
     forwardSpy.clear();
 
-    browser->setSource(QUrl("bigpage.html"));
+    browser->setSource(QUrl::fromLocalFile("bigpage.html"));
     QVERIFY(browser->isBackwardAvailable());
     QVERIFY(!browser->isForwardAvailable());
     QCOMPARE(backwardSpy.count(), 1);
@@ -432,18 +433,19 @@ void tst_QTextBrowser::clearHistory()
     QVERIFY(browser->historyTitle(-1).isEmpty());
     QVERIFY(browser->historyTitle(1).isEmpty());
 
-    QCOMPARE(browser->source(), QUrl("bigpage.html"));
+    QCOMPARE(browser->source(), QUrl::fromLocalFile("bigpage.html"));
     browser->backward();
-    QCOMPARE(browser->source(), QUrl("bigpage.html"));
+    QCOMPARE(browser->source(), QUrl::fromLocalFile("bigpage.html"));
     browser->home();
-    QCOMPARE(browser->source(), QUrl("bigpage.html"));
+    QCOMPARE(browser->source(), QUrl::fromLocalFile("bigpage.html"));
 }
 
 void tst_QTextBrowser::sourceInsideLoadResource()
 {
-    QUrl url("pagewithimage.html");
+    QUrl url = QUrl::fromLocalFile("pagewithimage.html");
     browser->setSource(url);
-    QCOMPARE(browser->lastResource.toString(), QUrl::fromLocalFile(QDir::current().filePath("foobar.png")).toString());
+QEXPECT_FAIL("", "FIXME: Resource detection broken", Continue);
+    QCOMPARE(browser->lastResource.toLocalFile(), QUrl::fromLocalFile(QDir::current().filePath("foobar.png")).toString());
     QEXPECT_FAIL("", "This is currently not supported", Continue);
     QCOMPARE(browser->sourceInsideLoadResource.toString(), url.toString());
 }
@@ -526,7 +528,7 @@ void tst_QTextBrowser::adjacentAnchors()
 
 void tst_QTextBrowser::loadResourceOnRelativeLocalFiles()
 {
-    browser->setSource(QUrl("subdir/index.html"));
+    browser->setSource(QUrl::fromLocalFile("subdir/index.html"));
     QVERIFY(!browser->toPlainText().isEmpty());
     QVariant v = browser->loadResource(QTextDocument::HtmlResource, QUrl("../anchor.html"));
     QVERIFY(v.isValid());
@@ -537,7 +539,7 @@ void tst_QTextBrowser::loadResourceOnRelativeLocalFiles()
 void tst_QTextBrowser::focusIndicator()
 {
     HackBrowser *browser = new HackBrowser;
-    browser->setSource(QUrl("firstpage.html"));
+    browser->setSource(QUrl::fromLocalFile("firstpage.html"));
     QVERIFY(!browser->textCursor().hasSelection());
 
     browser->focusTheNextChild();
@@ -589,7 +591,7 @@ void tst_QTextBrowser::focusIndicator()
 void tst_QTextBrowser::focusHistory()
 {
     HackBrowser *browser = new HackBrowser;
-    browser->setSource(QUrl("firstpage.html"));
+    browser->setSource(QUrl::fromLocalFile("firstpage.html"));
     QVERIFY(!browser->textCursor().hasSelection());
 
     browser->focusTheNextChild();
Domain: UI Framework / Uncategorized;