summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-03-08 03:42:44 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-03-08 03:42:44 (GMT)
commitbaed547d0bccabf3ec92cafb54b6642d81c854f0 (patch)
tree6c0d0f129df9d9905f291def27ed7dabcc1f48dc
parentc97e1e29aedaceead92cd231b3a77d60bab2af50 (diff)
downloadQt-baed547d0bccabf3ec92cafb54b6642d81c854f0.zip
Qt-baed547d0bccabf3ec92cafb54b6642d81c854f0.tar.gz
Qt-baed547d0bccabf3ec92cafb54b6642d81c854f0.tar.bz2
Remove expected warning
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro3
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp18
2 files changed, 2 insertions, 19 deletions
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro
index 0543ff6..e2b31c7 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro
+++ b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro
@@ -1,6 +1,5 @@
load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-QT += script
+contains(QT_CONFIG,declarative): QT += declarative script
macx:CONFIG -= app_bundle
SOURCES += tst_qdeclarativeworkerscript.cpp
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
index 9adbc28..fe2dac2 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
+++ b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
@@ -60,7 +60,6 @@ public:
tst_QDeclarativeWorkerScript() {}
private slots:
void source();
- void source_data();
void messaging();
void messaging_data();
void messaging_sendQObjectList();
@@ -83,13 +82,7 @@ private:
void tst_QDeclarativeWorkerScript::source()
{
- QFETCH(QUrl, source);
- QFETCH(bool, valid);
-
- if (!valid) {
- QByteArray w = "WorkerScript: Cannot find source file \"" + source.toString().toUtf8() + "\"";
- QTest::ignoreMessage(QtWarningMsg, w.constData());
- }
+ QUrl source = QUrl::fromLocalFile(SRCDIR "/data/worker.qml");
QDeclarativeComponent component(&m_engine);
component.setData("import Qt 4.6\nWorkerScript { source: '" + source.toString().toUtf8() + "'; }", QUrl());
@@ -103,15 +96,6 @@ void tst_QDeclarativeWorkerScript::source()
delete item;
}
-void tst_QDeclarativeWorkerScript::source_data()
-{
- QTest::addColumn<QUrl>("source");
- QTest::addColumn<bool>("valid");
-
- QTest::newRow("valid") << QUrl::fromLocalFile(SRCDIR "/data/worker.qml") << true;
- QTest::newRow("invalid") << QUrl::fromLocalFile("asdjfk.js") << false;
-}
-
void tst_QDeclarativeWorkerScript::messaging()
{
QFETCH(QVariant, value);