Updated wsjcpp-core and implemeneted createElementMap

Author: sea5kg

.travis.yml

@@ -17,6 +17,6 @@ addons:
 # Build steps
 script:
   - ./build_simple.sh
-  - cd unit-tests
+  - cd unit-tests.wsjcpp
   - ./build_simple.sh
   - ./unit-tests

README.md

@@ -9,8 +9,8 @@ C++ Write/Reader yaml files
 
 include files:
 
-- src.wsjcpp/wsjcpp-core/wsjcpp_core.h
-- src.wsjcpp/wsjcpp-core/wsjcpp_core.cpp
+- src.wsjcpp/wsjcpp_core/wsjcpp_core.h
+- src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp
 - src/wsjcpp_yaml.cpp
 - src/wsjcpp_yaml.h
 

src.wsjcpp/CMakeLists.txt

@@ -1,16 +1,25 @@
-# Automaticly generated by wsjcpp-yaml@0.0.2
+# Automaticly generated by wsjcpp@v0.0.1
+cmake_minimum_required(VERSION 3.0)
 
-add_definitions(-DWSJCPP_VERSION="0.0.2")
+add_definitions(-DWSJCPP_VERSION="v0.0.3")
 add_definitions(-DWSJCPP_NAME="wsjcpp-yaml")
 
-# set(CMAKE_AUTOMOC ON)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(MACOSX TRUE)
+endif()
+
 set(CMAKE_CXX_STANDARD 11)
 
 set (WSJCPP_LIBRARIES "")
 set (WSJCPP_INCLUDE_DIRS "")
 set (WSJCPP_SOURCES "")
 
-# wsjcpp/wsjcpp-core
-list (APPEND WSJCPP_INCLUDE_DIRS "src.wsjcpp/wsjcpp_wsjcpp_core/")
-list (APPEND WSJCPP_SOURCES "src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.h")
-list (APPEND WSJCPP_SOURCES "src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.cpp")
+# wsjcpp-core:v0.0.4
+list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_core/")
+list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp")
+list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_core.h")
+
+# required-libraries
+list (APPEND WSJCPP_LIBRARIES "-lpthread")
+
+

unit-tests/src/unit_tests.cpp src.wsjcpp/wsjcpp_core/unit_tests.cppunit-tests/src/unit_tests.cpp renamed to src.wsjcpp/wsjcpp_core/unit_tests.cpp

