Added join #7

Author: sea5kg

src/wsjcpp_core.cpp

@@ -482,6 +482,19 @@ std::vector<std::string> WSJCppCore::split(const std::string& sWhat, const std::
 
 // ---------------------------------------------------------------------
 
+std::string WSJCppCore::join(const std::vector<std::string> &vWhat, const std::string& sDelim) {
+    std::string sRet;
+    for (int i = 0; i < vWhat.size(); i++) {
+        if (i != 0) {
+            sRet += sDelim;
+        }
+        sRet += vWhat[i];
+    }
+    return sRet;
+}
+
+// ---------------------------------------------------------------------
+
 void WSJCppCore::initRandom() {
     std::srand(std::rand() + std::time(0));
 }

src/wsjcpp_core.h

@@ -50,6 +50,7 @@ class WSJCppCore {
         static std::string toUpper(const std::string& str);
         static void replaceAll(std::string& str, const std::string& from, const std::string& to);
         static std::vector<std::string> split(const std::string& sWhat, const std::string& sDelim);
+        static std::string join(const std::vector<std::string> &vWhat, const std::string& sDelim);
 
         static void initRandom();
         static std::string createUuid();

unit-tests.wsjcpp/.gitignore

@@ -2,7 +2,6 @@ tmp/*
 logs/*
 unit-tests
 .wsjcpp/*
-data/empty.txt
 
 # Vim temp files
 *.swp

unit-tests.wsjcpp/CMakeLists.txt

@@ -57,6 +57,8 @@ list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_create_empty_fil
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_create_empty_file.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_read_file_to_buffer.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_read_file_to_buffer.cpp")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_join.h")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_join.cpp")
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.user-custom.txt)
 

unit-tests.wsjcpp/data/empty.txt

@@ -0,0 +1,30 @@
+#include "unit_test_join.h"
+#include <vector>
+#include <wsjcpp_core.h>
+
+REGISTRY_UNIT_TEST(UnitTestJoin)
+
+UnitTestJoin::UnitTestJoin()
+    : WSJCppUnitTestBase("UnitTestJoin") {
+}
+
+// ---------------------------------------------------------------------
+
+void UnitTestJoin::init() {
+    // nothing
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestJoin::run() {
+    bool bTestSuccess = true;
+    std::vector<std::string> vTest;
+    vTest.push_back("");
+    vTest.push_back("1");
+    vTest.push_back("2");
+    vTest.push_back("abc");
+    std::string sRet = WSJCppCore::join(vTest, ", ");
+    compareS(bTestSuccess, "join", sRet, ", 1, 2, abc");
+    return bTestSuccess;
+}
+

unit-tests.wsjcpp/src/unit_test_join.cpp

@@ -0,0 +1,15 @@
+#ifndef UNIT_TEST_JOIN_H
+#define UNIT_TEST_JOIN_H
+
+#include <wsjcpp_unit_tests.h>
+
+// Description: TODO
+class UnitTestJoin : public WSJCppUnitTestBase {
+    public:
+        UnitTestJoin();
+        virtual void init();
+        virtual bool run();
+};
+
+#endif // UNIT_TEST_JOIN_H
+

unit-tests.wsjcpp/src/unit_test_join.h

@@ -64,3 +64,5 @@ unit-tests:
       description: "Test create empty file"
     - name: "ReadFileToBuffer"
       description: "test for readFileToBuffer"
+    - name: "Join"
+      description: "Test join function"