Deal with checkpoint name

Author: ThirtySomething

smcore/checkpoint.cpp

@@ -29,22 +29,32 @@ namespace smos
     namespace smcore
     {
         //******************************************************************************
-        Checkpoint::Checkpoint(void) : m_version()
+        Checkpoint::Checkpoint(void) : m_version(), m_name("")
         {
         }
         //******************************************************************************
         Checkpoint::~Checkpoint(void)
         {
         }
         //******************************************************************************
+        smos::smcore::Version Checkpoint::versionGet(void)
+        {
+            return this->m_version;
+        }
+        //******************************************************************************
         void Checkpoint::versionSet(const smos::smcore::Version &version)
         {
             this->m_version = version;
         }
         //******************************************************************************
-        smos::smcore::Version Checkpoint::versionGet(void)
+        smos::smcore::SMString Checkpoint::checkpointNameGet(void)
         {
-            return this->m_version;
+            return this->m_name;
+        }
+        //******************************************************************************
+        void Checkpoint::checkpointNameSet(const smos::smcore::SMString &checkpointName)
+        {
+            this->m_name = checkpointName;
         }
         //******************************************************************************
     }

smcore/checkpoint.h

@@ -23,6 +23,7 @@
 #pragma once
 
 #include "archivereader.h"
+#include "smstring.h"
 #include "version.h"
 
 namespace smos
@@ -44,6 +45,13 @@ namespace smos
              */
             ~Checkpoint(void);
 
+            /**
+             * @brief Get version information object
+             *
+             * @return smos::smcore::Version
+             */
+            smos::smcore::Version versionGet(void);
+
             /**
              * @brief Set version information object
              *
@@ -52,14 +60,30 @@ namespace smos
             void versionSet(const smos::smcore::Version &version);
 
             /**
-             * @brief Get version information object
+             * @brief Get name of checkpoint
              *
-             * @return smos::smcore::Version
+             * @return smos::smcore::SMString
              */
-            smos::smcore::Version versionGet(void);
+            smos::smcore::SMString checkpointNameGet(void);
+
+            /**
+             * @brief Set name of checkpoint
+             *
+             * @param checkpointName
+             */
+            void checkpointNameSet(const smos::smcore::SMString &checkpointName);
 
         protected:
+            /**
+             * @brief Version information of checkpoint
+             *
+             */
             smos::smcore::Version m_version;
+
+            /**
+             * @brief Name of checkpoins
+             */
+            smos::smcore::SMString m_name;
         };
     }
 }

smcore/smcheckpointsreader.cpp

@@ -49,6 +49,8 @@ namespace smos
                 // ar >> m_sName >> m_oDate >> m_fUseModifiedComplexity >> m_poLanguage;
                 std::string nameSMCheckpoint = m_archiveReader.Read<std::string>();
                 std::cout << "nameSMCheckpoint: " << nameSMCheckpoint << std::endl;
+                curCheckpoint.checkpointNameSet(nameSMCheckpoint);
+
                 std::time_t t64_checkpointSMCheckpoint = m_archiveReader.Read<std::time_t>();
                 std::cout << "Checkpoint time: " << t64_checkpointSMCheckpoint << std::endl;
 

smtest/test_checkpoint.cpp

@@ -41,7 +41,39 @@ namespace smos
             smos::smcore::Checkpoint checkpoint = smos::smcore::Checkpoint();
             smos::smcore::Version version = smos::smcore::Version();
 
-            QCOMPARE(version, checkpoint.versionGet());
+            QCOMPARE(checkpoint.versionGet(), version);
+
+            QString nameObject = QString::fromUtf8(checkpoint.checkpointNameGet().c_str());
+            smos::smcore::SMString nameExpectedRaw = "";
+            QString nameExpected = QString::fromUtf8(nameExpectedRaw.c_str());
+
+            QCOMPARE(nameObject, nameExpected);
+        }
+        //******************************************************************************
+        void TestCheckpoint::TestVersion(void)
+        {
+            smos::smcore::Checkpoint checkpoint = smos::smcore::Checkpoint();
+            smos::smcore::Version version = smos::smcore::Version();
+
+            QCOMPARE(checkpoint.versionGet(), version);
+
+            smos::smcore::Version versionNew = smos::smcore::Version(2, 2, 2);
+            checkpoint.versionSet(versionNew);
+            QCOMPARE(checkpoint.versionGet(), versionNew);
+        }
+        //******************************************************************************
+        void TestCheckpoint::TestName(void)
+        {
+            smos::smcore::Checkpoint checkpoint = smos::smcore::Checkpoint();
+            QString nameObject = QString::fromUtf8(checkpoint.checkpointNameGet().c_str());
+            smos::smcore::SMString nameExpectedRaw = "";
+            QString nameExpected = QString::fromUtf8(nameExpectedRaw.c_str());
+
+            nameExpectedRaw = "Hello world!";
+            checkpoint.checkpointNameSet(nameExpectedRaw);
+            nameObject = QString::fromUtf8(checkpoint.checkpointNameGet().c_str());
+            nameExpected = QString::fromUtf8(nameExpectedRaw.c_str());
+            QCOMPARE(nameObject, nameExpected);
         }
         //******************************************************************************
         void TestCheckpoint::cleanupTestCase(void)

smtest/test_checkpoint.h

@@ -35,6 +35,8 @@ namespace smos
         private slots:
             void initTestCase(void);
             void TestConstructor(void);
+            void TestVersion(void);
+            void TestName(void);
             void cleanupTestCase(void);
         };
     }