redesign search path to test data

Author: sea5kg

src/main.cpp

@@ -34,8 +34,6 @@ Official Source Code: https://github.com/wsjcpp/wsjcpp-yaml
 #include "examples.h"
 #include "wsjcpp_yaml.h"
 
-// #include "wsjcpp_core.h"
-
 class MyLogger : public IWsjcppYamlLog {
     public:
         // IWsjcppYamlLog
@@ -76,19 +74,11 @@ int _tmain(int argc, _TCHAR* argv[]) {
 int main(int argc, char* argv[]) {
 #endif
     std::string TAG = "MAIN";
-    // WsjcppCore::initRandom();
-    // std::string appName = std::string(WSJCPP_APP_NAME);
-    // std::string appVersion = std::string(WSJCPP_APP_VERSION);
-    // std::string appLogPath = ".wsjcpp-yaml-logs";
-    // WsjcppLog::setLogDirectory(appLogPath);
-    // if (!WsjcppCore::dirExists(appLogPath)) {
-    //     WsjcppCore::makeDir(appLogPath);
-    // }
     MyLogger *pLogger = new MyLogger();
 
     WsjcppYaml yaml;
     yaml.setLogger(pLogger);
-    std::string sError; 
+    std::string sError;
     std::string sFilePath = "./unit-tests.wsjcpp/data-tests/read-file/example-voiting-app/docker-compose.yml";
     std::cout << "Reading file " << sFilePath << "..." << std::endl;
     if (!yaml.loadFromFile(sFilePath, sError)) {
@@ -97,7 +87,7 @@ int main(int argc, char* argv[]) {
         return -1;
     }
     std::cout << "Done." << std::endl;
-    
+
     std::cout << "Saving to file " << sFilePath << "..." << std::endl;
     if (!yaml.saveToFile(sFilePath, sError)) {
         std::cerr << "Could not save data to file: " << sFilePath.c_str() << std::endl << "Error: " << sError.c_str() << std::endl;

src/tests/helpers.h

@@ -0,0 +1,62 @@
+
+/*
+MIT License
+
+Copyright (c) 2019-2025 wsjcpp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Official Source Code: https://github.com/wsjcpp/wsjcpp-yaml
+*/
+
+#pragma once
+
+#include <string>
+#include <fstream>
+
+#if defined(_WIN32)
+#include <direct.h>
+#define GetCurrentDir _getcwd
+#else
+#include <unistd.h>
+#define GetCurrentDir getcwd
+#endif
+
+static std::string find_test_data_file(const std::string &sFilePath) {
+    char buff[FILENAME_MAX];
+    char *path = GetCurrentDir(buff, FILENAME_MAX);
+    if (path == NULL) {
+        std::cerr << "ERROR: Could not get current directory path" << std::endl;
+        return "did_not_found_file: " + sFilePath;
+    }
+    std::cout << "Current path: " << buff << std::endl;
+
+    std::string sRet = "../../src/tests/" + sFilePath;
+
+    // find path
+    for (int i = 0; i < 5; i++) {
+        std::ifstream file_(sRet.c_str());
+        if (!file_) {
+            sRet = "../" + sRet;
+        } else {
+            return sRet;
+        }
+    }
+    return sFilePath;
+}

src/tests/test_double_value.cpp

@@ -29,27 +29,11 @@ Official Source Code: https://github.com/wsjcpp/wsjcpp-yaml
 #include <cmath>
 #include <fstream>
 #include <wsjcpp_yaml.h>
-
-#if defined(_WIN32)
-#include <direct.h>
-#define GetCurrentDir _getcwd
-#else
-#include <unistd.h>
-#define GetCurrentDir getcwd
-#endif
+#include "helpers.h"
 
 int main() {
-    char buff[FILENAME_MAX];
-    GetCurrentDir(buff, FILENAME_MAX );
-    std::cout << "Current path: " << buff << std::endl;
-    std::string sFilepath = "../../../src/tests/data/float-double/example.yml";
-    // find path
-    {
-        std::ifstream file_(sFilepath.c_str());
-        if (!file_) {
-            sFilepath = "../" + sFilepath;
-        }
-    }
+    std::string sFilepath = find_test_data_file("data/float-double/example.yml");
+
     WsjcppYaml yaml;
     std::string sError;
     if (!yaml.loadFromFile(sFilepath, sError)) {
@@ -108,4 +92,4 @@ int main() {
     // compareD("has double value is 1.0003 (double 2)", yaml["double"].valDouble(), 1.0003f);
 
     return ret;
-}
+}

src/tests/test_float_value.cpp

@@ -29,27 +29,10 @@ Official Source Code: https://github.com/wsjcpp/wsjcpp-yaml
 #include <cmath>
 #include <fstream>
 #include <wsjcpp_yaml.h>
-
-#if defined(_WIN32)
-#include <direct.h>
-#define GetCurrentDir _getcwd
-#else
-#include <unistd.h>
-#define GetCurrentDir getcwd
-#endif
+#include "helpers.h"
 
 int main() {
-    char buff[FILENAME_MAX];
-    GetCurrentDir(buff, FILENAME_MAX);
-    std::cout << "Current path: " << buff << std::endl;
-    std::string sFilepath = "../../../src/tests/data/float-double/example.yml";
-    // find path
-    {
-        std::ifstream file_(sFilepath.c_str());
-        if (!file_) {
-            sFilepath = "../" + sFilepath;
-        }
-    }
+    std::string sFilepath = find_test_data_file("data/float-double/example.yml");
 
     WsjcppYaml yaml;
     std::string sError;
@@ -85,4 +68,4 @@ int main() {
     }
 
     return ret;
-}
+}

src/tests/test_memory_leaks_linux.cpp

@@ -25,8 +25,8 @@ Official Source Code: https://github.com/wsjcpp/wsjcpp-yaml
 */
 
 #include <iostream>
-#include <fstream>
 #include <wsjcpp_yaml.h>
+#include "helpers.h"
 
 #if defined(_WIN32)
 int main() {
@@ -39,14 +39,7 @@ int main() {
 #include "process_mem_usage.h"
 
 int createManyTimesObjects() {
-    std::string sFilepath = "../../../src/tests/data/for-memory-leak/some.yml";
-    // find path
-    {
-        std::ifstream file_(sFilepath.c_str());
-        if (!file_) {
-            sFilepath = "../" + sFilepath;
-        }
-    }
+    std::string sFilepath = find_test_data_file("data/for-memory-leak/some.yml");
 
     std::string sError;
     for (int i = 0; i < 10000; i++) {

src/tests/test_read_write_file.cpp

@@ -28,25 +28,12 @@ Official Source Code: https://github.com/wsjcpp/wsjcpp-yaml
 #include <sstream>
 #include <fstream>
 #include <wsjcpp_yaml.h>
+#include "helpers.h"
 
 int main() {
-    std::string sFilepath = "../../../src/tests/data/read-write-file/docker-compose.yml";
-    // find path
-    {
-        std::ifstream file_(sFilepath.c_str());
-        if (!file_) {
-            sFilepath = "../" + sFilepath;
-        }
-    }
 
-    std::string sFilepathOutput = "../../../src/tests/data/read-write-file/docker-compose.output.yml";
-    // find path
-    {
-        std::ifstream file_(sFilepathOutput.c_str());
-        if (!file_) {
-            sFilepathOutput = "../" + sFilepathOutput;
-        }
-    }
+    std::string sFilepath = find_test_data_file("data/read-write-file/docker-compose.yml");
+    std::string sFilepathOutput = find_test_data_file("data/read-write-file/docker-compose.output.yml");
 
     WsjcppYaml yaml;
     std::string sError;
@@ -116,4 +103,4 @@ int main() {
     }
 
     return ret;
-}
+}

src/tests/test_read_yaml.cpp

@@ -25,10 +25,11 @@ Official Source Code: https://github.com/wsjcpp/wsjcpp-yaml
 */
 
 #include <wsjcpp_yaml.h>
+#include "helpers.h"
 
 int main() {
     WsjcppYaml yaml;
-    std::string sFilepath = "../../../../src/tests/data/read-file/example-voiting-app/docker-compose.yml";
+    std::string sFilepath = find_test_data_file("data/read-file/example-voiting-app/docker-compose.yml");
     std::string sError;
     if (!yaml.loadFromFile(sFilepath, sError)) {
         std::cerr << "Error parsing: " << sError << std::endl;

src/tests/test_remove_element_from_array.cpp

@@ -25,18 +25,11 @@ Official Source Code: https://github.com/wsjcpp/wsjcpp-yaml
 */
 
 #include <iostream>
-#include <fstream>
 #include <wsjcpp_yaml.h>
+#include "helpers.h"
 
 int main() {
-    std::string sFilepath = "../../../src/tests/data/remove-element-from-array.yml";
-    // find path
-    {
-        std::ifstream file_(sFilepath.c_str());
-        if (!file_) {
-            sFilepath = "../" + sFilepath;
-        }
-    }
+    std::string sFilepath = find_test_data_file("data/remove-element-from-array.yml");
 
     WsjcppYaml yaml;
     std::string sError;
@@ -96,4 +89,4 @@ int main() {
     }
 
     return ret;
-}
+}