diff options
Diffstat (limited to 'tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp')
-rw-r--r-- | tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp b/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp index d0a421211..3f68e0fb5 100644 --- a/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp +++ b/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp @@ -67,7 +67,7 @@ private slots: void testMissingArguments() { - ConsumeOutputOperation operation; + ConsumeOutputOperation operation(0); QVERIFY(operation.testOperation()); QVERIFY(!operation.performOperation()); @@ -78,7 +78,8 @@ private slots: QCOMPARE(UpdateOperation::Error(operation.error()), UpdateOperation::InvalidArguments); //qDebug() << operation.errorString(); QString compareString("Invalid arguments in ConsumeOutput: 0 arguments given, at least 2 " - "expected(<to be saved installer key name>, <executable>, [argument1], [argument2], ...)."); + "arguments expected in the form: <to be saved installer key name> " + "<executable> [argument1] [argument2] [...]."); //qDebug() << compareString; QCOMPARE(operation.errorString(), compareString); } @@ -87,8 +88,7 @@ private slots: { QString testOutput = getOutputFrom(QUOTE(QMAKE_BINARY), QStringList("-query")); - ConsumeOutputOperation operation; - operation.setValue(QLatin1String("installer"), QVariant::fromValue(&m_core)); + ConsumeOutputOperation operation(&m_core); operation.setArguments(QStringList() << "testConsumeOutputKey" << QUOTE(QMAKE_BINARY) << "-query"); QVERIFY2(operation.performOperation(), qPrintable(operation.errorString())); @@ -112,7 +112,7 @@ private: QEventLoop loop; QProcess process; - QObject::connect(&process, SIGNAL(finished(int, QProcess::ExitStatus)), &loop, SLOT(quit())); + QObject::connect(&process, SIGNAL(finished(int,QProcess::ExitStatus)), &loop, SLOT(quit())); process.start(binary, arguments, QIODevice::ReadOnly); if (process.state() != QProcess::NotRunning) |