From 74ae96d0c0d3a4626e3f2020914358914a637a1e Mon Sep 17 00:00:00 2001 From: Serhii Hadzhilov Date: Mon, 28 Sep 2020 10:37:10 +0300 Subject: [PATCH] "temp" has been changed to "subscription" --- src/lib/shared/SerialKey.cpp | 2 +- src/lib/shared/SerialKeyType.cpp | 4 +- src/lib/shared/SerialKeyType.h | 2 +- src/test/unittests/shared/SerialKeyTests.cpp | 66 +++++++++++++------ .../unittests/shared/SerialKeyTypeTests.cpp | 2 +- 5 files changed, 51 insertions(+), 25 deletions(-) diff --git a/src/lib/shared/SerialKey.cpp b/src/lib/shared/SerialKey.cpp index ae9af3275..f7c1118c2 100644 --- a/src/lib/shared/SerialKey.cpp +++ b/src/lib/shared/SerialKey.cpp @@ -140,7 +140,7 @@ SerialKey::toString() const oss << "v2;" << SerialKeyType::TRIAL << ";"; } else{ - oss << "v2;" << SerialKeyType::TEMPORARY << ";"; + oss << "v2;" << SerialKeyType::SUBSCRIPTION << ";"; } } else { oss << "v1;"; diff --git a/src/lib/shared/SerialKeyType.cpp b/src/lib/shared/SerialKeyType.cpp index 74942e6da..ff3ae7aa8 100644 --- a/src/lib/shared/SerialKeyType.cpp +++ b/src/lib/shared/SerialKeyType.cpp @@ -18,7 +18,7 @@ #include "SerialKeyType.h" const std::string SerialKeyType::TRIAL = "trial"; -const std::string SerialKeyType::TEMPORARY = "temp"; +const std::string SerialKeyType::SUBSCRIPTION = "subscription"; SerialKeyType::SerialKeyType() { @@ -35,7 +35,7 @@ SerialKeyType::setKeyType(const std::string& Type) m_isTrial = true; m_isTemporary = true; } - else if (Type == SerialKeyType::TEMPORARY){ + else if (Type == SerialKeyType::SUBSCRIPTION){ m_isTemporary = true; } } diff --git a/src/lib/shared/SerialKeyType.h b/src/lib/shared/SerialKeyType.h index 22b702fca..bd1154d16 100644 --- a/src/lib/shared/SerialKeyType.h +++ b/src/lib/shared/SerialKeyType.h @@ -24,7 +24,7 @@ private: friend bool operator== (SerialKeyType const&, SerialKeyType const&); public: static const std::string TRIAL; - static const std::string TEMPORARY; + static const std::string SUBSCRIPTION; SerialKeyType(); diff --git a/src/test/unittests/shared/SerialKeyTests.cpp b/src/test/unittests/shared/SerialKeyTests.cpp index 0193f7afb..e2dcd005f 100644 --- a/src/test/unittests/shared/SerialKeyTests.cpp +++ b/src/test/unittests/shared/SerialKeyTests.cpp @@ -153,32 +153,58 @@ TEST(SerialKeyTests, daysLeft_expiredV2TrialBasicSerial_returnZero) EXPECT_EQ(0, serial.daysLeft(86401)); } -//Temporary linces tests -TEST(SerialKeyTests, isExpiring_validV2TemporaryBasicSerial_returnFalse) +//Subscription license tests +TEST(SerialKeyTests, isExpiring_validV2SubscriptionBasicSerial_returnFalse) { - // {v2;temp;basic;Bob;1;email;company name;1;86400} - SerialKey serial("7B76323B74656D703B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B313B38363430307D"); - EXPECT_EQ(false, serial.isTrial()); - EXPECT_EQ(true, serial.isTemporary()); - EXPECT_FALSE(serial.isExpiring(0)); - EXPECT_EQ(kBasic, serial.edition()); + // {v2;subscription;basic;Bob;1;email;company name;1;86400} + SerialKey serial("7B76323B737562736372697074696F6E3B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B313B38363430307D"); + EXPECT_EQ(false, serial.isTrial()); + EXPECT_EQ(true, serial.isTemporary()); + EXPECT_FALSE(serial.isExpiring(0)); + EXPECT_EQ(kBasic, serial.edition()); } -TEST(SerialKeyTests, isExpiring_expiringV2TemporaryBasicSerial_returnTrue) +TEST(SerialKeyTests, isExpiring_expiringV2SubscriptionBasicSerial_returnTrue) { - // {v2;temp;basic;Bob;1;email;company name;0;86400} - SerialKey serial("7B76323B74656D703B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B313B38363430307D"); - EXPECT_EQ(false, serial.isTrial()); - EXPECT_EQ(true, serial.isTemporary()); - EXPECT_EQ(true, serial.isExpiring(1)); + // {v2;subscription;basic;Bob;1;email;company name;0;86400} + SerialKey serial("7B76323B737562736372697074696F6E3B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B303B38363430307D"); + EXPECT_EQ(false, serial.isTrial()); + EXPECT_EQ(true, serial.isTemporary()); + EXPECT_EQ(true, serial.isExpiring(1)); } -TEST(SerialKeyTests, isExpired_expiredV2TemporaryBasicSerial_returnTrue) +TEST(SerialKeyTests, isExpired_expiredV2SubscriptionBasicSerial_returnTrue) { - // {v2;temp;basic;Bob;1;email;company name;0;86400} - SerialKey serial("7B76323B74656D703B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B313B38363430307D"); - EXPECT_EQ(false, serial.isTrial()); - EXPECT_EQ(true, serial.isTemporary()); - EXPECT_EQ(true, serial.isExpired(86401)); + // {v2;subscription;basic;Bob;1;email;company name;0;86400} + SerialKey serial("7B76323B737562736372697074696F6E3B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B303B38363430307D"); + EXPECT_EQ(false, serial.isTrial()); + EXPECT_EQ(true, serial.isTemporary()); + EXPECT_EQ(true, serial.isExpired(86401)); } +//toString method tests +TEST(SerialKeyTests, toStringV2SubscriptionBasicSerialKey) +{ + //{v2;subscription;basic;Bob;1;email;company name;0;86400} + const std::string Expected = "7B76323B737562736372697074696F6E3B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B303B38363430307D"; + SerialKey serial(Expected); + EXPECT_EQ(Expected, serial.toString()); +} + +TEST(SerialKeyTests, toStringV2TrialBasicSerialKey) +{ + //{v2;trial;basic;Bob;1;email;company name;0;86400} + const std::string Expected = "7B76323B747269616C3B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B303B38363430307D"; + SerialKey serial(Expected); + EXPECT_EQ(Expected, serial.toString()); +} + +TEST(SerialKeyTests, toStringV1BasicSerialKey) +{ + //{v1;basic;Bob;1;email;company name;0;0} + const std::string Expected = "7B76313B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B303B307D"; + SerialKey serial(Expected); + EXPECT_EQ(Expected, serial.toString()); +} + + diff --git a/src/test/unittests/shared/SerialKeyTypeTests.cpp b/src/test/unittests/shared/SerialKeyTypeTests.cpp index 800ca7f1e..66f1ca9ce 100644 --- a/src/test/unittests/shared/SerialKeyTypeTests.cpp +++ b/src/test/unittests/shared/SerialKeyTypeTests.cpp @@ -41,7 +41,7 @@ TEST(SerialKeyTypeTests, TrialTemporaryKeyType_true) TEST(SerialKeyTypeTests, TemporaryKeyType_true) { SerialKeyType KeyType; - KeyType.setKeyType("temp"); + KeyType.setKeyType("subscription"); EXPECT_EQ(false, KeyType.isTrial()); EXPECT_EQ(true, KeyType.isTemporary()); EXPECT_EQ(false, KeyType.isPermanent());