From d4095b1d9116764e83efc46ccef569d6914c9d38 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Sat, 24 Apr 2021 12:56:09 +0300 Subject: [PATCH 01/30] ref #50 Added a Signer class. --- src/CopyrighFixer/CopyrighFixer/signer.cpp | 22 ++++++++++++++ src/CopyrighFixer/CopyrighFixer/signer.h | 34 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 src/CopyrighFixer/CopyrighFixer/signer.cpp create mode 100644 src/CopyrighFixer/CopyrighFixer/signer.h diff --git a/src/CopyrighFixer/CopyrighFixer/signer.cpp b/src/CopyrighFixer/CopyrighFixer/signer.cpp new file mode 100644 index 0000000..7a130e9 --- /dev/null +++ b/src/CopyrighFixer/CopyrighFixer/signer.cpp @@ -0,0 +1,22 @@ +//# +//# Copyright (C) 2021-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +#include "signer.h" + +namespace CopyrighFixer { +Signer::Signer() { + +} + +void Signer::checkSign(const Config &objConf) { + +} + + + +} + diff --git a/src/CopyrighFixer/CopyrighFixer/signer.h b/src/CopyrighFixer/CopyrighFixer/signer.h new file mode 100644 index 0000000..0fae790 --- /dev/null +++ b/src/CopyrighFixer/CopyrighFixer/signer.h @@ -0,0 +1,34 @@ +//# +//# Copyright (C) 2021-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +#ifndef SIGNER_H +#define SIGNER_H + +#include "CopyrighFixer_global.h" +#include "config.h" + +namespace CopyrighFixer { + +/** + * @brief The Signer class + */ +class CopyrighFixer_EXPORT Signer { +public: + Signer(); + + /** + * @brief checkSign The method that work all input code. + * @param objConf This is a configuration object. + */ + void checkSign(const Config &objConf); + +}; + +} + + +#endif // SIGNER_H From a40da125555225d8866c108258c8396aa0f863a0 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Sat, 24 Apr 2021 22:26:02 +0300 Subject: [PATCH 02/30] ref #49 Added class configParser. --- .../CopyrighFixer/configparser.cpp | 21 ++++++++++++ .../CopyrighFixer/configparser.h | 34 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 src/CopyrighFixer/CopyrighFixer/configparser.cpp create mode 100644 src/CopyrighFixer/CopyrighFixer/configparser.h diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp new file mode 100644 index 0000000..c699aa2 --- /dev/null +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -0,0 +1,21 @@ +//# +//# Copyright (C) 2021-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +#include "configparser.h" + +namespace CopyrighFixer { +ConfigParser::ConfigParser() { + +} + +const Config &ConfigParser::parseOptions() const { + +} + + +} + diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.h b/src/CopyrighFixer/CopyrighFixer/configparser.h new file mode 100644 index 0000000..ba46c4d --- /dev/null +++ b/src/CopyrighFixer/CopyrighFixer/configparser.h @@ -0,0 +1,34 @@ +//# +//# Copyright (C) 2021-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +#ifndef CONFIGPARSER_H +#define CONFIGPARSER_H + +#include "CopyrighFixer_global.h" +#include "config.h" + +namespace CopyrighFixer { + +/** + * @brief The ConfigParser class + */ +class ConfigParser { +public: + ConfigParser(); + + /** + * @brief parseOptions This a method that will parse all input options. + * @return The config object. + */ + const Config &parseOptions() const; + +}; + +} + + +#endif // CONFIGPARSER_H From 5bbf55a98023bb373c39be4fd2eb43792f3e538d Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Sun, 25 Apr 2021 00:48:29 +0300 Subject: [PATCH 03/30] ref #49 Added description class. --- src/CopyrighFixer/CopyrighFixer/configparser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.h b/src/CopyrighFixer/CopyrighFixer/configparser.h index ba46c4d..1ad4fe8 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.h +++ b/src/CopyrighFixer/CopyrighFixer/configparser.h @@ -14,7 +14,7 @@ namespace CopyrighFixer { /** - * @brief The ConfigParser class + * @brief The ConfigParser class that parse the settings received at the input of the program. */ class ConfigParser { public: From d2b6776de9fefafdca7f37557d118683148bfb71 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Mon, 26 Apr 2021 01:28:07 +0300 Subject: [PATCH 04/30] ref #49 Added the ConfigParser class. --- .../CopyrighFixer/configparser.cpp | 33 +++++++++++++++++-- .../CopyrighFixer/configparser.h | 2 +- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index c699aa2..a4025a4 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -6,15 +6,44 @@ //# #include "configparser.h" +#include +#include + namespace CopyrighFixer { ConfigParser::ConfigParser() { } -const Config &ConfigParser::parseOptions() const { +const Config ConfigParser::parseOptions(const Config &conf) const { -} + Config configOption = conf; + + if (QuasarAppUtils::Params::isEndable("sourceDir")) { + configOption.setSourceDir(QuasarAppUtils::Params::getArg("sourceDir")); + } + else { + std::cout << "Warning: Not option sourceDir" << std::endl; + } + + if (QuasarAppUtils::Params::isEndable("sign")) { + Signature *signature = new Signature; + configOption.setSingValue(*signature); +// configOption.setSingValue(QuasarAppUtils::Params::getArg("sign")); + } + else { + std::cout << "Warning: Not option sign" << std::endl; + } + + if (QuasarAppUtils::Params::isEndable("currentOwner")) { + configOption.setCurrOwn(QuasarAppUtils::Params::getArg("currentOwner")); + } + else { + std::cout << "Warning: Not option currentOwner" << std::endl; + } + + return configOption; +}; } diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.h b/src/CopyrighFixer/CopyrighFixer/configparser.h index 1ad4fe8..4f5fc4b 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.h +++ b/src/CopyrighFixer/CopyrighFixer/configparser.h @@ -24,7 +24,7 @@ public: * @brief parseOptions This a method that will parse all input options. * @return The config object. */ - const Config &parseOptions() const; + const Config parseOptions(const Config &conf) const; }; From 19f26455dd60045e85a7f767b9be150323f535a3 Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Mon, 26 Apr 2021 09:48:22 +0300 Subject: [PATCH 05/30] Update src/CopyrighFixer/CopyrighFixer/configparser.cpp Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index a4025a4..4a4b5a3 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -21,8 +21,7 @@ const Config ConfigParser::parseOptions(const Config &conf) const { if (QuasarAppUtils::Params::isEndable("sourceDir")) { configOption.setSourceDir(QuasarAppUtils::Params::getArg("sourceDir")); - } - else { + } else { std::cout << "Warning: Not option sourceDir" << std::endl; } @@ -47,4 +46,3 @@ const Config ConfigParser::parseOptions(const Config &conf) const { } - From 2a91765b29390753df53f73e281b53d56cf8064f Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Mon, 26 Apr 2021 09:48:31 +0300 Subject: [PATCH 06/30] Update src/CopyrighFixer/CopyrighFixer/configparser.cpp Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 4a4b5a3..5e87131 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -36,8 +36,7 @@ const Config ConfigParser::parseOptions(const Config &conf) const { if (QuasarAppUtils::Params::isEndable("currentOwner")) { configOption.setCurrOwn(QuasarAppUtils::Params::getArg("currentOwner")); - } - else { + } else { std::cout << "Warning: Not option currentOwner" << std::endl; } From a9430cb657a71dd7e87a90effed98892ba9e3e8b Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Wed, 5 May 2021 21:56:09 +0300 Subject: [PATCH 07/30] ref #49 Added placeholder methods for unittests. --- .../CopyrighFixer/configparser.cpp | 28 +++++++++---------- .../CopyrighFixer/configparser.h | 2 +- tests/tstMain.cpp | 2 ++ tests/units/configparsertest.cpp | 20 +++++++++++++ tests/units/configparsertest.h | 25 +++++++++++++++++ 5 files changed, 62 insertions(+), 15 deletions(-) create mode 100644 tests/units/configparsertest.cpp create mode 100644 tests/units/configparsertest.h diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 5e87131..140ef17 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -7,7 +7,6 @@ #include "configparser.h" #include -#include namespace CopyrighFixer { @@ -15,33 +14,34 @@ ConfigParser::ConfigParser() { } -const Config ConfigParser::parseOptions(const Config &conf) const { - - Config configOption = conf; +bool ConfigParser::parseOptions(Config &conf) const { if (QuasarAppUtils::Params::isEndable("sourceDir")) { - configOption.setSourceDir(QuasarAppUtils::Params::getArg("sourceDir")); + conf.setSourceDir(QuasarAppUtils::Params::getArg("sourceDir")); } else { - std::cout << "Warning: Not option sourceDir" << std::endl; + QuasarAppUtils::Params::log("Error: Not option sourceDir.", + QuasarAppUtils::VerboseLvl::Error); + return false; } if (QuasarAppUtils::Params::isEndable("sign")) { - Signature *signature = new Signature; - configOption.setSingValue(*signature); -// configOption.setSingValue(QuasarAppUtils::Params::getArg("sign")); + Signature signature; + conf.setSingValue(signature); } else { - std::cout << "Warning: Not option sign" << std::endl; + QuasarAppUtils::Params::log("Warning: Not option sign.", + QuasarAppUtils::VerboseLvl::Warning); } if (QuasarAppUtils::Params::isEndable("currentOwner")) { - configOption.setCurrOwn(QuasarAppUtils::Params::getArg("currentOwner")); + conf.setCurrOwn(QuasarAppUtils::Params::getArg("currentOwner")); } else { - std::cout << "Warning: Not option currentOwner" << std::endl; + QuasarAppUtils::Params::log("Warning: Not option currentOwner.", + QuasarAppUtils::VerboseLvl::Warning); } - return configOption; + return true; + }; - } diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.h b/src/CopyrighFixer/CopyrighFixer/configparser.h index 4f5fc4b..b24c8e1 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.h +++ b/src/CopyrighFixer/CopyrighFixer/configparser.h @@ -24,7 +24,7 @@ public: * @brief parseOptions This a method that will parse all input options. * @return The config object. */ - const Config parseOptions(const Config &conf) const; + bool parseOptions(Config &conf) const; }; diff --git a/tests/tstMain.cpp b/tests/tstMain.cpp index 21f63f8..a981e7f 100644 --- a/tests/tstMain.cpp +++ b/tests/tstMain.cpp @@ -7,6 +7,7 @@ #include #include "cfixertest.h" +#include "configparsertest.h" // Use This macros for initialize your own test classes. // Check exampletests @@ -31,6 +32,7 @@ private slots: // BEGIN TESTS CASES TestCase(exampleTest, ExampleTest) + TestCase(configParserTest, ConfigParserTest) // END TEST CASES private: diff --git a/tests/units/configparsertest.cpp b/tests/units/configparsertest.cpp new file mode 100644 index 0000000..14ab648 --- /dev/null +++ b/tests/units/configparsertest.cpp @@ -0,0 +1,20 @@ +//# +//# Copyright (C) 2020-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +#include "configparsertest.h" + +ConfigParserTest::ConfigParserTest() { + +} + +void ConfigParserTest::test() { + testParsOpt(); +} + +void ConfigParserTest::testParsOpt() { + +} diff --git a/tests/units/configparsertest.h b/tests/units/configparsertest.h new file mode 100644 index 0000000..7d1fd3b --- /dev/null +++ b/tests/units/configparsertest.h @@ -0,0 +1,25 @@ +//# +//# Copyright (C) 2020-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +#ifndef CONFIGPARSERTEST_H +#define CONFIGPARSERTEST_H +#include "test.h" +#include "testutils.h" +#include "CopyrighFixer/configparser.h" + + +class ConfigParserTest: public Test, protected TestUtils { +public: + ConfigParserTest(); + ~ConfigParserTest(); + + void test(); + void testParsOpt(); + +}; + +#endif // CONFIGPARSERTEST_H From fb33530d8eec71acaeb800759e7c6f781c3fb458 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Wed, 5 May 2021 22:48:40 +0300 Subject: [PATCH 08/30] ref #49 Added method genValidConfig. --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 6 +++--- tests/units/configparsertest.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 140ef17..ed36f51 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -29,8 +29,9 @@ bool ConfigParser::parseOptions(Config &conf) const { conf.setSingValue(signature); } else { - QuasarAppUtils::Params::log("Warning: Not option sign.", - QuasarAppUtils::VerboseLvl::Warning); + QuasarAppUtils::Params::log("Error: Not option sign.", + QuasarAppUtils::VerboseLvl::Error); + return false; } if (QuasarAppUtils::Params::isEndable("currentOwner")) { @@ -41,7 +42,6 @@ bool ConfigParser::parseOptions(Config &conf) const { } return true; - }; } diff --git a/tests/units/configparsertest.h b/tests/units/configparsertest.h index 7d1fd3b..969235c 100644 --- a/tests/units/configparsertest.h +++ b/tests/units/configparsertest.h @@ -9,7 +9,7 @@ #define CONFIGPARSERTEST_H #include "test.h" #include "testutils.h" -#include "CopyrighFixer/configparser.h" +#include "CopyrighFixer/config.h" class ConfigParserTest: public Test, protected TestUtils { @@ -18,6 +18,7 @@ public: ~ConfigParserTest(); void test(); + CopyrighFixer::Config genValidConfig(CopyrighFixer::Config &obj) const; void testParsOpt(); }; From 1ef66cc876d88241ccbcc8e9e093d732c4ecb167 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Thu, 6 May 2021 21:03:32 +0300 Subject: [PATCH 09/30] ref #49 Fixing configparser: added check path to source dir. --- .../CopyrighFixer/configparser.cpp | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index ed36f51..32669fc 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -7,6 +7,7 @@ #include "configparser.h" #include +#include namespace CopyrighFixer { @@ -17,7 +18,15 @@ ConfigParser::ConfigParser() { bool ConfigParser::parseOptions(Config &conf) const { if (QuasarAppUtils::Params::isEndable("sourceDir")) { - conf.setSourceDir(QuasarAppUtils::Params::getArg("sourceDir")); + if (QFileInfo::exists(QuasarAppUtils::Params::getArg("sourceDir"))) { + + conf.setSourceDir(QuasarAppUtils::Params::getArg("sourceDir")); + + } else { + QuasarAppUtils::Params::log("The given path does not exist or is not a directory", + QuasarAppUtils::VerboseLvl::Error); + return false; + } } else { QuasarAppUtils::Params::log("Error: Not option sourceDir.", QuasarAppUtils::VerboseLvl::Error); @@ -25,8 +34,16 @@ bool ConfigParser::parseOptions(Config &conf) const { } if (QuasarAppUtils::Params::isEndable("sign")) { - Signature signature; - conf.setSingValue(signature); + if (QFileInfo::exists(QuasarAppUtils::Params::getArg("sign"))) { + + Signature signature; + conf.setSingValue(signature); + + } else { + QuasarAppUtils::Params::log("The given path does not exist or is not a file signature", + QuasarAppUtils::VerboseLvl::Error); + return false; + } } else { QuasarAppUtils::Params::log("Error: Not option sign.", @@ -37,8 +54,7 @@ bool ConfigParser::parseOptions(Config &conf) const { if (QuasarAppUtils::Params::isEndable("currentOwner")) { conf.setCurrOwn(QuasarAppUtils::Params::getArg("currentOwner")); } else { - QuasarAppUtils::Params::log("Warning: Not option currentOwner.", - QuasarAppUtils::VerboseLvl::Warning); + conf.setCurrOwn(""); } return true; From 50f50b8f0066a8c533062e60b7cf7b2d21293ac0 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Fri, 7 May 2021 23:00:12 +0300 Subject: [PATCH 10/30] ref #49 Added testUnits for configParser. --- .../CopyrighFixer/configparser.cpp | 3 +- .../CopyrighFixer/configparser.h | 7 +- tests/units/configparsertest.cpp | 94 +++++++++++++++++++ tests/units/configparsertest.h | 10 +- 4 files changed, 111 insertions(+), 3 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 32669fc..6a8727c 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -25,7 +25,7 @@ bool ConfigParser::parseOptions(Config &conf) const { } else { QuasarAppUtils::Params::log("The given path does not exist or is not a directory", QuasarAppUtils::VerboseLvl::Error); - return false; + conf.setSourceDir("."); } } else { QuasarAppUtils::Params::log("Error: Not option sourceDir.", @@ -37,6 +37,7 @@ bool ConfigParser::parseOptions(Config &conf) const { if (QFileInfo::exists(QuasarAppUtils::Params::getArg("sign"))) { Signature signature; + signature.fromJson(QuasarAppUtils::Params::getArg("sign")); conf.setSingValue(signature); } else { diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.h b/src/CopyrighFixer/CopyrighFixer/configparser.h index b24c8e1..2f1c56e 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.h +++ b/src/CopyrighFixer/CopyrighFixer/configparser.h @@ -19,11 +19,16 @@ namespace CopyrighFixer { class ConfigParser { public: ConfigParser(); - /** * @brief parseOptions This a method that will parse all input options. * @return The config object. */ + + /** + * @brief parseOptions This a method that will parse all input options. + * @param conf The configuration object that will change(populate) when the method is called. + * @return Return true if input params exists and valid else false. + */ bool parseOptions(Config &conf) const; }; diff --git a/tests/units/configparsertest.cpp b/tests/units/configparsertest.cpp index 14ab648..d1c90cf 100644 --- a/tests/units/configparsertest.cpp +++ b/tests/units/configparsertest.cpp @@ -6,15 +6,109 @@ //# #include "configparsertest.h" +#include +#include "CopyrighFixer/config.h" +#include "CopyrighFixer/configparser.h" ConfigParserTest::ConfigParserTest() { } +ConfigParserTest::~ConfigParserTest() { + +} + void ConfigParserTest::test() { testParsOpt(); } +CopyrighFixer::Signature ConfigParserTest::generateRandomSign(QString& filename) const { + + int unixTime = time(0); + + CopyrighFixer::Owner ownerObj; + ownerObj.setName("QuasarApp"); + ownerObj.setTimePoint(unixTime); + + QMap OwnerMap; + OwnerMap.insert(ownerObj.getTimePoint(), ownerObj); + + CopyrighFixer::Signature sign_toJson; + sign_toJson.setLicenseTitle("Copyright (C) 2020-2021 QuasarApp."); + sign_toJson.setMessage("Distributed under the lgplv3 software license, see the accompany."); + sign_toJson.setMapOwners(OwnerMap); + sign_toJson.toJson(filename); + + return sign_toJson; +} + +bool ConfigParserTest::initValidConf() const { + + QString testFileSign = "testSign.json"; + generateRandomSign(testFileSign); + + QStringList lstOpt = {"-sourceDir", ".", "-sign", "testSign.json"}; + QuasarAppUtils::Params::parseParams(lstOpt); + + CopyrighFixer::Config testConfig; + CopyrighFixer::ConfigParser testParserConf; + + QList checkList = {testParserConf.parseOptions(testConfig), + testConfig.getSignVal().isValid()}; + + return std::all_of(checkList.cbegin(), checkList.cend(), [](bool val){return val;}); +} + +bool ConfigParserTest::initUnvalidSrcKey() const { + QStringList lstOpt = {"-source", ".", "-sign", "testSign.json"}; + QuasarAppUtils::Params::parseParams(lstOpt); + + CopyrighFixer::Config testConfig; + CopyrighFixer::ConfigParser testParserConf; + + return testParserConf.parseOptions(testConfig); +} + +bool ConfigParserTest::initUnvalidSrcVal() const { + QStringList lstOpt = {"-sourceDir", "./ParserProj", "-sign", "testSign.json"}; + QuasarAppUtils::Params::parseParams(lstOpt); + + CopyrighFixer::Config testConfig; + CopyrighFixer::ConfigParser testParserConf; + + return testParserConf.parseOptions(testConfig); +} + +bool ConfigParserTest::initUnvalidSignKey() const { + QStringList lstOpt = {"-sourceDir", ".", "-signa", "testSign.json"}; + QuasarAppUtils::Params::parseParams(lstOpt); + + CopyrighFixer::Config testConfig; + CopyrighFixer::ConfigParser testParserConf; + + return testParserConf.parseOptions(testConfig); +} + +bool ConfigParserTest::initUnvalidSignVal() const { + QStringList lstOpt = {"-sourceDir", ".", "-sign", "/home/testSign.json"}; + QuasarAppUtils::Params::parseParams(lstOpt); + + CopyrighFixer::Config testConfig; + CopyrighFixer::ConfigParser testParserConf; + + return testParserConf.parseOptions(testConfig); +} + void ConfigParserTest::testParsOpt() { + QVERIFY(initValidConf()); + QuasarAppUtils::Params::clearParsedData(); + + QVERIFY(!initUnvalidSrcKey()); + QVERIFY(initUnvalidSrcVal()); + QuasarAppUtils::Params::clearParsedData(); + + QVERIFY(!initUnvalidSignKey()); + QVERIFY(!initUnvalidSignVal()); + } diff --git a/tests/units/configparsertest.h b/tests/units/configparsertest.h index 969235c..3f0024d 100644 --- a/tests/units/configparsertest.h +++ b/tests/units/configparsertest.h @@ -9,8 +9,11 @@ #define CONFIGPARSERTEST_H #include "test.h" #include "testutils.h" +#include "CopyrighFixer/sign.h" #include "CopyrighFixer/config.h" +#include "CopyrighFixer/configparser.h" +#include class ConfigParserTest: public Test, protected TestUtils { public: @@ -18,7 +21,12 @@ public: ~ConfigParserTest(); void test(); - CopyrighFixer::Config genValidConfig(CopyrighFixer::Config &obj) const; + bool initValidConf() const; + CopyrighFixer::Signature generateRandomSign(QString& filename) const; + bool initUnvalidSrcKey() const; + bool initUnvalidSrcVal() const; + bool initUnvalidSignKey() const; + bool initUnvalidSignVal() const; void testParsOpt(); }; From 136c77851cd67424a91a9104992f24b7cdc59182 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Fri, 7 May 2021 23:13:45 +0300 Subject: [PATCH 11/30] ref #49 Fixing: create and delete file json. --- tests/units/configparsertest.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/units/configparsertest.cpp b/tests/units/configparsertest.cpp index d1c90cf..3d57899 100644 --- a/tests/units/configparsertest.cpp +++ b/tests/units/configparsertest.cpp @@ -44,9 +44,6 @@ CopyrighFixer::Signature ConfigParserTest::generateRandomSign(QString& filename) bool ConfigParserTest::initValidConf() const { - QString testFileSign = "testSign.json"; - generateRandomSign(testFileSign); - QStringList lstOpt = {"-sourceDir", ".", "-sign", "testSign.json"}; QuasarAppUtils::Params::parseParams(lstOpt); @@ -70,6 +67,7 @@ bool ConfigParserTest::initUnvalidSrcKey() const { } bool ConfigParserTest::initUnvalidSrcVal() const { + QStringList lstOpt = {"-sourceDir", "./ParserProj", "-sign", "testSign.json"}; QuasarAppUtils::Params::parseParams(lstOpt); @@ -101,6 +99,9 @@ bool ConfigParserTest::initUnvalidSignVal() const { void ConfigParserTest::testParsOpt() { + QString testFileSign = "testSign.json"; + generateRandomSign(testFileSign); + QVERIFY(initValidConf()); QuasarAppUtils::Params::clearParsedData(); @@ -111,4 +112,6 @@ void ConfigParserTest::testParsOpt() { QVERIFY(!initUnvalidSignKey()); QVERIFY(!initUnvalidSignVal()); + QFile::remove(testFileSign); + } From 2b0ca14a3bee8e918bcc32e1efc364f2304f5a00 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Sat, 8 May 2021 09:14:18 +0300 Subject: [PATCH 12/30] ref #50 Fixing: change return value on bool. --- src/CopyrighFixer/CopyrighFixer/signer.cpp | 4 +--- src/CopyrighFixer/CopyrighFixer/signer.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/signer.cpp b/src/CopyrighFixer/CopyrighFixer/signer.cpp index 7a130e9..9f69e69 100644 --- a/src/CopyrighFixer/CopyrighFixer/signer.cpp +++ b/src/CopyrighFixer/CopyrighFixer/signer.cpp @@ -12,11 +12,9 @@ Signer::Signer() { } -void Signer::checkSign(const Config &objConf) { +bool Signer::checkSign(const Config &objConf) { } - - } diff --git a/src/CopyrighFixer/CopyrighFixer/signer.h b/src/CopyrighFixer/CopyrighFixer/signer.h index 0fae790..57aa473 100644 --- a/src/CopyrighFixer/CopyrighFixer/signer.h +++ b/src/CopyrighFixer/CopyrighFixer/signer.h @@ -24,7 +24,7 @@ public: * @brief checkSign The method that work all input code. * @param objConf This is a configuration object. */ - void checkSign(const Config &objConf); + bool checkSign(const Config &objConf); }; From ffc8cde82c8bb1d3a11bd32b7766e47cbe5e9f78 Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Sat, 8 May 2021 10:35:12 +0300 Subject: [PATCH 13/30] Update src/CopyrighFixer/CopyrighFixer/configparser.cpp Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 6a8727c..264430d 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -52,11 +52,6 @@ bool ConfigParser::parseOptions(Config &conf) const { return false; } - if (QuasarAppUtils::Params::isEndable("currentOwner")) { - conf.setCurrOwn(QuasarAppUtils::Params::getArg("currentOwner")); - } else { - conf.setCurrOwn(""); - } return true; }; From a882e81c8dc839a6688bf98e0458740b9cc2cba6 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Sat, 8 May 2021 10:52:11 +0300 Subject: [PATCH 14/30] ref #49 Fixing: check signature, names is tests, CmakeWB. --- .../CopyrighFixer/configparser.cpp | 20 +++++----- .../CopyrighFixer/configparser.h | 2 +- tests/units/configparsertest.cpp | 39 ++++++++++--------- tests/units/configparsertest.h | 10 ++--- 4 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 6a8727c..683a627 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -18,7 +18,9 @@ ConfigParser::ConfigParser() { bool ConfigParser::parseOptions(Config &conf) const { if (QuasarAppUtils::Params::isEndable("sourceDir")) { - if (QFileInfo::exists(QuasarAppUtils::Params::getArg("sourceDir"))) { + + QFileInfo srcDir(QuasarAppUtils::Params::getArg("sourceDir")); + if (srcDir.isDir()) { conf.setSourceDir(QuasarAppUtils::Params::getArg("sourceDir")); @@ -37,8 +39,14 @@ bool ConfigParser::parseOptions(Config &conf) const { if (QFileInfo::exists(QuasarAppUtils::Params::getArg("sign"))) { Signature signature; - signature.fromJson(QuasarAppUtils::Params::getArg("sign")); - conf.setSingValue(signature); + bool checkSign = signature.fromJson(QuasarAppUtils::Params::getArg("sign")); + if (checkSign) { + conf.setSingValue(signature); + } else { + QuasarAppUtils::Params::log("Error: The signature was not parsed", + QuasarAppUtils::VerboseLvl::Error); + return false; + } } else { QuasarAppUtils::Params::log("The given path does not exist or is not a file signature", @@ -52,12 +60,6 @@ bool ConfigParser::parseOptions(Config &conf) const { return false; } - if (QuasarAppUtils::Params::isEndable("currentOwner")) { - conf.setCurrOwn(QuasarAppUtils::Params::getArg("currentOwner")); - } else { - conf.setCurrOwn(""); - } - return true; }; diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.h b/src/CopyrighFixer/CopyrighFixer/configparser.h index 2f1c56e..7668b72 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.h +++ b/src/CopyrighFixer/CopyrighFixer/configparser.h @@ -16,7 +16,7 @@ namespace CopyrighFixer { /** * @brief The ConfigParser class that parse the settings received at the input of the program. */ -class ConfigParser { +class CopyrighFixer_EXPORT ConfigParser { public: ConfigParser(); /** diff --git a/tests/units/configparsertest.cpp b/tests/units/configparsertest.cpp index 3d57899..f01eaea 100644 --- a/tests/units/configparsertest.cpp +++ b/tests/units/configparsertest.cpp @@ -42,31 +42,28 @@ CopyrighFixer::Signature ConfigParserTest::generateRandomSign(QString& filename) return sign_toJson; } -bool ConfigParserTest::initValidConf() const { - +void ConfigParserTest::testParseConf() const { QStringList lstOpt = {"-sourceDir", ".", "-sign", "testSign.json"}; QuasarAppUtils::Params::parseParams(lstOpt); CopyrighFixer::Config testConfig; CopyrighFixer::ConfigParser testParserConf; - QList checkList = {testParserConf.parseOptions(testConfig), - testConfig.getSignVal().isValid()}; - - return std::all_of(checkList.cbegin(), checkList.cend(), [](bool val){return val;}); + QVERIFY(testParserConf.parseOptions(testConfig)); + QVERIFY(testConfig.getSignVal().isValid()); } -bool ConfigParserTest::initUnvalidSrcKey() const { +void ConfigParserTest::testSrcKey() const { QStringList lstOpt = {"-source", ".", "-sign", "testSign.json"}; QuasarAppUtils::Params::parseParams(lstOpt); CopyrighFixer::Config testConfig; CopyrighFixer::ConfigParser testParserConf; - return testParserConf.parseOptions(testConfig); + QVERIFY(!testParserConf.parseOptions(testConfig)); } -bool ConfigParserTest::initUnvalidSrcVal() const { +void ConfigParserTest::testSrcPath() const { QStringList lstOpt = {"-sourceDir", "./ParserProj", "-sign", "testSign.json"}; QuasarAppUtils::Params::parseParams(lstOpt); @@ -74,27 +71,30 @@ bool ConfigParserTest::initUnvalidSrcVal() const { CopyrighFixer::Config testConfig; CopyrighFixer::ConfigParser testParserConf; - return testParserConf.parseOptions(testConfig); + QVERIFY(testParserConf.parseOptions(testConfig)); + } -bool ConfigParserTest::initUnvalidSignKey() const { +void ConfigParserTest::testSignKey() const { QStringList lstOpt = {"-sourceDir", ".", "-signa", "testSign.json"}; QuasarAppUtils::Params::parseParams(lstOpt); CopyrighFixer::Config testConfig; CopyrighFixer::ConfigParser testParserConf; - return testParserConf.parseOptions(testConfig); + QVERIFY(!testParserConf.parseOptions(testConfig)); + } -bool ConfigParserTest::initUnvalidSignVal() const { +void ConfigParserTest::testSignPath() const { QStringList lstOpt = {"-sourceDir", ".", "-sign", "/home/testSign.json"}; QuasarAppUtils::Params::parseParams(lstOpt); CopyrighFixer::Config testConfig; CopyrighFixer::ConfigParser testParserConf; - return testParserConf.parseOptions(testConfig); + QVERIFY(!testParserConf.parseOptions(testConfig)); + } void ConfigParserTest::testParsOpt() { @@ -102,15 +102,16 @@ void ConfigParserTest::testParsOpt() { QString testFileSign = "testSign.json"; generateRandomSign(testFileSign); - QVERIFY(initValidConf()); + testParseConf(); QuasarAppUtils::Params::clearParsedData(); - QVERIFY(!initUnvalidSrcKey()); - QVERIFY(initUnvalidSrcVal()); + testSrcKey(); + testSrcPath(); QuasarAppUtils::Params::clearParsedData(); - QVERIFY(!initUnvalidSignKey()); - QVERIFY(!initUnvalidSignVal()); + testSignKey(); + testSignPath(); + QuasarAppUtils::Params::clearParsedData(); QFile::remove(testFileSign); diff --git a/tests/units/configparsertest.h b/tests/units/configparsertest.h index 3f0024d..b54c903 100644 --- a/tests/units/configparsertest.h +++ b/tests/units/configparsertest.h @@ -21,12 +21,12 @@ public: ~ConfigParserTest(); void test(); - bool initValidConf() const; + void testParseConf() const; CopyrighFixer::Signature generateRandomSign(QString& filename) const; - bool initUnvalidSrcKey() const; - bool initUnvalidSrcVal() const; - bool initUnvalidSignKey() const; - bool initUnvalidSignVal() const; + void testSrcKey() const; + void testSrcPath() const; + void testSignKey() const; + void testSignPath() const; void testParsOpt(); }; From 91fce3d90a195c5c681d33ab007be36b51ba00de Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Sat, 8 May 2021 11:00:57 +0300 Subject: [PATCH 15/30] ref #49 Fixing after merge. --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index e711f80..683a627 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -60,10 +60,6 @@ bool ConfigParser::parseOptions(Config &conf) const { return false; } -<<<<<<< HEAD -======= - ->>>>>>> ffc8cde82c8bb1d3a11bd32b7766e47cbe5e9f78 return true; }; From aa3bbd3be6ea341627db9026a642b18a3b2796a4 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Sat, 8 May 2021 11:27:55 +0300 Subject: [PATCH 16/30] ref #50 Added unittest for signer. --- src/CopyrighFixer/CopyrighFixer/signer.cpp | 2 +- tests/units/signertest.cpp | 24 +++++++++++++++++++++ tests/units/signertest.h | 25 ++++++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 tests/units/signertest.cpp create mode 100644 tests/units/signertest.h diff --git a/src/CopyrighFixer/CopyrighFixer/signer.cpp b/src/CopyrighFixer/CopyrighFixer/signer.cpp index 9f69e69..1c2ba52 100644 --- a/src/CopyrighFixer/CopyrighFixer/signer.cpp +++ b/src/CopyrighFixer/CopyrighFixer/signer.cpp @@ -13,7 +13,7 @@ Signer::Signer() { } bool Signer::checkSign(const Config &objConf) { - + return true; } } diff --git a/tests/units/signertest.cpp b/tests/units/signertest.cpp new file mode 100644 index 0000000..66e0dc8 --- /dev/null +++ b/tests/units/signertest.cpp @@ -0,0 +1,24 @@ +//# +//# Copyright (C) 2020-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +#include "signertest.h" + +SignerTest::SignerTest() { + +} + +SignerTest::~SignerTest() { + +} + +void SignerTest::test() { + testSigner(); +} + +void SignerTest::testSigner() { + QVERIFY(true); +} diff --git a/tests/units/signertest.h b/tests/units/signertest.h new file mode 100644 index 0000000..ab8fbff --- /dev/null +++ b/tests/units/signertest.h @@ -0,0 +1,25 @@ +//# +//# Copyright (C) 2020-2021 QuasarApp. +//# Distributed under the lgplv3 software license, see the accompanying +//# Everyone is permitted to copy and distribute verbatim copies +//# of this license document, but changing it is not allowed. +//# + +#ifndef SIGNERTEST_H +#define SIGNERTEST_H +#include "test.h" +#include "testutils.h" +#include "CopyrighFixer/signer.h" + +#include + +class SignerTest: public Test, protected TestUtils { +public: + SignerTest(); + ~SignerTest(); + + void test(); + void testSigner(); +}; + +#endif // SIGNERTEST_H From ee53fb22035b134528effdeec4ad12f83008dc63 Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Sat, 8 May 2021 14:10:01 +0300 Subject: [PATCH 17/30] Update src/CopyrighFixer/CopyrighFixer/signer.h Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/signer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyrighFixer/CopyrighFixer/signer.h b/src/CopyrighFixer/CopyrighFixer/signer.h index 57aa473..46b6c6b 100644 --- a/src/CopyrighFixer/CopyrighFixer/signer.h +++ b/src/CopyrighFixer/CopyrighFixer/signer.h @@ -21,7 +21,7 @@ public: Signer(); /** - * @brief checkSign The method that work all input code. + * @brief checkSign The method that add copyright to all sources files. * @param objConf This is a configuration object. */ bool checkSign(const Config &objConf); From 521b7be9c6b963724088f9f09a7bdc07339889a0 Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Sat, 8 May 2021 14:10:12 +0300 Subject: [PATCH 18/30] Update tests/units/signertest.cpp Co-authored-by: Andrei Yankovich --- tests/units/signertest.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/units/signertest.cpp b/tests/units/signertest.cpp index 66e0dc8..54afa87 100644 --- a/tests/units/signertest.cpp +++ b/tests/units/signertest.cpp @@ -20,5 +20,6 @@ void SignerTest::test() { } void SignerTest::testSigner() { + qWarning() << "The SignerTest class is not implemented" QVERIFY(true); } From 2d40b34126b9af7155ef143f87133a0831d23f8b Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Sat, 8 May 2021 14:11:34 +0300 Subject: [PATCH 19/30] Update tests/units/signertest.cpp Co-authored-by: Andrei Yankovich --- tests/units/signertest.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/units/signertest.cpp b/tests/units/signertest.cpp index 54afa87..6198d98 100644 --- a/tests/units/signertest.cpp +++ b/tests/units/signertest.cpp @@ -6,6 +6,7 @@ //# #include "signertest.h" +#include SignerTest::SignerTest() { From 7287bae85398e0a24bad8148ffa77ebc152716df Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Sat, 8 May 2021 14:14:05 +0300 Subject: [PATCH 20/30] Update src/CopyrighFixer/CopyrighFixer/configparser.cpp Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 683a627..9cc25d9 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -21,8 +21,7 @@ bool ConfigParser::parseOptions(Config &conf) const { QFileInfo srcDir(QuasarAppUtils::Params::getArg("sourceDir")); if (srcDir.isDir()) { - - conf.setSourceDir(QuasarAppUtils::Params::getArg("sourceDir")); + conf.setSourceDir(srcDir.absoluteFilePath()); } else { QuasarAppUtils::Params::log("The given path does not exist or is not a directory", From 23b791b48d185a5c32a7493c4731d95aeb509d5f Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Sat, 8 May 2021 14:20:34 +0300 Subject: [PATCH 21/30] Update src/CopyrighFixer/CopyrighFixer/configparser.cpp Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 9cc25d9..7ae7832 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -26,11 +26,11 @@ bool ConfigParser::parseOptions(Config &conf) const { } else { QuasarAppUtils::Params::log("The given path does not exist or is not a directory", QuasarAppUtils::VerboseLvl::Error); - conf.setSourceDir("."); } } else { - QuasarAppUtils::Params::log("Error: Not option sourceDir.", - QuasarAppUtils::VerboseLvl::Error); + QuasarAppUtils::Params::log(Sets a default source directory", + QuasarAppUtils::VerboseLvl::Info); + conf.setSourceDir("."); return false; } From 4b401e9051f434cc3a52206a4733c1556b68ceab Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Sat, 8 May 2021 14:24:55 +0300 Subject: [PATCH 22/30] Update src/CopyrighFixer/CopyrighFixer/configparser.cpp Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 7ae7832..6db3ed0 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -35,10 +35,12 @@ bool ConfigParser::parseOptions(Config &conf) const { } if (QuasarAppUtils::Params::isEndable("sign")) { - if (QFileInfo::exists(QuasarAppUtils::Params::getArg("sign"))) { + + auto signPath = QuasarAppUtils::Params::getArg("sign"); + if (QFileInfo::exists(signPath)) { Signature signature; - bool checkSign = signature.fromJson(QuasarAppUtils::Params::getArg("sign")); + bool checkSign = signature.fromJson(signPath); if (checkSign) { conf.setSingValue(signature); } else { From 9f5c2f5ed5a9cdfad72cf0467a5b9d8e046252ee Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Sat, 8 May 2021 14:26:09 +0300 Subject: [PATCH 23/30] Update src/CopyrighFixer/CopyrighFixer/configparser.cpp Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 6db3ed0..65f11f5 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -44,7 +44,7 @@ bool ConfigParser::parseOptions(Config &conf) const { if (checkSign) { conf.setSingValue(signature); } else { - QuasarAppUtils::Params::log("Error: The signature was not parsed", + QuasarAppUtils::Params::log("The signature was not parsed", QuasarAppUtils::VerboseLvl::Error); return false; } From 9eca164572ab52b284f8205a7cc47f52acbd59c3 Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Sat, 8 May 2021 14:26:17 +0300 Subject: [PATCH 24/30] Update src/CopyrighFixer/CopyrighFixer/configparser.cpp Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 65f11f5..993f274 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -56,7 +56,7 @@ bool ConfigParser::parseOptions(Config &conf) const { } } else { - QuasarAppUtils::Params::log("Error: Not option sign.", + QuasarAppUtils::Params::log("Not option sign.", QuasarAppUtils::VerboseLvl::Error); return false; } From 26c73112d9215364124a397b37307143e12841b4 Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Sat, 8 May 2021 14:26:50 +0300 Subject: [PATCH 25/30] Update src/CopyrighFixer/CopyrighFixer/configparser.h Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/configparser.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.h b/src/CopyrighFixer/CopyrighFixer/configparser.h index 7668b72..e01e1b1 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.h +++ b/src/CopyrighFixer/CopyrighFixer/configparser.h @@ -19,11 +19,6 @@ namespace CopyrighFixer { class CopyrighFixer_EXPORT ConfigParser { public: ConfigParser(); - /** - * @brief parseOptions This a method that will parse all input options. - * @return The config object. - */ - /** * @brief parseOptions This a method that will parse all input options. * @param conf The configuration object that will change(populate) when the method is called. From a0d6502ce036db5cdb277b0a632724f48ba20a23 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Sat, 8 May 2021 14:30:48 +0300 Subject: [PATCH 26/30] ref #50 Fixing: added ; --- tests/units/signertest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/units/signertest.cpp b/tests/units/signertest.cpp index 6198d98..1438074 100644 --- a/tests/units/signertest.cpp +++ b/tests/units/signertest.cpp @@ -21,6 +21,6 @@ void SignerTest::test() { } void SignerTest::testSigner() { - qWarning() << "The SignerTest class is not implemented" + qWarning() << "The SignerTest class is not implemented"; QVERIFY(true); } From e43a53c5162168bb7ac20a0976854a63faf4e272 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Sat, 8 May 2021 15:05:50 +0300 Subject: [PATCH 27/30] ref #49 Fixing: added " in log --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 993f274..c742aee 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -28,7 +28,7 @@ bool ConfigParser::parseOptions(Config &conf) const { QuasarAppUtils::VerboseLvl::Error); } } else { - QuasarAppUtils::Params::log(Sets a default source directory", + QuasarAppUtils::Params::log("Sets a default source directory", QuasarAppUtils::VerboseLvl::Info); conf.setSourceDir("."); return false; From bd79cd6014e6e278a772f06db390b9c689dd802d Mon Sep 17 00:00:00 2001 From: Igor loschinin Date: Sat, 8 May 2021 15:34:28 +0300 Subject: [PATCH 28/30] Update src/CopyrighFixer/CopyrighFixer/configparser.cpp Co-authored-by: Andrei Yankovich --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index c742aee..f55d57d 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -26,12 +26,13 @@ bool ConfigParser::parseOptions(Config &conf) const { } else { QuasarAppUtils::Params::log("The given path does not exist or is not a directory", QuasarAppUtils::VerboseLvl::Error); + return false; } } else { QuasarAppUtils::Params::log("Sets a default source directory", QuasarAppUtils::VerboseLvl::Info); conf.setSourceDir("."); - return false; + } if (QuasarAppUtils::Params::isEndable("sign")) { From e3de71f50d1eca9f5c56d832a82e6eff2cb21481 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Sat, 8 May 2021 16:40:37 +0300 Subject: [PATCH 29/30] ref #49 Refactoring the parseOption method - sign. --- .../CopyrighFixer/configparser.cpp | 66 +++++++++---------- 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index f55d57d..97ceea4 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -17,50 +17,44 @@ ConfigParser::ConfigParser() { bool ConfigParser::parseOptions(Config &conf) const { + QFileInfo pathDirOrFile("."); + if (QuasarAppUtils::Params::isEndable("sourceDir")) { - - QFileInfo srcDir(QuasarAppUtils::Params::getArg("sourceDir")); - if (srcDir.isDir()) { - conf.setSourceDir(srcDir.absoluteFilePath()); - - } else { - QuasarAppUtils::Params::log("The given path does not exist or is not a directory", - QuasarAppUtils::VerboseLvl::Error); - return false; - } - } else { - QuasarAppUtils::Params::log("Sets a default source directory", - QuasarAppUtils::VerboseLvl::Info); - conf.setSourceDir("."); - + pathDirOrFile.setFile(QuasarAppUtils::Params::getArg("sourceDir")); } - if (QuasarAppUtils::Params::isEndable("sign")) { - - auto signPath = QuasarAppUtils::Params::getArg("sign"); - if (QFileInfo::exists(signPath)) { - - Signature signature; - bool checkSign = signature.fromJson(signPath); - if (checkSign) { - conf.setSingValue(signature); - } else { - QuasarAppUtils::Params::log("The signature was not parsed", - QuasarAppUtils::VerboseLvl::Error); - return false; - } - - } else { - QuasarAppUtils::Params::log("The given path does not exist or is not a file signature", - QuasarAppUtils::VerboseLvl::Error); - return false; - } + if (!pathDirOrFile.isDir()) { + QuasarAppUtils::Params::log("The given path does not exist or is not a directory", + QuasarAppUtils::VerboseLvl::Error); + return false; } - else { + + QuasarAppUtils::Params::log("Selected source dir :" + pathDirOrFile.absoluteFilePath(), + QuasarAppUtils::Info); + conf.setSourceDir(pathDirOrFile.absoluteFilePath()); + + + if (!QuasarAppUtils::Params::isEndable("sign")) { QuasarAppUtils::Params::log("Not option sign.", QuasarAppUtils::VerboseLvl::Error); return false; } + pathDirOrFile.setFile(QuasarAppUtils::Params::getArg("sign")); + + if (!QFileInfo::exists(pathDirOrFile.absoluteFilePath())) { + QuasarAppUtils::Params::log("The given path does not exist or is not a file signature", + QuasarAppUtils::VerboseLvl::Error); + return false; + } + + Signature signature; + bool checkSign = signature.fromJson(pathDirOrFile.absoluteFilePath()); + if (!checkSign) { + QuasarAppUtils::Params::log("The signature was not parsed", + QuasarAppUtils::VerboseLvl::Error); + return false; + } + conf.setSingValue(signature); return true; }; From 20d3e76adc257f3f5e26b799b2f99df0610fd9d6 Mon Sep 17 00:00:00 2001 From: IgorekLoschinin Date: Sat, 8 May 2021 17:25:15 +0300 Subject: [PATCH 30/30] ref #49 Fixing unitTests --- src/CopyrighFixer/CopyrighFixer/configparser.cpp | 2 +- tests/units/configparsertest.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CopyrighFixer/CopyrighFixer/configparser.cpp b/src/CopyrighFixer/CopyrighFixer/configparser.cpp index 97ceea4..76bf788 100644 --- a/src/CopyrighFixer/CopyrighFixer/configparser.cpp +++ b/src/CopyrighFixer/CopyrighFixer/configparser.cpp @@ -41,7 +41,7 @@ bool ConfigParser::parseOptions(Config &conf) const { } pathDirOrFile.setFile(QuasarAppUtils::Params::getArg("sign")); - if (!QFileInfo::exists(pathDirOrFile.absoluteFilePath())) { + if (!pathDirOrFile.isFile()) { QuasarAppUtils::Params::log("The given path does not exist or is not a file signature", QuasarAppUtils::VerboseLvl::Error); return false; diff --git a/tests/units/configparsertest.cpp b/tests/units/configparsertest.cpp index f01eaea..bbd52e6 100644 --- a/tests/units/configparsertest.cpp +++ b/tests/units/configparsertest.cpp @@ -60,7 +60,7 @@ void ConfigParserTest::testSrcKey() const { CopyrighFixer::Config testConfig; CopyrighFixer::ConfigParser testParserConf; - QVERIFY(!testParserConf.parseOptions(testConfig)); + QVERIFY(testParserConf.parseOptions(testConfig)); } void ConfigParserTest::testSrcPath() const { @@ -71,7 +71,7 @@ void ConfigParserTest::testSrcPath() const { CopyrighFixer::Config testConfig; CopyrighFixer::ConfigParser testParserConf; - QVERIFY(testParserConf.parseOptions(testConfig)); + QVERIFY(!testParserConf.parseOptions(testConfig)); }