Added WSJCppCore::extractFilename

Author: sea5kg

src/wsjcpp_core.cpp

@@ -96,6 +96,34 @@ std::string WSJCppCore::doNormalizePath(const std::string & sPath) {
 
 // ---------------------------------------------------------------------
 
+std::string WSJCppCore::extractFilename(const std::string &sPath) {
+    // split path by /
+    std::vector<std::string> vNames;
+    std::string s = "";
+    int nStrLen = sPath.length();
+    for (int i = 0; i < sPath.length(); i++) {
+        if (sPath[i] == '/') {
+            vNames.push_back(s);
+            s = "";
+            if (i == nStrLen-1) {
+                vNames.push_back("");
+            }
+        } else {
+            s += sPath[i];
+        }
+    }
+    if (s != "") {
+         vNames.push_back(s);
+    }
+    std::string sRet;
+    if (vNames.size() > 0) {
+        sRet = vNames[vNames.size()-1];
+    }
+    return sRet;
+}
+
+// ---------------------------------------------------------------------
+
 std::string WSJCppCore::getCurrentDirectory() {
     char cwd[PATH_MAX];
     if (getcwd(cwd, sizeof(cwd)) == NULL) {
@@ -492,3 +520,4 @@ void WSJCppLog::add(WSJCppColorModifier &clr, const std::string &sType, const st
     logFile << sLogMessage << std::endl;
     logFile.close();
 }
+

src/wsjcpp_core.h

@@ -18,7 +18,8 @@ class WSJCppCore {
             const std::string &sLibraryNameForExports
         );
 
-        static std::string doNormalizePath(const std::string & sPath);
+        static std::string doNormalizePath(const std::string &sPath);
+        static std::string extractFilename(const std::string &sPath);
         static std::string getCurrentDirectory();
 
         static long currentTime_milliseconds();
@@ -95,11 +96,11 @@ class WSJCppLog {
         static void ok(const std::string &sTag, const std::string &sMessage);
         static void setLogDirectory(const std::string &sDirectoryPath);
         static void setPrefixLogFile(const std::string &sPrefixLogFile);
-        // static nlohmann::json getLastLogs();
         static void initGlobalVariables();
 
     private:
         static void add(WSJCppColorModifier &clr, const std::string &sType, const std::string &sTag, const std::string &sMessage);
 };
 
 #endif // WSJCPP_CORE_H
+

unit-tests/CMakeLists.txt

@@ -23,11 +23,14 @@ list (APPEND WSJCPP_INCLUDE_DIRS "src")
 list (APPEND WSJCPP_SOURCES "./src/main.cpp")
 list (APPEND WSJCPP_SOURCES "./src/unit_tests.h")
 list (APPEND WSJCPP_SOURCES "./src/unit_tests.cpp")
+list (APPEND WSJCPP_SOURCES "./src/unit_test_core_extract_filename.h")
+list (APPEND WSJCPP_SOURCES "./src/unit_test_core_extract_filename.cpp")
 list (APPEND WSJCPP_SOURCES "./src/unit_test_core_normalize_path.h")
 list (APPEND WSJCPP_SOURCES "./src/unit_test_core_normalize_path.cpp")
 list (APPEND WSJCPP_SOURCES "./src/unit_test_core_uuid.h")
 list (APPEND WSJCPP_SOURCES "./src/unit_test_core_uuid.cpp")
 
+
 include_directories(${WSJCPP_INCLUDE_DIRS})
 
 add_executable ("unit-tests" ${WSJCPP_SOURCES})

unit-tests/src/unit_test_core_extract_filename.cpp

@@ -0,0 +1,51 @@
+#include "unit_test_core_extract_filename.h"
+#include <vector>
+#include <iostream>
+#include <wsjcpp_core.h>
+
+REGISTRY_UNIT_TEST(UnitTestCoreExtractFilename)
+
+UnitTestCoreExtractFilename::UnitTestCoreExtractFilename()
+    : UnitTestBase("UnitTestCoreExtractFilename") {
+    //
+}
+
+// ---------------------------------------------------------------------
+
+void UnitTestCoreExtractFilename::init() {
+    // nothing
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestCoreExtractFilename::run() {
+    std::map<std::string, std::string> mapPaths;
+    mapPaths.insert(std::pair<std::string, std::string>("",""));
+    mapPaths.insert(std::pair<std::string, std::string>("/usr/local/bin/some","some"));
+    mapPaths.insert(std::pair<std::string, std::string>("./bin/some","some"));
+    mapPaths.insert(std::pair<std::string, std::string>(".//../bin/some","some"));
+    mapPaths.insert(std::pair<std::string, std::string>(".//../bin/some/../",""));
+    mapPaths.insert(std::pair<std::string, std::string>(".//../bin/some/..",".."));
+    mapPaths.insert(std::pair<std::string, std::string>("/usr/local/./bin/some","some"));
+    mapPaths.insert(std::pair<std::string, std::string>("/usr/local/../bin/some","some"));
+    mapPaths.insert(std::pair<std::string, std::string>("/usr/local/..//bin/some","some"));
+    mapPaths.insert(std::pair<std::string, std::string>("/usr/local/..//bin/some/.","."));
+    mapPaths.insert(std::pair<std::string, std::string>("/usr/local/..//bin/./some/",""));
+    mapPaths.insert(std::pair<std::string, std::string>("/usr/local/../../bin/./some/",""));
+    mapPaths.insert(std::pair<std::string, std::string>("/usr/local/../../../bin/./some/",""));
+    mapPaths.insert(std::pair<std::string, std::string>(".//",""));
+    std::map<std::string, std::string>::iterator it;
+
+    int nCounter = 0;
+    for ( it = mapPaths.begin(); it != mapPaths.end(); it++ ) {
+        std::string sSource = it->first;
+        std::string sExpected = it->second;
+        std::string sGot = WSJCppCore::extractFilename(sSource);
+        if (sGot != sExpected) {
+            nCounter++;
+            WSJCppLog::err(TAG, "Wrong extract filename for: '" + sSource + "'.\n\t Got: '" + sGot + "', but expected: '" + sExpected + "'");
+        }
+        
+    }
+    return nCounter == 0;
+}

unit-tests/src/unit_test_core_extract_filename.h

@@ -0,0 +1,13 @@
+#ifndef UNIT_TEST_CORE_EXCTRACT_FILENAME_H
+#define UNIT_TEST_CORE_EXCTRACT_FILENAME_H
+
+#include <unit_tests.h>
+
+class UnitTestCoreExtractFilename : public UnitTestBase {
+    public:
+        UnitTestCoreExtractFilename();
+        virtual void init();
+        virtual bool run();
+};
+
+#endif // UNIT_TEST_CORE_EXCTRACT_FILENAME_H