Moved tests to unit-tests

Author: sea5kg

.gitignore

@@ -1,6 +1,7 @@
 wsjcpp-yaml
 tmp/*
 .wsjcpp-yaml-logs/*
+.vscode
 
 # Prerequisites
 *.d

CMakeLists.txt

@@ -5,7 +5,7 @@ project(wsjcpp-yaml)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src.wsjcpp/CMakeLists.txt)
 
 set(CMAKE_CXX_STANDARD 11)
-set(EXECUTABLE_OUTPUT_PATH ${wsjcpp_SOURCE_DIR})
+set(EXECUTABLE_OUTPUT_PATH ${wsjcpp-yaml_SOURCE_DIR})
 
 # Sources
 

src/main.cpp

@@ -50,25 +50,6 @@ void check(std::string sTestName, bool bGotValue, bool bExpectedValue) {
     Log::ok(sTestName, "fine");
 };
 
-void testLine(
-    int nNumberOfTest, 
-    std::string sLine,
-    std::string sPrefix,
-    bool isArrayItem,
-    std::string sName,
-    std::string sValue,
-    std::string sComment
-) {
-    std::string TAG = "LINE" + std::to_string(nNumberOfTest);
-    WSJCppYAMLParsebleLine line(nNumberOfTest);
-    Log::info(TAG, "Test line" + std::to_string(nNumberOfTest) + ": '" + sLine + "'");
-    line.parseLine(sLine);
-    check(TAG + "-prefix", line.getPrefix(), sPrefix);
-    check(TAG + "-arrayitem", line.isArrayItem(), isArrayItem);
-    check(TAG + "-name", line.getName(), sName);
-    check(TAG + "-value", line.getValue(), sValue);
-    check(TAG + "-comment", line.getComment(), sComment);
-};
 
 int main(int argc, char* argv[]) {
     std::string TAG = "MAIN";
@@ -80,13 +61,6 @@ int main(int argc, char* argv[]) {
         Fallen::makeDir(appLogPath);
     }
 
-    // tests for line parser
-    testLine(1, "# Some comment 1 ", "", false, "", "", " Some comment 1 ");
-    testLine(2, "  test2: \"t\\\"wo\" # some comment 2", "  ", false, "test2", "t\"wo", " some comment 2");
-    testLine(3, "  test3:", "  ", false, "test3", "", "");
-    testLine(4, "  - test4", "  ", true, "", "test4", "");
-    testLine(5, "", "", false, "", "", "");
-
     // tests
 
 

unit-tests/.gitignore

@@ -1 +1,3 @@
-tmp/*
+tmp/*
+logs/*
+unit-tests

unit-tests/CMakeLists.txt

@@ -1,33 +1,45 @@
 cmake_minimum_required(VERSION 3.0)
 
-project(wsjcpp-yaml)
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/src.wsjcpp/CMakeLists.txt)
+project(unit-tests)
 
 set(CMAKE_CXX_STANDARD 11)
-set(EXECUTABLE_OUTPUT_PATH ${wsjcpp_SOURCE_DIR})
+set(EXECUTABLE_OUTPUT_PATH ${unit-tests_SOURCE_DIR})
+
+set (WSJCPP_LIBRARIES "")
+set (WSJCPP_INCLUDE_DIRS "")
+set (WSJCPP_SOURCES "")
 
 # Sources
 
+# wsjcpp-logger
+list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp-logger/fallen.cpp")
+list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp-logger/fallen.h")
+list (APPEND WSJCPP_INCLUDE_DIRS "../src.wsjcpp/wsjcpp-logger/")
+
+# wsjcpp-yaml
+list (APPEND WSJCPP_SOURCES "../src/wsjcpp_yaml.h")
+list (APPEND WSJCPP_SOURCES "../src/wsjcpp_yaml.cpp")
+
 # include header dirs
 list (APPEND WSJCPP_INCLUDE_DIRS "../src")
 list (APPEND WSJCPP_INCLUDE_DIRS "src")
 
-list (APPEND WSJCPP_SOURCES "../src/wsjcpp_yaml.h")
-list (APPEND WSJCPP_SOURCES "../src/wsjcpp_yaml.cpp")
+
 list (APPEND WSJCPP_SOURCES "./src/unit_tests.h")
 list (APPEND WSJCPP_SOURCES "./src/unit_tests.cpp")
+list (APPEND WSJCPP_SOURCES "./src/unit_test_line_parser.h")
+list (APPEND WSJCPP_SOURCES "./src/unit_test_line_parser.cpp")
 list (APPEND WSJCPP_SOURCES "./src/main.cpp")
 
 include_directories(${WSJCPP_INCLUDE_DIRS})
 
-add_executable ("wsjcpp-yaml-tests" ${WSJCPP_SOURCES})
+add_executable ("unit-tests" ${WSJCPP_SOURCES})
 
-target_link_libraries("wsjcpp-yaml-tests" -lpthread ${WSJCPP_LIBRARIES} )
+target_link_libraries("unit-tests" -lpthread ${WSJCPP_LIBRARIES} )
 
 install(
     TARGETS
-        "wsjcpp-yaml-tests"
+        "unit-tests"
     RUNTIME DESTINATION
         /usr/bin
-)
+)