Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: I34aa0c2eb178862b40e63b62c6daa056e5e204c6

1 files changed, 60 insertions, 0 deletions

diff --git a/tests/auto/quicktest/testfiltering/tst_testfiltering.cpp b/tests/auto/quicktest/testfiltering/tst_testfiltering.cpp
index 8817adb3bc..1db3d5be57 100644
--- a/tests/auto/quicktest/testfiltering/tst_testfiltering.cpp
+++ b/tests/auto/quicktest/testfiltering/tst_testfiltering.cpp
@@ -38,6 +38,10 @@ private slots:
     void twoFilters();
     void twoFiltersWithOneMatch();
     void manyFilters();
+    void filterTestWithDefaultDataTags();
+    void filterTestWithDataTags();
+    void filterTestByDataTag();
+    void filterInvalidDataTag();
 };
 
 
@@ -131,6 +135,62 @@ void tst_TestFiltering::manyFilters()
     QCOMPARE(process.exitCode(), 0);
 }
 
+void tst_TestFiltering::filterTestWithDefaultDataTags()
+{
+    QProcess process;
+    process.start(testExe, { QLatin1String("Third::test_default_tags"), });
+
+    QVERIFY(process.waitForFinished());
+
+    const QString output = process.readAll();
+    QVERIFY(output.contains(QLatin1String("Totals: 5 passed")));
+    QVERIFY(output.contains(QLatin1String(" 2 skipped")));
+    QCOMPARE(process.exitStatus(), QProcess::NormalExit);
+    QCOMPARE(process.exitCode(), 0);
+}
+
+void tst_TestFiltering::filterTestWithDataTags()
+{
+    QProcess process;
+    process.start(testExe, { QLatin1String("Third::test_tags"), });
+
+    QVERIFY(process.waitForFinished());
+
+    const QString output = process.readAll();
+    QVERIFY(output.contains(QLatin1String("Totals: 4 passed")));
+    QVERIFY(output.contains(QLatin1String(" 1 skipped")));
+    QCOMPARE(process.exitStatus(), QProcess::NormalExit);
+    QCOMPARE(process.exitCode(), 0);
+}
+
+void tst_TestFiltering::filterTestByDataTag()
+{
+    QProcess process;
+    process.start(testExe, { QLatin1String("Third::test_default_tags:init_2"),
+                             QLatin1String("Third::test_default_tags:skip_3"),
+                             QLatin1String("Third::test_tags:baz"),
+                             QLatin1String("Third::test_tags:bar"), });
+
+    QVERIFY(process.waitForFinished());
+
+    const QString output = process.readAll();
+    QVERIFY(output.contains(QLatin1String("Totals: 4 passed")));
+    QVERIFY(output.contains(QLatin1String(" 2 skipped")));
+    QCOMPARE(process.exitStatus(), QProcess::NormalExit);
+    QCOMPARE(process.exitCode(), 0);
+}
+
+void tst_TestFiltering::filterInvalidDataTag()
+{
+    QProcess process;
+    process.start(testExe, { QLatin1String("Third::test_tags:invalid_tag") });
+
+    QVERIFY(process.waitForFinished());
+
+    QCOMPARE(process.exitStatus(), QProcess::NormalExit);
+    QCOMPARE(process.exitCode(), 1);
+}
+
 QTEST_MAIN(tst_TestFiltering);
 
 #include "tst_testfiltering.moc"