smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

"temp" has been changed to "subscription"

Browse source
This commit is contained in:
Serhii Hadzhilov 2020-09-28 10:37:10 +03:00
parent 8e96719480
commit 74ae96d0c0
5 changed files with 51 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/shared/SerialKey.cpp
View file

@ -140,7 +140,7 @@ SerialKey::toString() const
oss << "v2;" << SerialKeyType::TRIAL << ";"; oss << "v2;" << SerialKeyType::TRIAL << ";";
} }
else{ else{
oss << "v2;" << SerialKeyType::TEMPORARY << ";"; oss << "v2;" << SerialKeyType::SUBSCRIPTION << ";";
} }
} else { } else {
oss << "v1;"; oss << "v1;";

4
src/lib/shared/SerialKeyType.cpp
View file

@ -18,7 +18,7 @@
#include "SerialKeyType.h" #include "SerialKeyType.h"
const std::string SerialKeyType::TRIAL = "trial"; const std::string SerialKeyType::TRIAL = "trial";
const std::string SerialKeyType::TEMPORARY = "temp"; const std::string SerialKeyType::SUBSCRIPTION = "subscription";
SerialKeyType::SerialKeyType() SerialKeyType::SerialKeyType()
{ {
@ -35,7 +35,7 @@ SerialKeyType::setKeyType(const std::string& Type)
m_isTrial = true; m_isTrial = true;
m_isTemporary = true; m_isTemporary = true;
} }
else if (Type == SerialKeyType::TEMPORARY){ else if (Type == SerialKeyType::SUBSCRIPTION){
m_isTemporary = true; m_isTemporary = true;
} }
} }

2
src/lib/shared/SerialKeyType.h
View file

@ -24,7 +24,7 @@ private:
friend bool operator== (SerialKeyType const&, SerialKeyType const&); friend bool operator== (SerialKeyType const&, SerialKeyType const&);
public: public:
static const std::string TRIAL; static const std::string TRIAL;
static const std::string TEMPORARY; static const std::string SUBSCRIPTION;
SerialKeyType(); SerialKeyType();

66
src/test/unittests/shared/SerialKeyTests.cpp
View file

@ -153,32 +153,58 @@ TEST(SerialKeyTests, daysLeft_expiredV2TrialBasicSerial_returnZero)
EXPECT_EQ(0, serial.daysLeft(86401)); EXPECT_EQ(0, serial.daysLeft(86401));
} }
//Temporary linces tests //Subscription license tests
TEST(SerialKeyTests, isExpiring_validV2TemporaryBasicSerial_returnFalse) TEST(SerialKeyTests, isExpiring_validV2SubscriptionBasicSerial_returnFalse)
{ {
// {v2;temp;basic;Bob;1;email;company name;1;86400} // {v2;subscription;basic;Bob;1;email;company name;1;86400}
SerialKey serial("7B76323B74656D703B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B313B38363430307D"); SerialKey serial("7B76323B737562736372697074696F6E3B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B313B38363430307D");
EXPECT_EQ(false, serial.isTrial()); EXPECT_EQ(false, serial.isTrial());
EXPECT_EQ(true, serial.isTemporary()); EXPECT_EQ(true, serial.isTemporary());
EXPECT_FALSE(serial.isExpiring(0)); EXPECT_FALSE(serial.isExpiring(0));
EXPECT_EQ(kBasic, serial.edition()); 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} // {v2;subscription;basic;Bob;1;email;company name;0;86400}
SerialKey serial("7B76323B74656D703B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B313B38363430307D"); SerialKey serial("7B76323B737562736372697074696F6E3B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B303B38363430307D");
EXPECT_EQ(false, serial.isTrial()); EXPECT_EQ(false, serial.isTrial());
EXPECT_EQ(true, serial.isTemporary()); EXPECT_EQ(true, serial.isTemporary());
EXPECT_EQ(true, serial.isExpiring(1)); 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} // {v2;subscription;basic;Bob;1;email;company name;0;86400}
SerialKey serial("7B76323B74656D703B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B313B38363430307D"); SerialKey serial("7B76323B737562736372697074696F6E3B62617369633B426F623B313B656D61696C3B636F6D70616E79206E616D653B303B38363430307D");
EXPECT_EQ(false, serial.isTrial()); EXPECT_EQ(false, serial.isTrial());
EXPECT_EQ(true, serial.isTemporary()); EXPECT_EQ(true, serial.isTemporary());
EXPECT_EQ(true, serial.isExpired(86401)); 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());
}

2
src/test/unittests/shared/SerialKeyTypeTests.cpp
View file

@ -41,7 +41,7 @@ TEST(SerialKeyTypeTests, TrialTemporaryKeyType_true)
TEST(SerialKeyTypeTests, TemporaryKeyType_true) TEST(SerialKeyTypeTests, TemporaryKeyType_true)
{ {
SerialKeyType KeyType; SerialKeyType KeyType;
KeyType.setKeyType("temp"); KeyType.setKeyType("subscription");
EXPECT_EQ(false, KeyType.isTrial()); EXPECT_EQ(false, KeyType.isTrial());
EXPECT_EQ(true, KeyType.isTemporary()); EXPECT_EQ(true, KeyType.isTemporary());
EXPECT_EQ(false, KeyType.isPermanent()); EXPECT_EQ(false, KeyType.isPermanent());