diff options
author | Kai Koehne <kai.koehne@qt.io> | 2020-07-16 10:54:14 +0200 |
---|---|---|
committer | Topi Reinio <topi.reinio@qt.io> | 2022-09-02 13:09:37 +0200 |
commit | ec1b6437f7e40fcbda45e3b578832887e7836d88 (patch) | |
tree | 5878cdb4ba6103d6ca15b39c429d244c60d7dfbc /tests | |
parent | 723bca3fae97de0b39d6f2d015e68baf36ea649c (diff) |
qtattributionsscanner: Support multiple license files
Accept a new LicenseFiles array that allows to list multiple license
files. This avoids the need to artificially concatenate licenses in
one file.
Change-Id: Ia9db77b3bc0ea7fc6072d0296da5ea3cfce44b59
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
(cherry picked from commit db87f5b27ce02e51b0e38aaa8473a40b0d87094a)
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests')
8 files changed, 76 insertions, 9 deletions
diff --git a/tests/auto/qtattributionsscanner/qtattributionsscanner.pro b/tests/auto/qtattributionsscanner/qtattributionsscanner.pro index aa8442a88..9c17783e1 100644 --- a/tests/auto/qtattributionsscanner/qtattributionsscanner.pro +++ b/tests/auto/qtattributionsscanner/qtattributionsscanner.pro @@ -7,6 +7,9 @@ DISTFILES += \ testdata/good/expected.json \ testdata/good/expected.error \ testdata/warnings/incomplete/qt_attribution.json \ + testdata/good/variants/qt_attribution_test.json \ + testdata/good/variants/expected.json \ + testdata/good/variants/expected.error \ testdata/warnings/incomplete/expected.json \ testdata/warnings/incomplete/expected.error \ testdata/warnings/unknown/qt_attribution.json \ diff --git a/tests/auto/qtattributionsscanner/testdata/good/expected.json b/tests/auto/qtattributionsscanner/testdata/good/expected.json index 1f54c13e6..244687192 100644 --- a/tests/auto/qtattributionsscanner/testdata/good/expected.json +++ b/tests/auto/qtattributionsscanner/testdata/good/expected.json @@ -10,7 +10,7 @@ "LicenseFile": "", "LicenseId": "", "Name": "Test", - "PackageComment":"", + "PackageComment": "", "Path": "%{PWD}/chromium", "QDocModule": "qtwebengine", "QtParts": [ @@ -22,39 +22,64 @@ { "Copyright": "Copyright", "Description": "Multi\nLine\nDescription", + "DownloadLocation": "www.qt.io/1.0", + "Files": "", "Homepage": "www.qt.io", "Id": "complete", "License": "License", "LicenseFile": "%{PWD}/complete/LICENSE", "LicenseId": "xxx", "Name": "Complete", - "PackageComment":"just a test package", + "PackageComment": "just a test package", "Path": "%{PWD}/complete", - "Files": "", "QDocModule": "qtest", - "QtParts": [ "examples" ], + "QtParts": [ + "examples" + ], "QtUsage": "Multi\nLine\nUsage", - "Version": "1.0", - "DownloadLocation": "www.qt.io/1.0" + "Version": "1.0" }, { "Copyright": "Copyright", "Description": "", + "DownloadLocation": "", + "Files": "", "Homepage": "", "Id": "minimal", "License": "License", "LicenseFile": "", "LicenseId": "", "Name": "Minimal", - "PackageComment":"", + "PackageComment": "", "Path": "%{PWD}/minimal", + "QDocModule": "qtest", + "QtParts": [ + "libs" + ], + "QtUsage": "Usage", + "Version": "" + }, + { + "Copyright": "", + "Description": "", + "DownloadLocation": "", "Files": "", + "Homepage": "", + "Id": "variants", + "License": "License", + "LicenseFiles": [ + "%{PWD}/variants/LICENSE1.txt", + "%{PWD}/variants/LICENSE2.txt" + ], + "LicenseId": "", + "Name": "Variants Test", + "PackageComment": "", + "Path": "%{PWD}/variants", "QDocModule": "qtest", "QtParts": [ "libs" ], "QtUsage": "Usage", - "Version": "", - "DownloadLocation": "" + "Version": "" } ] diff --git a/tests/auto/qtattributionsscanner/testdata/good/variants/LICENSE1.txt b/tests/auto/qtattributionsscanner/testdata/good/variants/LICENSE1.txt new file mode 100644 index 000000000..716287c92 --- /dev/null +++ b/tests/auto/qtattributionsscanner/testdata/good/variants/LICENSE1.txt @@ -0,0 +1 @@ +LICENSE1
\ No newline at end of file diff --git a/tests/auto/qtattributionsscanner/testdata/good/variants/LICENSE2.txt b/tests/auto/qtattributionsscanner/testdata/good/variants/LICENSE2.txt new file mode 100644 index 000000000..3671b8928 --- /dev/null +++ b/tests/auto/qtattributionsscanner/testdata/good/variants/LICENSE2.txt @@ -0,0 +1 @@ +LICENSE2
\ No newline at end of file diff --git a/tests/auto/qtattributionsscanner/testdata/good/variants/expected.error b/tests/auto/qtattributionsscanner/testdata/good/variants/expected.error new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/auto/qtattributionsscanner/testdata/good/variants/expected.error diff --git a/tests/auto/qtattributionsscanner/testdata/good/variants/expected.json b/tests/auto/qtattributionsscanner/testdata/good/variants/expected.json new file mode 100644 index 000000000..5300c6297 --- /dev/null +++ b/tests/auto/qtattributionsscanner/testdata/good/variants/expected.json @@ -0,0 +1,25 @@ +[ + { + "Copyright": "", + "Description": "", + "DownloadLocation": "", + "Files": "", + "Homepage": "", + "Id": "variants", + "License": "License", + "LicenseFiles": [ + "%{PWD}/LICENSE1.txt", + "%{PWD}/LICENSE2.txt" + ], + "LicenseId": "", + "Name": "Variants Test", + "PackageComment": "", + "Path": "%{PWD}", + "QDocModule": "qtest", + "QtParts": [ + "libs" + ], + "QtUsage": "Usage", + "Version": "" + } +] diff --git a/tests/auto/qtattributionsscanner/testdata/good/variants/qt_attribution_test.json b/tests/auto/qtattributionsscanner/testdata/good/variants/qt_attribution_test.json new file mode 100644 index 000000000..072523114 --- /dev/null +++ b/tests/auto/qtattributionsscanner/testdata/good/variants/qt_attribution_test.json @@ -0,0 +1,9 @@ +{ + "Id": "variants", + "Name": "Variants Test", + + "QDocModule": "qtest", + "QtUsage": "Usage", + "License": "License", + "LicenseFiles": [ "LICENSE1.txt", "LICENSE2.txt" ] +} diff --git a/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp b/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp index e1c5e8f3e..31d7c7847 100644 --- a/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp +++ b/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp @@ -84,6 +84,9 @@ void tst_qtattributionsscanner::test_data() << QStringLiteral("good/minimal/qt_attribution_test.json") << QStringLiteral("good/minimal/expected.json") << QStringLiteral("good/minimal/expected.error"); + QTest::newRow("variants") << QStringLiteral("good/variants/qt_attribution_test.json") + << QStringLiteral("good/variants/expected.json") + << QStringLiteral("good/variants/expected.error"); } void tst_qtattributionsscanner::readExpectedFile(const QString &baseDir, const QString &fileName, QByteArray *content) |