Fixed #4 Implement getEnv

Author: sea5kg

.travis.yml

@@ -19,4 +19,4 @@ script:
   - ./build_simple.sh
   - cd unit-tests.wsjcpp
   - ./build_simple.sh
-  - ./unit-tests
+  - ./run_unit-tests

.wsjcpp/.gitignore

@@ -0,0 +1,3 @@
+logs/*
+cache/*
+

src.wsjcpp/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Automaticly generated by wsjcpp@v0.0.1
 cmake_minimum_required(VERSION 3.0)
 
-add_definitions(-DWSJCPP_VERSION="v0.0.5")
+add_definitions(-DWSJCPP_VERSION="v0.0.6")
 add_definitions(-DWSJCPP_NAME="wsjcpp-core")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -14,7 +14,7 @@ set (WSJCPP_LIBRARIES "")
 set (WSJCPP_INCLUDE_DIRS "")
 set (WSJCPP_SOURCES "")
 
-# required-libraries
-list (APPEND WSJCPP_LIBRARIES "-lpthread")
+find_package(Threads REQUIRED)
+list (APPEND WSJCPP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 
 

src/wsjcpp_core.cpp

@@ -447,6 +447,16 @@ std::string WSJCppCore::extractURLProtocol(const std::string& sValue) {
     return sRet;
 }
 
+// ---------------------------------------------------------------------
+
+bool WSJCppCore::getEnv(const std::string& sName, std::string& sValue) {
+    if (const char* env_p = std::getenv(sName.c_str())) {
+        sValue = std::string(env_p);
+        return true;
+    }
+    return false;
+}
+
 // ---------------------------------------------------------------------
 // WSJCppLog
 

src/wsjcpp_core.h

@@ -53,6 +53,7 @@ class WSJCppCore {
         static unsigned long convertVoidToULong(void *p);
         static std::string getPointerAsHex(void *p);
         static std::string extractURLProtocol(const std::string& sValue);
+        static bool getEnv(const std::string& sName, std::string& sValue);
 };
 
 

unit-tests.wsjcpp/.gitignore

@@ -1,4 +1,8 @@
 tmp/*
 logs/*
 unit-tests
+.wsjcpp/*
+
+# Vim temp files
+*.swp
 

unit-tests.wsjcpp/CMakeLists.txt

@@ -1,7 +1,9 @@
 # Automaticly generated by wsjcpp@v0.0.1
 cmake_minimum_required(VERSION 3.0)
 
-project(unit-tests)
+project(unit-tests C CXX)
+add_definitions(-DWSJCPP_VERSION="ut-v0.0.6")
+add_definitions(-DWSJCPP_NAME="unit-tests-wsjcpp-core")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(MACOSX TRUE)
@@ -14,7 +16,10 @@ set (WSJCPP_LIBRARIES "")
 set (WSJCPP_INCLUDE_DIRS "")
 set (WSJCPP_SOURCES "")
 
-# wsjcpp-core:v0.0.5
+find_package(Threads REQUIRED)
+list (APPEND WSJCPP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+
+# wsjcpp-core:v0.0.6
 list (APPEND WSJCPP_INCLUDE_DIRS "../src")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_core.cpp")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_core.h")
@@ -34,9 +39,10 @@ list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_to_upper.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_to_upper.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_create_uuid.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_create_uuid.cpp")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_get_env.h")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_get_env.cpp")
 
-# required-libraries
-list (APPEND WSJCPP_LIBRARIES "-lpthread")
+include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.user-custom.txt)
 
 
 include_directories(${WSJCPP_INCLUDE_DIRS})
@@ -52,3 +58,4 @@ install(
         /usr/bin
 )
 
+

unit-tests.wsjcpp/CMakeLists.user-custom.txt

@@ -0,0 +1,2 @@
+## You can here write some custom includes
+

unit-tests.wsjcpp/run_unit-tests.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+export TESTENVVALUE1="testvalue1"
+export TEST_ENV_VALUE2="test some value2"
+export "TEST_ENV_VALUE3"="932749387"
+
+./unit-tests

unit-tests.wsjcpp/src/unit_test_get_env.cpp

@@ -0,0 +1,49 @@
+#include "unit_test_get_env.h"
+#include <vector>
+#include <wsjcpp_core.h>
+
+REGISTRY_UNIT_TEST(UnitTestGetEnv)
+
+UnitTestGetEnv::UnitTestGetEnv()
+    : WSJCppUnitTestBase("UnitTestGetEnv") {
+}
+
+// ---------------------------------------------------------------------
+
+void UnitTestGetEnv::init() {
+    // nothing
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestGetEnv::run() {
+    bool bTestSuccess = true;
+    
+    struct LTest {
+        LTest(const std::string &sName, bool bExpectedResult, const std::string &sExpectedValue) {
+            this->sName = sName;
+            this->sExpectedValue = sExpectedValue;
+            this->bExpectedResult = bExpectedResult;
+        };
+        std::string sName;
+        bool bExpectedResult;
+        std::string sExpectedValue;
+    };
+
+    std::vector<LTest> tests;
+    tests.push_back(LTest("TESTENVVALUE1", true, "testvalue1"));
+    tests.push_back(LTest("TESTENVVALUE1_", false, ""));
+    tests.push_back(LTest("TEST_ENV_VALUE2", true, "test some value2"));
+    tests.push_back(LTest("TEST_ENV_VALUE3", true, "932749387"));
+
+    for (int i = 0; i < tests.size(); i++) {
+        LTest test = tests[i];
+        std::string sValue;
+        bool bResult = WSJCppCore::getEnv(test.sName, sValue);
+        std::string testBaseName = "test#" + std::to_string(i) + " (" + test.sName + ")";
+        compareB(bTestSuccess,  testBaseName + "-result", bResult, test.bExpectedResult);
+        compareS(bTestSuccess, testBaseName + "-value", sValue, test.sExpectedValue);
+    }
+    return bTestSuccess;
+}
+