Deduplicate code in tst_qmllint.cpp

Change-Id: I2a9a8ecc0b2da2383242bba36186a72ff59e4c42
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 25 insertions, 39 deletions

diff --git a/tests/auto/qml/qmllint/tst_qmllint.cpp b/tests/auto/qml/qmllint/tst_qmllint.cpp
index 582f146dca..c332354bcd 100644
--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
+++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
@@ -45,6 +45,8 @@ private Q_SLOTS:
     void testUnqualifiedNoSpuriousParentWarning();
     void catchIdentifierNoFalsePositive();
 private:
+    QString runQmllint(const QString &fileToLint, bool shouldSucceed);
+
     QString m_qmllintPath;
 };
 
@@ -83,15 +85,8 @@ void TestQmllint::testUnqualified()
     QFETCH(QString, warningMessage);
     QFETCH(int, warningLine);
     QFETCH(int, warningColumn);
-    QStringList args;
-    args << QStringLiteral("-U") << testFile(filename) << QStringLiteral("-I") << qmlImportDir;
 
-    QProcess process;
-    process.start(m_qmllintPath, args);
-    QVERIFY(process.waitForFinished());
-    QVERIFY(process.exitStatus() == QProcess::NormalExit);
-    QVERIFY(process.exitCode());
-    QString output = process.readAllStandardError();
+    const QString output = runQmllint(filename, false);
     QVERIFY(output.contains(QString::asprintf("Warning: unqualified access at %d:%d", warningLine, warningColumn)));
     QVERIFY(output.contains(warningMessage));
 }
@@ -122,41 +117,13 @@ void TestQmllint::testUnqualified_data()
 
 void TestQmllint::testUnqualifiedNoSpuriousParentWarning()
 {
-    auto qmlImportDir = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
-    {
-        QString filename = testFile("spuriousParentWarning.qml");
-        QStringList args;
-        args << QStringLiteral("-U") << filename << QStringLiteral("-I") << qmlImportDir;
-        QProcess process;
-        process.start(m_qmllintPath, args);
-        QVERIFY(process.waitForFinished());
-        QVERIFY(process.exitStatus() == QProcess::NormalExit);
-        QVERIFY(process.exitCode() == 0);
-    }
-    {
-        QString filename = testFile("nonSpuriousParentWarning.qml");
-        QStringList args;
-        args << QStringLiteral("-U") << filename << QStringLiteral("-I") << qmlImportDir;
-        QProcess process;
-        process.start(m_qmllintPath, args);
-        QVERIFY(process.waitForFinished());
-        QVERIFY(process.exitStatus() == QProcess::NormalExit);
-        QVERIFY(process.exitCode());
-    }
+    runQmllint("spuriousParentWarning.qml", true);
+    runQmllint("nonSpuriousParentWarning.qml", false);
 }
 
 void TestQmllint::catchIdentifierNoFalsePositive()
 {
-    auto qmlImportDir = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
-    QString filename = QLatin1String("catchIdentifierNoWarning.qml");
-    filename.prepend(QStringLiteral("data/"));
-    QStringList args;
-    args << QStringLiteral("-U") << filename << QStringLiteral("-I") << qmlImportDir;
-    QProcess process;
-    process.start(m_qmllintPath, args);
-    QVERIFY(process.waitForFinished());
-    QVERIFY(process.exitStatus() == QProcess::NormalExit);
-    QVERIFY(process.exitCode() == 0);
+    runQmllint("catchIdentifierNoWarning.qml", true);
 }
 
 void TestQmllint::test()
@@ -170,5 +137,24 @@ void TestQmllint::test()
     QCOMPARE(success, isValid);
 }
 
+QString TestQmllint::runQmllint(const QString &fileToLint, bool shouldSucceed)
+{
+    auto qmlImportDir = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
+    QStringList args;
+    args << QStringLiteral("-U") << testFile(fileToLint)
+         << QStringLiteral("-I") << qmlImportDir;
+    QProcess process;
+    process.start(m_qmllintPath, args);
+    [&]() {
+        QVERIFY(process.waitForFinished());
+        QCOMPARE(process.exitStatus(), QProcess::NormalExit);
+        if (shouldSucceed)
+            QCOMPARE(process.exitCode(), 0);
+        else
+            QVERIFY(process.exitCode() != 0);
+    }();
+    return process.readAllStandardError();
+}
+
 QTEST_MAIN(TestQmllint)
 #include "tst_qmllint.moc"