Merge branch 'jerry-sandbox2'

src/test/unittests/base/StringTests.cpp

@@ -21,7 +21,7 @@
 
 using namespace synergy;
 
-TEST(StringTests, format)
+TEST(StringTests, format_formatWithArguments_formatedString)
 {
 	const char* format = "%%%{1}=%{2}";
 	const char* arg1 = "answer";
@@ -32,7 +32,7 @@ TEST(StringTests, format)
 	EXPECT_EQ("%answer=42", result);
 }
 
-TEST(StringTests, findReplaceAll)
+TEST(StringTests, findReplaceAll_inputString_replacedString)
 {
 	String subject = "foobar";
 	String find = "bar";
@@ -43,7 +43,7 @@ TEST(StringTests, findReplaceAll)
 	EXPECT_EQ("foobaz", subject);
 }
 
-TEST(StringTests, sprintf)
+TEST(StringTests, sprintf_formatWithArgument_formatedString)
 {
 	const char* format = "%s=%d";
 	const char* arg1 = "answer";
@@ -54,7 +54,7 @@ TEST(StringTests, sprintf)
 	EXPECT_EQ("answer=42", result);
 }
 
-TEST(StringTests, toHex)
+TEST(StringTests, toHex_plaintext_hexString)
 {
 	String subject = "foobar";
 	int width = 2;
@@ -64,7 +64,7 @@ TEST(StringTests, toHex)
 	EXPECT_EQ("666f6f626172", subject);
 }
 
-TEST(StringTests, uppercase)
+TEST(StringTests, uppercase_lowercaseInput_uppercaseOutput)
 {
 	String subject = "12foo3BaR";
 
@@ -73,7 +73,7 @@ TEST(StringTests, uppercase)
 	EXPECT_EQ("12FOO3BAR", subject);
 }
 
-TEST(StringTests, removeChar)
+TEST(StringTests, removeChar_inputString_removeAllSpecifiedCharactors)
 {
 	String subject = "foobar";
 	const char c = 'o';
@@ -83,7 +83,7 @@ TEST(StringTests, removeChar)
 	EXPECT_EQ("fbar", subject);
 }
 
-TEST(StringTests, intToString)
+TEST(StringTests, intToString_inputInt_outputString)
 {
 	size_t value = 123;
 
@@ -92,7 +92,7 @@ TEST(StringTests, intToString)
 	EXPECT_EQ("123", number);
 }
 
-TEST(StringTests, stringToUint)
+TEST(StringTests, stringToUint_inputString_outputInt)
 {
 	String number = "123";
 
@@ -100,3 +100,78 @@ TEST(StringTests, stringToUint)
 
 	EXPECT_EQ(123, value);
 }
+
+TEST(StringTests, splitString_twoSeparator_returnThreeParts)
+{
+	String string = "stub1:stub2:stub3";
+
+	std::vector<String> results = string::splitString(string, ':');
+
+	EXPECT_EQ(3, results.size());
+	EXPECT_EQ("stub1", results[0]);
+	EXPECT_EQ("stub2", results[1]);
+	EXPECT_EQ("stub3", results[2]);
+}
+
+TEST(StringTests, splitString_oneSeparator_returnTwoParts)
+{
+	String string = "stub1:stub2";
+
+	std::vector<String> results = string::splitString(string, ':');
+
+	EXPECT_EQ(2, results.size());
+	EXPECT_EQ("stub1", results[0]);
+	EXPECT_EQ("stub2", results[1]);
+}
+
+TEST(StringTests, splitString_noSeparator_returnOriginalString)
+{
+	String string = "stub1";
+
+	std::vector<String> results = string::splitString(string, ':');
+
+	EXPECT_EQ(1, results.size());
+	EXPECT_EQ("stub1", results[0]);
+}
+
+TEST(StringTests, splitString_emptyString_returnEmptyVector)
+{
+	String string;
+
+	std::vector<String> results = string::splitString(string, ':');
+
+	EXPECT_EQ(0, results.size());
+}
+
+TEST(StringTests, splitString_tailSeparator_returnTwoParts)
+{
+	String string = "stub1:stub2:";
+
+	std::vector<String> results = string::splitString(string, ':');
+
+	EXPECT_EQ(2, results.size());
+	EXPECT_EQ("stub1", results[0]);
+	EXPECT_EQ("stub2", results[1]);
+}
+
+TEST(StringTests, splitString_headSeparator_returnTwoParts)
+{
+	String string = ":stub1:stub2";
+
+	std::vector<String> results = string::splitString(string, ':');
+
+	EXPECT_EQ(2, results.size());
+	EXPECT_EQ("stub1", results[0]);
+	EXPECT_EQ("stub2", results[1]);
+}
+
+TEST(StringTests, splitString_headAndTailSeparators_returnTwoParts)
+{
+	String string = ":stub1:stub2:";
+
+	std::vector<String> results = string::splitString(string, ':');
+
+	EXPECT_EQ(2, results.size());
+	EXPECT_EQ("stub1", results[0]);
+	EXPECT_EQ("stub2", results[1]);
+}

