diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-07-03 14:00:25 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-05 07:14:07 +0200 |
| commit | 94a519372021708febd890d0cfe5c4be70948970 (patch) | |
| tree | aa90cbc3e6c7adb7677ef2a251d37005a1c15029 /tests/auto/quick/qquickfontloader | |
| parent | 2edefe36773db0cbe837c33f65d0cde577ccb67a (diff) | |
Use unique port numbers for http servers in auto tests.
Prevents conflicts when tests are run in parallel.
Change-Id: Ic1652d963da291c7c41b31e2621874824fa575cb
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickfontloader')
| -rw-r--r-- | tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp index 10f81accbf..cab8a2249c 100644 --- a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp +++ b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp @@ -49,7 +49,8 @@ #include <QtQuick/QQuickView> #include <QtQuick/QQuickItem> -#define SERVER_PORT 14448 +#define SERVER_PORT 14457 +#define SERVER_ADDR "http://localhost:14457" class tst_qquickfontloader : public QQmlDataTest { @@ -152,7 +153,7 @@ void tst_qquickfontloader::webFont() #if defined(Q_OS_WIN) QSKIP("Windows doesn't support font loading."); #endif - QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"http://localhost:14448/tarzeau_ocr_a.ttf\" }"; + QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" SERVER_ADDR "/tarzeau_ocr_a.ttf\" }"; QQmlComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -171,7 +172,7 @@ void tst_qquickfontloader::redirWebFont() #endif server.addRedirect("olddir/oldname.ttf","../tarzeau_ocr_a.ttf"); - QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"http://localhost:14448/olddir/oldname.ttf\" }"; + QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" SERVER_ADDR "/olddir/oldname.ttf\" }"; QQmlComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -188,8 +189,8 @@ void tst_qquickfontloader::failWebFont() #if defined(Q_OS_WIN) QSKIP("Windows doesn't support font loading."); #endif - QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"http://localhost:14448/nonexist.ttf\" }"; - QTest::ignoreMessage(QtWarningMsg, "file::2:1: QML FontLoader: Cannot load font: \"http://localhost:14448/nonexist.ttf\""); + QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" SERVER_ADDR "/nonexist.ttf\" }"; + QTest::ignoreMessage(QtWarningMsg, "file::2:1: QML FontLoader: Cannot load font: \"" SERVER_ADDR "/nonexist.ttf\""); QQmlComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickFontLoader *fontObject = qobject_cast<QQuickFontLoader*>(component.create()); @@ -222,7 +223,7 @@ void tst_qquickfontloader::changeFont() QCOMPARE(statusSpy.count(), 0); QTRY_COMPARE(fontObject->name(), QString("OCRA")); - ctxt->setContextProperty("font", "http://localhost:14448/daniel.ttf"); + ctxt->setContextProperty("font", SERVER_ADDR "/daniel.ttf"); QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Loading); QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Ready); QCOMPARE(nameSpy.count(), 1); @@ -235,7 +236,7 @@ void tst_qquickfontloader::changeFont() QCOMPARE(statusSpy.count(), 2); QTRY_COMPARE(fontObject->name(), QString("OCRA")); - ctxt->setContextProperty("font", "http://localhost:14448/daniel.ttf"); + ctxt->setContextProperty("font", SERVER_ADDR "/daniel.ttf"); QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Ready); QCOMPARE(nameSpy.count(), 3); QCOMPARE(statusSpy.count(), 2); |