From 7eefa49c7772aafb230b3533102b65438b444e52 Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Mon, 17 Oct 2016 16:12:33 +0100
Subject: [PATCH] #5657 Fix SerialKey construction in unit tests

---
 src/lib/shared/SerialKey.cpp                 |  4 +++-
 src/lib/shared/SerialKey.h                   |  5 +++--
 src/test/unittests/shared/SerialKeyTests.cpp | 17 +++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/lib/shared/SerialKey.cpp b/src/lib/shared/SerialKey.cpp
index ef3588ef..51ee83db 100644
--- a/src/lib/shared/SerialKey.cpp
+++ b/src/lib/shared/SerialKey.cpp
@@ -181,7 +181,7 @@ SerialKey::email() const
 }
 
 std::string
-SerialKey::decode(const std::string& serial) const
+SerialKey::decode(const std::string& serial)
 {
     static const char* const lut = "0123456789ABCDEF";
     string output;
@@ -215,6 +215,8 @@ SerialKey::parse(std::string plainSerial)
     string parityStart = plainSerial.substr(0, 1);
     string parityEnd = plainSerial.substr(plainSerial.length() - 1, 1);
 
+    m_valid = false;
+
     // check for parity chars { and }, record parity result, then remove them.
     if (parityStart == "{" && parityEnd == "}") {
         plainSerial = plainSerial.substr(1, plainSerial.length() - 2);
diff --git a/src/lib/shared/SerialKey.h b/src/lib/shared/SerialKey.h
index dd73ad16..ed0045c8 100644
--- a/src/lib/shared/SerialKey.h
+++ b/src/lib/shared/SerialKey.h
@@ -40,10 +40,11 @@ public:
     Edition				edition() const;
 	std::string			toString() const;
 
+    static std::string  decode(const std::string& serial);
+    static Edition      parseEdition(const std::string& editionStr);
+
 private:
-    std::string			decode(const std::string& serial) const;
     void				parse(std::string plainSerial);
-    Edition				parseEdition(const std::string& editionStr);
 	std::string			editionString() const;
 
 #ifdef TEST_ENV
diff --git a/src/test/unittests/shared/SerialKeyTests.cpp b/src/test/unittests/shared/SerialKeyTests.cpp
index a16be1e2..0f072676 100644
--- a/src/test/unittests/shared/SerialKeyTests.cpp
+++ b/src/test/unittests/shared/SerialKeyTests.cpp
@@ -23,42 +23,39 @@
 
 TEST(SerialKeyTests, decode_empty_returnEmptyString)
 {
-	SerialKey serial("");
-	std::string plainText = serial.decode("");
+	std::string plainText = SerialKey::decode("");
 	EXPECT_EQ(0, plainText.size());
 }
 
 TEST(SerialKeyTests, decode_invalidDigit_returnEmptyString)
 {
-	SerialKey serial("");
-	std::string plainText = serial.decode("MOCKZ");
+	std::string plainText = SerialKey::decode("MOCKZ");
 	EXPECT_EQ(0, plainText.size());
 }
 
 TEST(SerialKeyTests, decode_validSerial_returnPlainText)
 {
-	SerialKey serial("");
-	std::string plainText = serial.decode("53796E6572677920726F636B7321");
+	std::string plainText = SerialKey::decode("53796E6572677920726F636B7321");
 	EXPECT_EQ("Synergy rocks!", plainText);
 }
 
 TEST(SerialKeyTests, parse_noParty_invalid)
 {
-	SerialKey serial("");
+	SerialKey serial;
 	serial.parse("MOCK");
 	EXPECT_FALSE(serial.isValid(0));
 }
 
 TEST(SerialKeyTests, parse_invalidPartsLenghth_invalid)
 {
-	SerialKey serial("");
+	SerialKey serial;
 	serial.parse("{Synergy;Rocks}");
 	EXPECT_FALSE(serial.isValid(0));
 }
 
 TEST(SerialKeyTests, parse_validV1Serial_valid)
 {
-	SerialKey serial("");
+	SerialKey serial;
 	serial.parse("{v1;basic;Bob;1;email;company name;0;86400}");
 	EXPECT_EQ(true, serial.isValid(0));
 	EXPECT_EQ(kBasic, serial.edition());
@@ -69,7 +66,7 @@ TEST(SerialKeyTests, parse_validV1Serial_valid)
 
 TEST(SerialKeyTests, parse_validV2Serial_valid)
 {
-	SerialKey serial("");
+	SerialKey serial;
 	serial.parse("{v2;trial;pro;Bob;1;email;company name;0;86400}");
 	EXPECT_EQ(true, serial.isValid(0));
 	EXPECT_EQ(kPro, serial.edition());