From 57568f98859a7836b75dd03f48c4687075d91631 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 23 Mar 2018 11:40:06 +0100 Subject: qtattributionsscanner: Add test mode Rename test qt_attribution.json files to qt_attribution_test.json. This avoids warnings when picking up the test files in normal mode. Change-Id: I8831a81c84986c074d3519d2855c00987b4c2570 Reviewed-by: Friedemann Kleint --- .../testdata/good/complete/qt_attribution.json | 21 --------------------- .../testdata/good/complete/qt_attribution_test.json | 21 +++++++++++++++++++++ .../testdata/good/minimal/qt_attribution.json | 9 --------- .../testdata/good/minimal/qt_attribution_test.json | 9 +++++++++ .../testdata/warnings/incomplete/expected.error | 12 ++++++------ .../warnings/incomplete/qt_attribution.json | 2 -- .../warnings/incomplete/qt_attribution_test.json | 2 ++ .../testdata/warnings/unknown/expected.error | 2 +- .../testdata/warnings/unknown/qt_attribution.json | 10 ---------- .../warnings/unknown/qt_attribution_test.json | 10 ++++++++++ .../tst_qtattributionsscanner.cpp | 5 ++++- 11 files changed, 53 insertions(+), 50 deletions(-) delete mode 100644 tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json create mode 100644 tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution_test.json delete mode 100644 tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution.json create mode 100644 tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution_test.json delete mode 100644 tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution.json create mode 100644 tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution_test.json delete mode 100644 tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution.json create mode 100644 tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution_test.json (limited to 'tests') diff --git a/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json b/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json deleted file mode 100644 index f8e7b1c68..000000000 --- a/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "Id": "complete", - "Name": "Complete", - "QDocModule": "qtest", - "QtParts": ["examples"], - - "License": "License", - "Copyright": "Copyright", - - "Description": "Multi -Line -Description", - "QtUsage": "Multi -Line -Usage", - "Homepage": "www.qt.io", - "Version": "1.0", - "DownloadLocation": "www.qt.io/1.0", - "LicenseId": "xxx", - "LicenseFile": "LICENSE" -} diff --git a/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution_test.json b/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution_test.json new file mode 100644 index 000000000..f8e7b1c68 --- /dev/null +++ b/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution_test.json @@ -0,0 +1,21 @@ +{ + "Id": "complete", + "Name": "Complete", + "QDocModule": "qtest", + "QtParts": ["examples"], + + "License": "License", + "Copyright": "Copyright", + + "Description": "Multi +Line +Description", + "QtUsage": "Multi +Line +Usage", + "Homepage": "www.qt.io", + "Version": "1.0", + "DownloadLocation": "www.qt.io/1.0", + "LicenseId": "xxx", + "LicenseFile": "LICENSE" +} diff --git a/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution.json b/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution.json deleted file mode 100644 index 2dc53f852..000000000 --- a/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Id": "minimal", - "Name": "Minimal", - - "QDocModule": "qtest", - "QtUsage": "Usage", - "License": "License", - "Copyright": "Copyright" -} diff --git a/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution_test.json b/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution_test.json new file mode 100644 index 000000000..2dc53f852 --- /dev/null +++ b/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution_test.json @@ -0,0 +1,9 @@ +{ + "Id": "minimal", + "Name": "Minimal", + + "QDocModule": "qtest", + "QtUsage": "Usage", + "License": "License", + "Copyright": "Copyright" +} diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error index e18d2976b..7095bf1a2 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error +++ b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error @@ -1,6 +1,6 @@ -File %{PWD}/qt_attribution.json: Missing mandatory property 'Name'. -File %{PWD}/qt_attribution.json: Missing mandatory property 'Id'. -File %{PWD}/qt_attribution.json: Missing mandatory property 'QDocModule'. -File %{PWD}/qt_attribution.json: Missing mandatory property 'QtUsage'. -File %{PWD}/qt_attribution.json: Missing mandatory property 'License'. -File %{PWD}/qt_attribution.json: Missing mandatory property 'Copyright'. +File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Name'. +File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Id'. +File %{PWD}/qt_attribution_test.json: Missing mandatory property 'QDocModule'. +File %{PWD}/qt_attribution_test.json: Missing mandatory property 'QtUsage'. +File %{PWD}/qt_attribution_test.json: Missing mandatory property 'License'. +File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Copyright'. diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution.json b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution.json deleted file mode 100644 index 2c63c0851..000000000 --- a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution_test.json b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution_test.json new file mode 100644 index 000000000..2c63c0851 --- /dev/null +++ b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution_test.json @@ -0,0 +1,2 @@ +{ +} diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.error b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.error index 89b48074b..2cc0102a7 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.error +++ b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.error @@ -1 +1 @@ -File %{PWD}/qt_attribution.json: Unknown key Unknown. +File %{PWD}/qt_attribution_test.json: Unknown key Unknown. diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution.json b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution.json deleted file mode 100644 index f1d55638c..000000000 --- a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Id": "unknown", - "Name": "Unknown", - "QDocModule": "qtest", - - "QtUsage": "Usage", - "License": "License", - "Copyright": "Copyright", - "Unknown": "Unknown" -} diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution_test.json b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution_test.json new file mode 100644 index 000000000..f1d55638c --- /dev/null +++ b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution_test.json @@ -0,0 +1,10 @@ +{ + "Id": "unknown", + "Name": "Unknown", + "QDocModule": "qtest", + + "QtUsage": "Usage", + "License": "License", + "Copyright": "Copyright", + "Unknown": "Unknown" +} diff --git a/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp b/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp index 7740fde9b..7789ad5f7 100644 --- a/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp +++ b/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp @@ -81,7 +81,7 @@ void tst_qtattributionsscanner::test_data() << QStringLiteral("warnings/unknown/expected.json") << QStringLiteral("warnings/unknown/expected.error"); QTest::newRow("singlefile") - << QStringLiteral("good/minimal/qt_attribution.json") + << QStringLiteral("good/minimal/qt_attribution_test.json") << QStringLiteral("good/minimal/expected.json") << QStringLiteral("good/minimal/expected.error"); } @@ -106,6 +106,9 @@ void tst_qtattributionsscanner::test() QProcess proc; QString command = m_cmd + " " + dir + " --output-format json"; + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert("QT_ATTRIBUTIONSSCANNER_TEST", "1"); + proc.setProcessEnvironment(env); proc.start(command, QIODevice::ReadWrite | QIODevice::Text); QVERIFY2(proc.waitForStarted(), qPrintable(command + QLatin1String(" :") + proc.errorString())); -- cgit v1.2.3