Fixed #19 Cleanup previously data

Author: sea5kg

src/wsjcpp_yaml.cpp

@@ -83,7 +83,7 @@ WsjcppYamlItem::WsjcppYamlItem(
 // ---------------------------------------------------------------------
 
 WsjcppYamlItem::~WsjcppYamlItem() {
-    for (int i = 0; i < m_vObjects.size(); i++) {
+     for (int i = 0; i < m_vObjects.size(); i++) {
         delete m_vObjects[i];
     }
     m_vObjects.clear();
@@ -1129,7 +1129,7 @@ WsjcppYamlCursor WsjcppYamlCursor::operator[](const std::string &sName) const {
 // WsjcppYaml
 
 WsjcppYaml::WsjcppYaml() {
-    m_pRoot = new WsjcppYamlItem(nullptr, WsjcppYamlPlaceInFile(), WSJCPP_YAML_ITEM_MAP);
+    m_pRoot = nullptr;
     TAG = "WsjcppYaml";
 }
 
@@ -1141,6 +1141,13 @@ WsjcppYaml::~WsjcppYaml() {
 
 // ---------------------------------------------------------------------
 
+void WsjcppYaml::clear() {
+    delete m_pRoot;
+    m_pRoot = nullptr;
+}
+
+// ---------------------------------------------------------------------
+
 bool WsjcppYaml::loadFromFile(const std::string &sFileName, std::string &sError) {
     std::string sTextContent;
     if (!WsjcppCore::readTextFile(sFileName, sTextContent)) {
@@ -1220,6 +1227,11 @@ std::vector<std::string> WsjcppYaml::splitToLines(const std::string &sBuffer) {
 // ---------------------------------------------------------------------
 
 bool WsjcppYaml::parse(const std::string &sFileName, const std::string &sBuffer, std::string &sError) {
+    this->clear();
+    if (m_pRoot == nullptr) {
+        m_pRoot = new WsjcppYamlItem(nullptr, WsjcppYamlPlaceInFile(), WSJCPP_YAML_ITEM_MAP);
+    }
+
     std::vector<std::string> vLines = this->splitToLines(sBuffer);
     WsjcppYamlParserStatus st;
     st.pCurItem = m_pRoot; // TODO recreate again new root element

src/wsjcpp_yaml.h

@@ -254,6 +254,7 @@ class WsjcppYaml {
     public:
         WsjcppYaml();
         ~WsjcppYaml();
+        void clear();
         bool loadFromFile(const std::string &sFileName, std::string &sError);
         bool saveToFile(const std::string &sFileName);
         bool loadFromString(const std::string &sBufferName, const std::string &sBuffer, std::string &sError);

unit-tests.wsjcpp/CMakeLists.txt

@@ -49,6 +49,7 @@ list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_read_yaml.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_read_write_file.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_cursor.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_tag_names.cpp")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_cleanup.cpp")
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.user-custom.txt)
 

unit-tests.wsjcpp/src/unit_test_cleanup.cpp

@@ -0,0 +1,81 @@
+
+#include <wsjcpp_core.h>
+#include <wsjcpp_unit_tests.h>
+#include <wsjcpp_yaml.h>
+
+// ---------------------------------------------------------------------
+// UnitTestCleanup
+
+class UnitTestCleanup : public WsjcppUnitTestBase {
+    public:
+        UnitTestCleanup();
+        virtual bool doBeforeTest() override;
+        virtual void executeTest() override;
+        virtual bool doAfterTest() override;
+};
+
+REGISTRY_WSJCPP_UNIT_TEST(UnitTestCleanup)
+
+UnitTestCleanup::UnitTestCleanup()
+    : WsjcppUnitTestBase("UnitTestCleanup") {
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestCleanup::doBeforeTest() {
+    // do something before test
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
+void UnitTestCleanup::executeTest() {
+    std::string sTestYaml1 = 
+        "# Some comment 1\n"
+        "test10: one\n"
+        "test20: two # some comment 2\n"
+    ;
+
+    std::string sTestYaml2 = 
+        "# Some comment 1\n"
+        "test11: one\n"
+        "test20: two # some comment 2\n"
+        "test22: two # some comment 2\n"
+    ;
+
+    WsjcppYaml yaml;
+    std::string sError;
+
+    if (!compare("Error parsing 1", yaml.loadFromString("parse1", sTestYaml1, sError), true)) {
+        WsjcppLog::err(TAG, sError);
+        return;
+    }
+
+    compare("(1) has test10", yaml.getRoot()->hasElement("test10"), true);
+    compare("(1) has test11", yaml.getRoot()->hasElement("test11"), false);
+    compare("(1) has test20", yaml.getRoot()->hasElement("test20"), true);
+    compare("(1) has test22", yaml.getRoot()->hasElement("test22"), false);
+
+    if (!compare("Error parsing 2", yaml.loadFromString("parse2", sTestYaml2, sError), true)) {
+        WsjcppLog::err(TAG, sError);
+        return;
+    }
+
+    compare("(2) has test10", yaml.getRoot()->hasElement("test10"), false);
+    compare("(2) has test11", yaml.getRoot()->hasElement("test11"), true);
+    compare("(2) has test20", yaml.getRoot()->hasElement("test20"), true);
+    compare("(2) has test22", yaml.getRoot()->hasElement("test22"), true);
+
+    yaml.clear();
+
+    compare("(3) has root", yaml.getRoot() == nullptr, true);
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestCleanup::doAfterTest() {
+    // do somethig after test
+    return true;
+}
+
+

wsjcpp.yml

@@ -65,3 +65,5 @@ unit-tests:
       description: ""
     - name: "TagNames"
       description: ""
+    - name: "Cleanup"
+      description: ""