Added unit-test for ListOfDirs

Author: sea5kg

src/wsjcpp_core.cpp

@@ -260,17 +260,20 @@ std::vector<std::string> WsjcppCore::listOfDirs(const std::string &sDirname) {
         return vDirs;
     }
     DIR *dir = opendir(sDirname.c_str());
-    struct dirent *entry = readdir(dir);
-    while (entry != NULL) {
-        if (entry->d_type == DT_DIR) {
-            std::string sDir(entry->d_name);
-            if (sDir != "." && sDir != "..") {
-                vDirs.push_back(sDir);
+    if (dir != NULL) {
+        struct dirent *entry = readdir(dir);
+        while (entry != NULL) {
+            if (entry->d_type == DT_DIR) {
+                std::string sDir(entry->d_name);
+                if (sDir != "." && sDir != "..") {
+                    vDirs.push_back(sDir);
+                }
             }
+            entry = readdir(dir);
         }
-        entry = readdir(dir);
+        closedir(dir);
     }
-    closedir(dir);
+    std::sort(vDirs.begin(), vDirs.end());
     return vDirs;
 }
 

unit-tests.wsjcpp/CMakeLists.txt

@@ -63,6 +63,8 @@ list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_get_human_size_b
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_get_human_size_bytes.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_test_resources.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_test_resources.cpp")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_list_of_dirs.h")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_list_of_dirs.cpp")
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.user-custom.txt)
 

unit-tests.wsjcpp/data/list_of_dirs/a1/.gitkeeper

@@ -0,0 +1,34 @@
+#include "unit_test_list_of_dirs.h"
+#include <vector>
+#include <wsjcpp_core.h>
+#include <algorithm>
+
+REGISTRY_WSJCPP_UNIT_TEST(UnitTestListOfDirs)
+
+UnitTestListOfDirs::UnitTestListOfDirs()
+    : WsjcppUnitTestBase("UnitTestListOfDirs") {
+}
+
+// ---------------------------------------------------------------------
+
+void UnitTestListOfDirs::init() {
+    // nothing
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestListOfDirs::run() {
+    bool bTestSuccess = true;
+    std::vector<std::string> vDirs = WsjcppCore::listOfDirs("./data/list_of_dirs");
+
+    compareN(bTestSuccess, "size", vDirs.size(), 4);
+    if (vDirs.size() == 4) {
+        compareS(bTestSuccess, "name of dir1", vDirs[0], "a1");
+        compareS(bTestSuccess, "name of dir2", vDirs[1], "b2");
+        compareS(bTestSuccess, "name of dir3", vDirs[2], "c3");
+        compareS(bTestSuccess, "name of dir4", vDirs[3], "d4");
+    }
+
+    return bTestSuccess;
+}
+

unit-tests.wsjcpp/data/list_of_dirs/b2/.gitkeeper

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

unit-tests.wsjcpp/data/list_of_dirs/c3/.gitkeeper

@@ -77,3 +77,5 @@ unit-tests:
       description: "Test function get human size in bytes"
     - name: "TestResources"
       description: "Test basic resources"
+    - name: "ListOfDirs"
+      description: "Check list of directories"