@@ -17,7 +17,7 @@ std::string UnitTestBase::name() {
 void UnitTestBase::compareS(bool &bTestSuccess, const std::string &sPoint,
     const std::string &sValue, const std::string &sExpected) {
     if (sValue != sExpected) {
-        WSJCppLog::err(TAG, sPoint + ", expeceted '" + sExpected + "', but got '" + sValue + "'");
+        WSJCppLog::err(TAG, " {" + sPoint + "} Expected '" + sExpected + "', but got '" + sValue + "'");
         bTestSuccess = false;
     }
 }
@@ -26,7 +26,18 @@ void UnitTestBase::compareS(bool &bTestSuccess, const std::string &sPoint,
 
 bool UnitTestBase::compareN(bool &bTestSuccess, const std::string &sPoint, int nValue, int nExpected) {
     if (nValue != nExpected) {
-        WSJCppLog::err(TAG, " {" + sPoint + "} Expeceted '" + std::to_string(nExpected) + "', but got '" + std::to_string(nValue) + "'");
+        WSJCppLog::err(TAG, " {" + sPoint + "} Expected '" + std::to_string(nExpected) + "', but got '" + std::to_string(nValue) + "'");
+        bTestSuccess = false;
+        return false;
+    }
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestBase::compareD(bool &bTestSuccess, const std::string &sPoint, double nValue, double nExpected) {
+    if (nValue != nExpected) {
+        WSJCppLog::err(TAG, " {" + sPoint + "} Expected '" + std::to_string(nExpected) + "', but got '" + std::to_string(nValue) + "'");
         bTestSuccess = false;
         return false;
     }
@@ -37,7 +48,7 @@ bool UnitTestBase::compareN(bool &bTestSuccess, const std::string &sPoint, int n
 
 void UnitTestBase::compareB(bool &bTestSuccess, const std::string &sPoint, bool bValue, bool bExpected) {
     if (bValue != bExpected) {
-        WSJCppLog::err(TAG, sPoint + ", expeceted '" + (bExpected ? "true" : "false") + "', but got '" + (bValue ? "true" : "false") + "'");
+        WSJCppLog::err(TAG, " {" + sPoint + "} Expected '" + (bExpected ? "true" : "false") + "', but got '" + (bValue ? "true" : "false") + "'");
         bTestSuccess = false;
     }
 }
@@ -48,7 +59,7 @@ std::vector<UnitTestBase*> *g_pUnitTests = NULL;
 
 void UnitTests::initGlobalVariables() {
     if (g_pUnitTests == NULL) {
-        // WSJCppLog::info(std::string(), "Create handlers map");
+        // Log::info(std::string(), "Create handlers map");
         g_pUnitTests = new std::vector<UnitTestBase*>();
     }
 }
@@ -69,7 +80,7 @@ void UnitTests::addUnitTest(const std::string &sTestName, UnitTestBase* pUnitTes
         WSJCppLog::err(sTestName, "Already registered");
     } else {
         g_pUnitTests->push_back(pUnitTest);
-        // WSJCppLog::info(sCmd, "Registered");
+        // Log::info(sCmd, "Registered");
     }
 }
 

unit-tests/src/unit_tests.h src.wsjcpp/wsjcpp_core/unit_tests.hunit-tests/src/unit_tests.h renamed to src.wsjcpp/wsjcpp_core/unit_tests.h

@@ -16,6 +16,7 @@ class UnitTestBase {
 
         void compareS(bool &bTestSuccess, const std::string &sPoint, const std::string &sValue, const std::string &sExpected);
         bool compareN(bool &bTestSuccess, const std::string &sPoint, int nValue, int nExpected);
+        bool compareD(bool &bTestSuccess, const std::string &sPoint, double nValue, double nExpected);
         void compareB(bool &bTestSuccess, const std::string &sPoint, bool bValue, bool bExpected);
 
     private:

unit-tests/src/main.cpp …c.wsjcpp/wsjcpp_core/unit_tests_main.cppunit-tests/src/main.cpp renamed to src.wsjcpp/wsjcpp_core/unit_tests_main.cpp unit-tests/src/main.cpp renamed to src.wsjcpp/wsjcpp_core/unit_tests_main.cpp

@@ -0,0 +1,56 @@
+wsjcpp_version: v0.0.1
+cmake_cxx_standard: 11
+cmake_minimum_required: 3.0
+
+name: wsjcpp-core
+version: v0.0.4
+description: Basic Utils for wsjcpp
+issues: https://github.com/wsjcpp/wsjcpp-core/issues
+repositories:
+  - type: main
+    url: "https://github.com/wsjcpp/wsjcpp-core"
+keywords:
+  - c++
+  - wsjcpp
+
+authors:
+  - name: Evgenii Sopov
+    email: mrseakg@gmail.com
+
+required-libraries:
+  - pthread
+
+distribution:
+  - source-file: src/wsjcpp_core.cpp
+    target-file: wsjcpp_core.cpp
+    sha1: "04a9e3c6db3c7190c6589514a4b5957dbb4c366d"
+    type: "source-code"
+  - source-file: src/wsjcpp_core.h
+    target-file: wsjcpp_core.h
+    sha1: "1d76447c6880f43f9afeca89111ec64d3574ccb7"
+    type: "source-code"
+  - source-file: "src/unit_tests.cpp"
+    target-file: "unit_tests.cpp"
+    type: "unit-tests"
+    sha1: "a36d71646ddd6041346909c0481a59299f01f898"
+  - source-file: "src/unit_tests.h"
+    target-file: "unit_tests.h"
+    type: "unit-tests"
+    sha1: "a20248c9801c53519ad847aa19d80460289a5dd1"
+  - source-file: "src/unit_tests_main.cpp"
+    target-file: "unit_tests_main.cpp"
+    type: "unit-tests"
+    sha1: "81a2b3d7328575c0087fa43000b05a96e278da07"
+
+unit-tests:
+  cases:
+    - name: CoreNormalizePath
+      description: Check function normalizePath
+    - name: CoreUuid
+      description: Check test generate uuid function
+    - name: CoreExtractFilename
+      description: Check function extract filenane from path
+    - name: IPv4
+      description: Check function isIPv4
+    - name: IPv6
+      description: Check function isIPv6

src.wsjcpp/wsjcpp_core/wsjcpp.hold.yml

@@ -16,6 +16,9 @@
 #include <cstdint>
 #include <unistd.h>
 #include <streambuf>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
 
 // ---------------------------------------------------------------------
 
@@ -353,7 +356,11 @@ bool WSJCppCore::writeFile(const std::string &sFilename, const char *pBuffer, co
     return true;
 }
 
+// ---------------------------------------------------------------------
 
+bool WSJCppCore::removeFile(const std::string &sFilename) {
+    return remove(sFilename.c_str()) == 0;
+}
 
 // ---------------------------------------------------------------------
 
@@ -404,6 +411,44 @@ std::string WSJCppCore::createUuid() {
     return sRet;
 }
 
+// ---------------------------------------------------------------------
+
+bool WSJCppCore::isIPv4(const std::string& str) {
+    int n = 0;
+    std::string s[4] = {"", "", "", ""};
+    for (int i = 0; i < str.length(); i++) {
+        char c = str[i];
+        if (n > 3) {
+            return false;
+        }
+        if (c >= '0' && c <= '9') {
+            s[n] += c;
+        } else if (c == '.') {
+            n++;
+        } else {
+            return false;
+        }
+    }
+    for (int i = 0; i < 4; i++) {
+        if (s[i].length() > 3) {
+            return false;
+        }
+        int p = std::stoi(s[i]);
+        if (p > 255 || p < 0) {
+            return false;
+        }
+    }
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
+bool WSJCppCore::isIPv6(const std::string& str) {
+    unsigned char buf[sizeof(struct in6_addr)];
+    bool isValid = inet_pton(AF_INET6, str.c_str(), buf);
+    return isValid;
+}
+
 // ---------------------------------------------------------------------
 // WSJCppLog
 

…sjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.cpp src.wsjcpp/wsjcpp_core/wsjcpp_core.cppsrc.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.cpp renamed to src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.cpp renamed to src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp

@@ -39,7 +39,7 @@ class WSJCppCore {
         static bool writeFile(const std::string &sFilename, const std::string &sContent);
         static bool readTextFile(const std::string &sFilename, std::string &sOutputContent);
         static bool writeFile(const std::string &sFilename, const char *pBuffer, const int nBufferSize);
-        
+        static bool removeFile(const std::string &sFilename);
 
         static std::string& ltrim(std::string& str, const std::string& chars = "\t\n\v\f\r ");
         static std::string& rtrim(std::string& str, const std::string& chars = "\t\n\v\f\r ");
@@ -48,6 +48,8 @@ class WSJCppCore {
 
         static void initRandom();
         static std::string createUuid();
+        static bool isIPv4(const std::string& str);
+        static bool isIPv6(const std::string& str);
 };