Fixed #12 Added unit-test for read yml like docker-compose samples

Author: sea5kg

unit-tests.wsjcpp/CMakeLists.txt

@@ -45,6 +45,7 @@ list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_yaml_parser_arra
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_remove_element_for_map.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_remove_element_in_array.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_memory_leaks.cpp")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_read_yaml.cpp")
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.user-custom.txt)
 

unit-tests.wsjcpp/data-tests/read-file/example-voiting-app/docker-compose.yml

@@ -0,0 +1,61 @@
+# https://github.com/dockersamples/example-voting-app/blob/master/docker-compose.yml
+
+version: "3"
+
+services:
+  vote:
+    build: ./vote
+    command: python app.py
+    volumes:
+     - ./vote:/app
+    ports:
+      - "5000:80"
+    networks:
+      - front-tier
+      - back-tier
+
+  result:
+    build: ./result
+    command: nodemon server.js
+    volumes:
+      - ./result:/app
+    ports:
+      - "5001:80"
+      - "5858:5858"
+    networks:
+      - front-tier
+      - back-tier
+
+  worker:
+    build:
+      context: ./worker
+    depends_on:
+      - "redis"
+      - "db"
+    networks:
+      - back-tier
+
+  redis:
+    image: redis:alpine
+    container_name: redis
+    ports: ["6379"]
+    networks:
+      - back-tier
+
+  db:
+    image: postgres:9.4
+    container_name: db
+    environment:
+      POSTGRES_USER: "postgres"
+      POSTGRES_PASSWORD: "postgres"
+    volumes:
+      - "db-data:/var/lib/postgresql/data"
+    networks:
+      - back-tier
+
+volumes:
+  db-data:
+
+networks:
+  front-tier:
+  back-tier:

unit-tests.wsjcpp/src/unit_test_memory_leaks.cpp

@@ -7,6 +7,8 @@
 #include <fstream>
 #include <string>
 #include <wsjcpp_yaml.h>
+#include <chrono>
+#include <thread>
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -81,23 +83,24 @@ bool UnitTestMemoryLeaks::doBeforeTest() {
 
 void UnitTestMemoryLeaks::executeTest() {
     double nBeforeVm, nBeforeRss;
+    double nAfterVm, nAfterRss;
+    std::string sFilepath = "./data-tests/for-memory-leak/some.yml";
+    std::string sError;
+
     process_mem_usage(nBeforeVm, nBeforeRss);
     // std::cout << "nBeforeVm: " << nBeforeVm << std::endl;
     // std::cout << "nBeforeRss: " << nBeforeRss << std::endl;
     compare("memory vm not null", (int)nBeforeVm > 0, true);
     compare("memory vm not null", (int)nBeforeRss > 0, true);
 
     for (int i = 0; i < 1000; i++) {
-        WsjcppYaml *pYaml = new WsjcppYaml();
-        std::string sError;
-        if (!compare("Error parsing", pYaml->loadFromFile("./data-tests/for-memory-leak/some.yml", sError), true)) {
+        WsjcppYaml yaml;
+        if (!compare("Error parsing", yaml.loadFromFile(sFilepath, sError), true)) {
             WsjcppLog::err(TAG, sError);
             return;
         }
-        delete pYaml;
     }
-    
-    double nAfterVm, nAfterRss;
+    // std::this_thread::sleep_for(std::chrono::seconds(1));
     process_mem_usage(nAfterVm, nAfterRss);
     // std::cout << "nAfterVm: " << nAfterVm << std::endl;
     // std::cout << "nAfterRss: " << nAfterRss << std::endl;

unit-tests.wsjcpp/src/unit_test_read_yaml.cpp

@@ -0,0 +1,58 @@
+
+#include <wsjcpp_core.h>
+#include <wsjcpp_unit_tests.h>
+#include <wsjcpp_yaml.h>
+
+// ---------------------------------------------------------------------
+// UnitTestReadYaml
+
+class UnitTestReadYaml : public WsjcppUnitTestBase {
+    public:
+        UnitTestReadYaml();
+        virtual bool doBeforeTest() override;
+        virtual void executeTest() override;
+        virtual bool doAfterTest() override;
+};
+
+REGISTRY_WSJCPP_UNIT_TEST(UnitTestReadYaml)
+
+UnitTestReadYaml::UnitTestReadYaml()
+    : WsjcppUnitTestBase("UnitTestReadYaml") {
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestReadYaml::doBeforeTest() {
+    // do something before test
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
+void UnitTestReadYaml::executeTest() {
+    WsjcppYaml yaml;
+    std::string sFilepath = "./data-tests/read-file/example-voiting-app/docker-compose.yml";
+    std::string sError;
+    if (!compare("Error parsing", yaml.loadFromFile(sFilepath, sError), true)) {
+        WsjcppLog::err(TAG, sError);
+        return;
+    }
+
+    compare("has version", yaml.getRoot()->hasElement("version"), true);
+    compare("has volumes", yaml.getRoot()->hasElement("volumes"), true);
+    compare("has networks", yaml.getRoot()->hasElement("networks"), true);
+    compare("has services", yaml.getRoot()->hasElement("services"), true);
+
+    compare("version-value", yaml.getRoot()->getElement("version")->getValue(), "3");
+
+    // TODO unit test source code here
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestReadYaml::doAfterTest() {
+    // do somethig after test
+    return true;
+}
+
+

wsjcpp.yml

@@ -57,3 +57,5 @@ unit-tests:
       description: ""
     - name: "MemoryLeaks"
       description: ""
+    - name: "ReadYaml"
+      description: ""