src/test/unittests/synergy/SubscriptionTests.cpp

@@ -54,21 +54,41 @@ TEST(SubscriptionTests, parsePlainSerial_invalidSerial_throwException)
 	EXPECT_THROW(subscriptionManager.parsePlainSerial(painText, key), XSubscription);
 }
 
-TEST(SubscriptionTests, parsePlainSerial_validSerial_throwException)
+TEST(SubscriptionTests, parsePlainSerial_validSerial_validSubscriptionKey)
 {
+	// valid until 2 March 2049
 	SubscriptionManager subscriptionManager;
-	String painText("{v1;trial;Bob;1;1498297600;1498384000}");
+	String painText("{v1;trial;Bob;1;a@a.a;mock company;2147483647;2147483647}");
 	SubscriptionKey key;
 	subscriptionManager.parsePlainSerial(painText, key);
 
 	EXPECT_EQ("trial", key.m_type);
 	EXPECT_EQ("Bob", key.m_name);
 	EXPECT_EQ(1, key.m_userLimit);
-	EXPECT_EQ(1498297600, key.m_warnTime);
-	EXPECT_EQ(1498384000, key.m_expireTime);
+	EXPECT_EQ("a@a.a", key.m_email);
+	EXPECT_EQ("mock company", key.m_company);
+	EXPECT_EQ(2147483647, key.m_warnTime);
+	EXPECT_EQ(2147483647, key.m_expireTime);
 }
 
-TEST(SubscriptionTests, parsePlainSerial_expiredSerial_throwException)
+TEST(SubscriptionTests, parsePlainSerial_validSerialWithoutCompany_validSubscriptionKey)
+{
+	// valid until 2 March 2049
+	SubscriptionManager subscriptionManager;
+	String painText("{v1;trial;Bob;1;a@a.a;;2147483647;2147483647}");
+	SubscriptionKey key;
+	subscriptionManager.parsePlainSerial(painText, key);
+
+	EXPECT_EQ("trial", key.m_type);
+	EXPECT_EQ("Bob", key.m_name);
+	EXPECT_EQ(1, key.m_userLimit);
+	EXPECT_EQ("a@a.a", key.m_email);
+	EXPECT_EQ("", key.m_company);
+	EXPECT_EQ(2147483647, key.m_warnTime);
+	EXPECT_EQ(2147483647, key.m_expireTime);
+}
+
+TEST(SubscriptionTests, parsePlainSerial_expiredTrialSerial_throwException)
 {
 	SubscriptionManager subscriptionManager;
 	String painText("{v1;trial;Bob;1;1398297600;1398384000}");
@@ -76,3 +96,19 @@ TEST(SubscriptionTests, parsePlainSerial_expiredSerial_throwException)
 
 	EXPECT_THROW(subscriptionManager.parsePlainSerial(painText, key), XSubscription);
 }
+
+TEST(SubscriptionTests, parsePlainSerial_expiredBasicSerial_validSubscriptionKey)
+{
+	SubscriptionManager subscriptionManager;
+	String painText("{v1;basic;Bob;1;a@a.a;mock company;1398297600;1398384000}");
+	SubscriptionKey key;
+	subscriptionManager.parsePlainSerial(painText, key);
+
+	EXPECT_EQ("basic", key.m_type);
+	EXPECT_EQ("Bob", key.m_name);
+	EXPECT_EQ(1, key.m_userLimit);
+	EXPECT_EQ("a@a.a", key.m_email);
+	EXPECT_EQ("mock company", key.m_company);
+	EXPECT_EQ(1398297600, key.m_warnTime);
+	EXPECT_EQ(1398384000, key.m_expireTime);
+}