Removed duplicate unit-tests CoreUuid

Author: sea5kg

src/wsjcpp_core.cpp

@@ -32,8 +32,8 @@ bool WsjcppCore::init(
     const std::string &sLibraryNameForExports
 ) {
     // init random
-    std::srand(std::rand() + std::time(0));
-    // WsjcppCore::initRandom();
+    // std::srand(std::time(0));
+    WsjcppCore::initRandom();
     return true;
 }
 
@@ -498,18 +498,17 @@ std::string WsjcppCore::join(const std::vector<std::string> &vWhat, const std::s
 // ---------------------------------------------------------------------
 
 void WsjcppCore::initRandom() {
-    std::srand(std::rand() + std::time(0));
+    std::srand(std::time(0));
 }
 
 // ---------------------------------------------------------------------
 
 std::string WsjcppCore::createUuid() {
     std::string sRet = "00000000-0000-0000-0000-000000000000";
     const std::string sAlphabet = "0123456789abcdef";
-    // unsigned t = std::time(0);
     for (int i = 0; i < 36; i++) {
         if (i != 8 && i != 13 && i != 18 && i != 23) {
-            sRet[i] = sAlphabet[std::rand() % sAlphabet.length()];
+            sRet[i] = sAlphabet[rand() % sAlphabet.length()];
         }
     }
     return sRet;

src/wsjcpp_unit_tests_main.cpp

@@ -32,12 +32,12 @@ int main(int argc, char** argv) {
 
     if (argc == 1) {
         int nAll = g_pWsjcppUnitTests->size();
-        WsjcppLog::info("runUnitTests",  "All tests count " + std::to_string(nAll));
+        WsjcppLog::info(TAG,  "All tests count " + std::to_string(nAll));
         int nSuccess = 0;
         for (int i = 0; i < g_pWsjcppUnitTests->size(); i++) {
             WsjcppUnitTestBase* pUnitTest = g_pWsjcppUnitTests->at(i);
             std::string sTestName = pUnitTest->name();
-            WsjcppLog::info("runUnitTests",  "Run test " + sTestName);
+            WsjcppLog::info(TAG,  "Run test " + sTestName);
             if (pUnitTest->run()) {
                 WsjcppLog::ok(sTestName,  "Test passed");
                 nSuccess++;
@@ -72,7 +72,9 @@ int main(int argc, char** argv) {
                 WsjcppUnitTestBase* pUnitTest = g_pWsjcppUnitTests->at(i);
                 if (pUnitTest->name() == sArg3) {
                     bTestFound = true;
-                    if (pUnitTest->run()) {
+                    WsjcppLog::info(TAG, "Run test " + pUnitTest->name());
+                    bool bResult = pUnitTest->run();
+                    if (bResult) {
                         WsjcppLog::ok(TAG, pUnitTest->name() + " Test passed");
                         nSuccess++;
                     } else {

unit-tests.wsjcpp/CMakeLists.txt

@@ -33,8 +33,6 @@ list (APPEND WSJCPP_SOURCES "../src/wsjcpp_resources_manager.cpp")
 list (APPEND WSJCPP_INCLUDE_DIRS "src")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_core_normalize_path.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_core_normalize_path.cpp")
-list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_core_uuid.h")
-list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_core_uuid.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_core_extract_filename.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_core_extract_filename.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_to_upper.h")

unit-tests.wsjcpp/src/unit_test_core_uuid.cpp

@@ -22,15 +22,17 @@ bool UnitTestCreateUuid::run() {
     for (int i = 0; i < 100; i++) {
         std::string sUuid = WsjcppCore::createUuid();
         // if (i < 3) {
-        //    WsjcppLog::info(TAG, "sUuid: " + sUuid);
+        //     WsjcppLog::info(TAG, "sUuid: " + sUuid);
         // }
         vUuids.push_back(sUuid);
     }
     for (int x = 0; x < 100; x++) {
         for (int y = 0; y < 100; y++) {
-            if (vUuids[x] == vUuids[y] && x != y) {
-                bTestSuccess = false;
-                WsjcppLog::err(TAG, "Wrong generation random uuids: \nvUuids[" + std::to_string(x)+ "] == vUuids[" + std::to_string(y) + "] == '" + vUuids[x] + "'");
+            if (x != y) {
+                if (vUuids[x] == vUuids[y]) {
+                    bTestSuccess = false;
+                    WsjcppLog::err(TAG, "Wrong generation random uuids: \nvUuids[" + std::to_string(x)+ "] == vUuids[" + std::to_string(y) + "] == '" + vUuids[x] + "'");
+                }
             }
         } 
     }

unit-tests.wsjcpp/src/unit_test_core_uuid.h

@@ -47,8 +47,6 @@ unit-tests:
   cases:
     - name: CoreNormalizePath
       description: Check function normalizePath
-    - name: CoreUuid
-      description: Check test generate uuid function
     - name: CoreExtractFilename
       description: Check function extract filenane from path
     - name: "ToUpper"