Fix session-file parsing logic (#957)

Author: lalitb

lib/offline/LogSessionDataProvider.cpp

@@ -140,7 +140,7 @@ namespace MAT_NS_BEGIN
         }
         std::vector<std::string> v;
         StringUtils::SplitString(content, '\n', v);
-        if (v.size() != 2) {
+        if (v.size() != 3) {
            return false;
         }
         remove_eol(v[0]);
@@ -157,7 +157,7 @@ namespace MAT_NS_BEGIN
     {
         uint64_t res = 0ull;
         char *endptr = nullptr;
-        res = std::strtol(s.c_str(), &endptr, 10);
+        res = std::strtoll(s.c_str(), &endptr, 10);
         if (errno == ERANGE && (res == LONG_MAX || res == 0 ))
         {
             LOG_WARN ("Converted value falls out of uint64_t range.");
@@ -184,8 +184,8 @@ namespace MAT_NS_BEGIN
         contents += toString(sessionFirstTimeLaunch);
         contents += '\n';
         contents += sessionSDKUid;
+        // Valid line ends with newline as per posix specs ( https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206)
         contents += '\n';
-
         //TBD (labhas) - validate if file is NOT a symlink/junction before trying to write.
         if (!MAT::FileWrite(path.c_str(), contents.c_str()))
         {

tests/functests/LogSessionDataFuncTests.cpp

@@ -44,7 +44,7 @@ void ConstructSesFile(const char* sessionFile, const std::string& contents)
 void ConstructSesFile(const char* sessionFile, const std::string& utcTimeMs, const std::string& skuID)
 {
     std::ostringstream stream;
-    stream << utcTimeMs << '\n' << skuID;
+    stream << utcTimeMs << '\n' << skuID << '\n'; 
     ConstructSesFile(sessionFile, stream.str());
 }
 
@@ -118,4 +118,3 @@ TEST(LogSessionDataFuncTests, Constructor_InvalidSessionFileExists_NewFileWritte
     ASSERT_EQ(logSessionData->getSessionFirstTime(), properties.first);
     ASSERT_EQ(logSessionData->getSessionSDKUid(), properties.second);
 }
-

tests/unittests/LogSessionDataTests.cpp

@@ -18,6 +18,8 @@ class TestLogSessionDataProvider : public LogSessionDataProvider
 };
 
 const char* const PathToTestSesFile = "";
+const char* const PathToNonEmptyTestSesFile = "sesfile";
+
 std::string sessionSDKUid;
 uint64_t sessionFirstTimeLaunch;
 
@@ -30,7 +32,6 @@ TEST(LogSessionDataTests, parse_EmptyString_ReturnsFalse)
 
 TEST(LogSessionDataTests, parse_OneLine_ReturnsFalse)
 {
-
    TestLogSessionDataProvider logSessionDataProvider(PathToTestSesFile);
    ASSERT_FALSE(logSessionDataProvider.parse(std::string {"foo" }, sessionFirstTimeLaunch, sessionSDKUid));
 }
@@ -54,9 +55,32 @@ TEST(LogSessionDataTests, parse_TwoLinesFirstLaunchTooLarge_ReturnsFalse)
                sessionFirstTimeLaunch, sessionSDKUid));
 }
 
+TEST(LogSessionDataTests, parse_MissingNewLineAtEnd_ReturnsFalse)
+{
+   TestLogSessionDataProvider logSessionDataProvider(PathToTestSesFile);
+   ASSERT_FALSE(logSessionDataProvider.parse(std::string { "1234567890\nbar" }, sessionFirstTimeLaunch, sessionSDKUid));
+}
+
 TEST(LogSessionDataTests, parse_ValidInput_ReturnsTrue)
 {
    TestLogSessionDataProvider logSessionDataProvider(PathToTestSesFile);
-   ASSERT_TRUE(logSessionDataProvider.parse(std::string { "1234567890\nbar" }, sessionFirstTimeLaunch, sessionSDKUid));
+   ASSERT_TRUE(logSessionDataProvider.parse(std::string { "1234567890\nbar\n" }, sessionFirstTimeLaunch, sessionSDKUid));
+   ASSERT_EQ(sessionFirstTimeLaunch, (uint64_t)1234567890);
+   ASSERT_EQ(sessionSDKUid, "bar");
+}
+
+TEST(LogSessionDataTests, getLogSessionData_ValidInput_SessionDataPersists)
+{
+   TestLogSessionDataProvider logSessionDataProvider1(PathToNonEmptyTestSesFile);
+   logSessionDataProvider1.CreateLogSessionData();
+   auto logSessionData1 = logSessionDataProvider1.GetLogSessionData();
+
+   // Create another provider instance and validate session data is not re-generated
+   TestLogSessionDataProvider logSessionDataProvider2(PathToNonEmptyTestSesFile);
+   logSessionDataProvider2.CreateLogSessionData();
+   auto logSessionData2 = logSessionDataProvider2.GetLogSessionData();
+
+   ASSERT_EQ(logSessionData1->getSessionFirstTime(), logSessionData2->getSessionFirstTime());
+   ASSERT_EQ(logSessionData1->getSessionSDKUid(), logSessionData2->getSessionSDKUid());
 }