QuasarApp/CopyrightFixer
4
0
Fork 0
mirror of https://github.com/QuasarApp/CopyrightFixer.git synced 2025-04-26 17:54:42 +00:00
Code Issues Projects Releases Wiki Activity

ref #60 Fixing unittest, added test num 8.

Browse Source
This commit is contained in:
IgorekLoschinin 2021-06-10 21:09:04 +03:00
parent 842ee98e34
commit 5a475dc798
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CopyrighFixer/CopyrighFixer/signer.cpp
View File

@ -122,6 +122,12 @@ const Signature Signer::mergeSign(const Signature &userSign, const Signature &fi
return upgradeOwner(userSign, fileSign); return upgradeOwner(userSign, fileSign);
} }
if (fileSign.getMapOwn().size() > 1) {
QuasarAppUtils::Params::log("File signature contains more owners.",
QuasarAppUtils::VerboseLvl::Warning);
return upgradeOwner(userSign, fileSign);
}
if (userSign.getMapOwn().cbegin().value().getOwnerName() == fileSign.getMapOwn().cbegin().value().getOwnerName()) { if (userSign.getMapOwn().cbegin().value().getOwnerName() == fileSign.getMapOwn().cbegin().value().getOwnerName()) {
return upgradeOwner(userSign, fileSign); return upgradeOwner(userSign, fileSign);
} }

51
tests/units/signertest.cpp
View File

@ -82,11 +82,9 @@ QList<SignerTest::Signers> SignerTest::lstSing() const {
SignerTest::Signers signDiffOwn; SignerTest::Signers signDiffOwn;
signDiffOwn.signFormConf = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000); signDiffOwn.signFormConf = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000);
signDiffOwn.signFormFile = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarAppSdfdf", 1622657022); signDiffOwn.signFormFile = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarAppSdfdf", 1622657022);
signDiffOwn.signAfterMerge = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarAppSdfdf", 1622657022); signDiffOwn.signAfterMerge = genSign({{"QuasarAppSdfdf", 1622657022},
{"QuasarApp", unixTime}},
QMap<int, CopyrighFixer::Owner> multiSign = signDiffOwn.signAfterMerge.getMapOwn(); "MIT License Copyright (C) 2020-2021 QuasarApp.");
multiSign.insert(unixTime, genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", unixTime).getMapOwn().cbegin().value());
signDiffOwn.signAfterMerge.setMapOwners(multiSign);
// 4 // 4
// The equal owners. // The equal owners.
@ -111,26 +109,35 @@ QList<SignerTest::Signers> SignerTest::lstSing() const {
signMissOwnInFile.signAfterMerge = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022); signMissOwnInFile.signAfterMerge = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022);
// 7 // 7
// Generating multiple owners. // Generating multiple owners config.
QList<SignerTest::dataOwns> Owns; QList<SignerTest::dataOwns> lstOwnsForConf = {
int temp = 0; {"QuasarApp", unixTime},
for (int i(0); i<3; i++) { {"QuasarApp1", unixTime+1},
temp++; {"QuasarApp2", unixTime+2}
};
dataOwns lO;
lO.name = QString("QuasarApp%1").arg(temp);
lO.timePoint = 1700000000 + (temp*10);
Owns.append(lO);
}
// The number of owners differs. // The number of owners differs.
SignerTest::Signers signDiffNumOwn; SignerTest::Signers signDiffNumOwnConf;
signDiffNumOwn.signFormConf = genSign(Owns, "MIT License Copyright (C) 2020-2021 QuasarApp."); signDiffNumOwnConf.signFormConf = genSign(lstOwnsForConf, "MIT License Copyright (C) 2020-2021 QuasarApp.");
signDiffNumOwn.signFormFile = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000); signDiffNumOwnConf.signFormFile = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000);
signDiffNumOwn.signAfterMerge = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp1", unixTime); signDiffNumOwnConf.signAfterMerge = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", unixTime);
return {equalSign, signDiffLic, signDiffOwn, signEqualOwn, signMissingInFile, signMissOwnInFile, signDiffNumOwn}; // 8
// Generating multiple owners file.
QList<SignerTest::dataOwns> lstOwnsForFile = {
{"QuasarApp", unixTime},
{"QuasarApp1", unixTime+1},
{"QuasarApp2", unixTime+2},
{"QuasarApp3", unixTime+3}
};
// The number of owners differs.
SignerTest::Signers signDiffNumOwnFile;
signDiffNumOwnFile.signFormConf = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000);
signDiffNumOwnFile.signFormFile = genSign(lstOwnsForFile, "MIT License Copyright (C) 2020-2021 QuasarApp.");
signDiffNumOwnFile.signAfterMerge = genSign(lstOwnsForFile, "MIT License Copyright (C) 2020-2021 QuasarApp.");
return {equalSign, signDiffLic, signDiffOwn, signEqualOwn, signMissingInFile, signMissOwnInFile, signDiffNumOwnConf};
} }