diff options
author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2012-01-27 14:47:54 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 04:04:53 +0100 |
commit | 835c53490b4fa9a248e6e4ca56965f9f7276da4d (patch) | |
tree | a50f68484e0448e7b79a31cc175ccdaf0ada4539 /tests | |
parent | c298c7b73b029358e604564913e62c441b13e742 (diff) |
Changed qtextbrowser unittest to work from install directory
- Changed qtextbrowser unittest to use TESTDATA and QFINDTESTDATA
Change-Id: I0ac7c990640d492d5ec94f5824c022a2b5075103
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.html (renamed from tests/auto/widgets/widgets/qtextbrowser.html) | 0 | ||||
-rw-r--r-- | tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro | 9 | ||||
-rw-r--r-- | tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp | 24 |
3 files changed, 14 insertions, 19 deletions
diff --git a/tests/auto/widgets/widgets/qtextbrowser.html b/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.html index 95593cc925..95593cc925 100644 --- a/tests/auto/widgets/widgets/qtextbrowser.html +++ b/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.html diff --git a/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro b/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro index 24185b1136..5416c1c71f 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro +++ b/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro @@ -1,14 +1,7 @@ CONFIG += testcase TARGET = tst_qtextbrowser SOURCES += tst_qtextbrowser.cpp -DEFINES += SRCDIR=\\\"$$PWD\\\" QT += widgets testlib -wince* { - addFiles.files = *.html - addFiles.path = . - addDir.files = subdir/* - addDir.path = subdir - DEPLOYMENT += addFiles addDir -} +TESTDATA += *.html subdir/* diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp index c4494bc011..c78989ebcb 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp +++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp @@ -120,11 +120,13 @@ tst_QTextBrowser::tst_QTextBrowser() tst_QTextBrowser::~tst_QTextBrowser() { } + void tst_QTextBrowser::init() { -#if !defined(Q_OS_IRIX) && !defined(Q_OS_WINCE) - QDir::setCurrent(SRCDIR); -#endif + QString prefix = QFileInfo(QFINDTESTDATA("subdir")).absolutePath(); + QVERIFY2(!prefix.isEmpty(), "Test data directory not found"); + QDir::setCurrent(prefix); + browser = new TestBrowser; browser->show(); } @@ -252,18 +254,18 @@ void tst_QTextBrowser::relativeLinks() qRegisterMetaType<QUrl>("QUrl"); QSignalSpy sourceChangedSpy(browser, SIGNAL(sourceChanged(const QUrl &))); - browser->setSource(QUrl("../qtextbrowser.html")); + browser->setSource(QUrl("subdir/../qtextbrowser.html")); QVERIFY(!browser->document()->isEmpty()); QVERIFY(sourceChangedSpy.count() == 1); - QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("../qtextbrowser.html")); - browser->setSource(QUrl("qtextbrowser/subdir/index.html")); + QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("subdir/../qtextbrowser.html")); + browser->setSource(QUrl("subdir/index.html")); QVERIFY(!browser->document()->isEmpty()); QVERIFY(sourceChangedSpy.count() == 1); - QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("qtextbrowser/subdir/index.html")); - browser->setSource(QUrl("../anchor.html")); + QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("subdir/index.html")); + browser->setSource(QUrl("anchor.html")); QVERIFY(!browser->document()->isEmpty()); QVERIFY(sourceChangedSpy.count() == 1); - QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("../anchor.html")); + QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("anchor.html")); browser->setSource(QUrl("subdir/index.html")); QVERIFY(!browser->document()->isEmpty()); QVERIFY(sourceChangedSpy.count() == 1); @@ -274,10 +276,10 @@ void tst_QTextBrowser::relativeLinks() QVERIFY(!browser->document()->isEmpty()); QVERIFY(sourceChangedSpy.count() == 1); QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("file:anchor.html")); - browser->setSource(QUrl("../qtextbrowser.html")); + browser->setSource(QUrl("subdir/../qtextbrowser.html")); QVERIFY(!browser->document()->isEmpty()); QVERIFY(sourceChangedSpy.count() == 1); - QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("../qtextbrowser.html")); + QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("subdir/../qtextbrowser.html")); } void tst_QTextBrowser::anchors() |