Fixed #8 added getHumanSizeBytes

Author: sea5kg

README.md

@@ -378,3 +378,17 @@ Simular a js function `decodeURIComponent`
 ```
 static std::string decodeUriComponent(const std::string& sValue);
 ```
+
+### getHumanSizeBytes
+
+Human size for sizes in bytes
+
+```
+std::string sResult = WsjcppCore::getHumanSizeBytes(12012);
+std::cout << "Size: " << sResult << std::endl;
+```
+
+Example output:
+```
+Size: 12K
+```

src.wsjcpp/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Automaticly generated by wsjcpp@v0.0.1
 cmake_minimum_required(VERSION 3.0)
 
-add_definitions(-DWSJCPP_VERSION="v0.0.8")
+add_definitions(-DWSJCPP_VERSION="v0.1.0")
 add_definitions(-DWSJCPP_NAME="wsjcpp-core")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

src/wsjcpp_core.cpp

@@ -609,6 +609,31 @@ std::string WsjcppCore::decodeUriComponent(const std::string& sValue) {
     return sRet;
 }
 
+// ---------------------------------------------------------------------
+
+std::string WsjcppCore::getHumanSizeBytes(long nBytes) {
+    if (nValue == 0) {
+        return "0B";
+    }
+    std::string arrPrefix[] = {"B", "KB", "MB", "GB", "TB", "PB"};
+    long n0 = nValue;
+    long n1 = 0;
+    for (int i = 0; i < 6; i++) {
+        if (n0 >= 1 && n0 < 1000) {
+            return std::to_string(n0) + arrPrefix[i];
+        }        
+        n0 = nValue / 1000;
+        n1 = nValue - n0 * 1000;
+        n0 += n1 >= 500 ? 1 : 0;
+
+        nValue = nValue / 1000;
+        if (n0 == 0 && n1 == 0) {
+            return "fuck"; 
+        }
+    }
+    return std::to_string(nValue) + "PB";
+}
+
 // ---------------------------------------------------------------------
 // WsjcppLog
 

src/wsjcpp_core.h

@@ -63,7 +63,7 @@ class WsjcppCore {
         static std::string encodeUriComponent(const std::string& sValue);
         static std::string decodeUriComponent(const std::string& sValue);
 
-        
+        static std::string getHumanSizeBytes(long nBytes);
 };
 
 

src/wsjcpp_unit_tests.cpp

@@ -55,12 +55,12 @@ void WsjcppUnitTestBase::compareB(bool &bTestSuccess, const std::string &sPoint,
 
 // ---------------------------------------------------------------------
 
-std::vector<WsjcppUnitTestBase*> *g_pUnitTests = NULL;
+std::vector<WsjcppUnitTestBase*> *g_pWsjcppUnitTests = nullptr;
 
 void WsjcppUnitTests::initGlobalVariables() {
-    if (g_pUnitTests == NULL) {
+    if (g_pWsjcppUnitTests == nullptr) {
         // WsjcppLog::info(std::string(), "Create handlers map");
-        g_pUnitTests = new std::vector<WsjcppUnitTestBase*>();
+        g_pWsjcppUnitTests = new std::vector<WsjcppUnitTestBase*>();
     }
 }
 
@@ -69,8 +69,8 @@ void WsjcppUnitTests::initGlobalVariables() {
 void WsjcppUnitTests::addUnitTest(const std::string &sTestName, WsjcppUnitTestBase* pUnitTest) {
     WsjcppUnitTests::initGlobalVariables();
     bool bFound = false;
-    for (int i = 0; i < g_pUnitTests->size(); i++) {
-        WsjcppUnitTestBase* p = g_pUnitTests->at(i);
+    for (int i = 0; i < g_pWsjcppUnitTests->size(); i++) {
+        WsjcppUnitTestBase* p = g_pWsjcppUnitTests->at(i);
         if (p->name() == sTestName) {
             bFound = true;
         }
@@ -79,31 +79,9 @@ void WsjcppUnitTests::addUnitTest(const std::string &sTestName, WsjcppUnitTestBa
     if (bFound) {
         WsjcppLog::err(sTestName, "Already registered");
     } else {
-        g_pUnitTests->push_back(pUnitTest);
+        g_pWsjcppUnitTests->push_back(pUnitTest);
         // Log::info(sCmd, "Registered");
     }
 }
 
-// ---------------------------------------------------------------------
-
-bool WsjcppUnitTests::runUnitTests() {
-    WsjcppUnitTests::initGlobalVariables();
-    int nAll = g_pUnitTests->size();
-    WsjcppLog::info("runUnitTests",  "All tests count " + std::to_string(nAll));
-    int nSuccess = 0;
-    for (int i = 0; i < g_pUnitTests->size(); i++) {
-        WsjcppUnitTestBase* pUnitTest = g_pUnitTests->at(i);
-        std::string sTestName = pUnitTest->name();
-        WsjcppLog::info("runUnitTests",  "Run test " + sTestName);
-        if (pUnitTest->run()) {
-            WsjcppLog::ok(sTestName,  "Test passed");
-            nSuccess++;
-        } else {
-            WsjcppLog::err(sTestName,  "Test failed");
-        }
-    }
-    WsjcppLog::info("WsjcppUnitTests::runUnitTests",  "Passed tests " + std::to_string(nSuccess) + " / " + std::to_string(nAll));
-    return nSuccess == nAll;
-}
-
 // ---------------------------------------------------------------------

src/wsjcpp_unit_tests.h

@@ -23,13 +23,12 @@ class WsjcppUnitTestBase {
         std::string m_sTestName;
 };
 
-extern std::vector<WsjcppUnitTestBase*> *g_pUnitTests;
+extern std::vector<WsjcppUnitTestBase*> *g_pWsjcppUnitTests;
 
 class WsjcppUnitTests {
     public:
         static void initGlobalVariables();
-        static void addUnitTest(const std::string &sTestName, WsjcppUnitTestBase* pCmdHandler);
-        static bool runUnitTests();
+        static void addUnitTest(const std::string &sTestName, WsjcppUnitTestBase* pUnitTest);
 };
 
 // RegistryCmdHandler

src/wsjcpp_unit_tests_main.cpp

@@ -2,6 +2,17 @@
 #include <wsjcpp_core.h>
 #include <wsjcpp_unit_tests.h>
 
+void printHelp(const std::string &sProgramName) {
+    std::string sOutput = "\nHelp:\n";
+    sOutput += 
+        " '" + sProgramName + "' - run all unit-tests\n"
+        " '" + sProgramName + " help' - print this help\n"
+        " '" + sProgramName + " list' - print list of unit-tests\n"
+        " '" + sProgramName + " run <TestName>' - run single unit-test\n"
+    ;
+    WsjcppLog::info("UnitTests", sOutput);
+}
+
 int main(int argc, char** argv) {
     WsjcppCore::initRandom();
     std::string TAG = "UnitTests";
@@ -16,9 +27,68 @@ int main(int argc, char** argv) {
         return -1;
     }
 
-    if (!WsjcppUnitTests::runUnitTests()) {
-        WsjcppLog::err(TAG, "Some unit tests failed");
+    WsjcppUnitTests::initGlobalVariables();
+    std::string sProgramName(argv[0]);
+
+    if (argc == 1) {
+        int nAll = g_pWsjcppUnitTests->size();
+        WsjcppLog::info("runUnitTests",  "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);
+            if (pUnitTest->run()) {
+                WsjcppLog::ok(sTestName,  "Test passed");
+                nSuccess++;
+            } else {
+                WsjcppLog::err(sTestName,  "Test failed");
+            }
+        }
+        WsjcppLog::info(TAG,  "Passed tests " + std::to_string(nSuccess) + " / " + std::to_string(nAll));
+        bool bResult = nSuccess == nAll;
+        return bResult ? 0 : -1;
+    } else if (argc == 2) {
+        std::string sArg2(argv[1]);
+        if (sArg2 == "list") {
+            std::string sOutput = "\nList of unit-tests:\n";
+            for (int i = 0; i < g_pWsjcppUnitTests->size(); i++) {
+                WsjcppUnitTestBase* pUnitTest = g_pWsjcppUnitTests->at(i);
+                sOutput += "  - " + pUnitTest->name() + "\n";
+            }
+            WsjcppLog::info(TAG,  sOutput);
+            return -1;
+        } else if (sArg2 == "help") {
+            printHelp(sProgramName);
+            return -1;
+        }
+    } else if (argc == 3) {
+        std::string sArg2(argv[1]);
+        std::string sArg3(argv[2]);
+        if (sArg2 == "run") {
+            int nSuccess = 0;
+            bool bTestFound = false;
+            for (int i = 0; i < g_pWsjcppUnitTests->size(); i++) {
+                WsjcppUnitTestBase* pUnitTest = g_pWsjcppUnitTests->at(i);
+                if (pUnitTest->name() == sArg3) {
+                    bTestFound = true;
+                    if (pUnitTest->run()) {
+                        WsjcppLog::ok(TAG, pUnitTest->name() + " Test passed");
+                        nSuccess++;
+                    } else {
+                        WsjcppLog::err(TAG,  pUnitTest->name() + " Test failed");
+                    }
+                }
+            }
+            if (!bTestFound) {
+                WsjcppLog::err(TAG,  "Test not found try help");
+            }
+            return -1;
+        }
+        printHelp(sProgramName);
         return -1;
     }
+
+    printHelp(sProgramName);
     return 0;
 }

unit-tests.wsjcpp/CMakeLists.txt

@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(unit-tests C CXX)
-add_definitions(-DWSJCPP_VERSION="ut-v0.0.8")
+add_definitions(-DWSJCPP_VERSION="ut-v0.1.0")
 add_definitions(-DWSJCPP_NAME="unit-tests-wsjcpp-core")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -19,7 +19,7 @@ set (WSJCPP_SOURCES "")
 find_package(Threads REQUIRED)
 list (APPEND WSJCPP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 
-# wsjcpp-core:v0.0.8
+# wsjcpp-core:v0.1.0
 list (APPEND WSJCPP_INCLUDE_DIRS "../src")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_core.cpp")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_core.h")
@@ -59,6 +59,8 @@ list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_read_file_to_buf
 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")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_get_human_size_bytes.h")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_get_human_size_bytes.cpp")
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.user-custom.txt)
 

unit-tests.wsjcpp/src/unit_test_get_human_size_bytes.cpp

@@ -0,0 +1,64 @@
+#include "unit_test_get_human_size_bytes.h"
+#include <vector>
+#include <wsjcpp_core.h>
+
+REGISTRY_UNIT_TEST(UnitTestgetHumanSizeBytes)
+
+UnitTestgetHumanSizeBytes::UnitTestgetHumanSizeBytes()
+    : WsjcppUnitTestBase("UnitTestgetHumanSizeBytes") {
+}
+
+// ---------------------------------------------------------------------
+
+void UnitTestgetHumanSizeBytes::init() {
+    // nothing
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestgetHumanSizeBytes::run() {
+    bool bTestSuccess = true;
+
+    struct LTest {
+        LTest(
+            long nValue,
+            const std::string &sExpectedStr
+        ) {
+            this->nValue = nValue;
+            this->sExpectedStr = sExpectedStr;
+        };
+        long nValue;
+        std::string sExpectedStr;
+    };
+    std::vector<LTest> tests;
+    tests.push_back(LTest(0, "0B"));
+    tests.push_back(LTest(30, "30B"));
+    tests.push_back(LTest(999, "999B"));
+    tests.push_back(LTest(1000, "1KB"));
+    tests.push_back(LTest(1400, "1KB"));
+    tests.push_back(LTest(1600, "2KB"));
+    tests.push_back(LTest(100600, "101KB"));
+    tests.push_back(LTest(10123, "10KB"));
+    tests.push_back(LTest(10499, "10KB"));
+    tests.push_back(LTest(10999, "11KB"));
+    tests.push_back(LTest(100999, "101KB"));
+    tests.push_back(LTest(1000999, "1MB"));
+    tests.push_back(LTest(1001999, "1MB"));
+    tests.push_back(LTest(1999999, "2MB"));
+    tests.push_back(LTest(1401999, "1MB"));
+    tests.push_back(LTest(1501999, "2MB"));
+    tests.push_back(LTest(201001999, "201MB"));
+    tests.push_back(LTest(2000501999, "2GB"));
+    tests.push_back(LTest(2300501999, "2GB"));
+    tests.push_back(LTest(2500501999, "3GB"));
+
+    for (int i = 0; i < tests.size(); i++) {
+        long nValue = tests[i].nValue;
+        std::string sExpectedStr = tests[i].sExpectedStr;
+        std::string sGotStr = WsjcppCore::getHumanSizeBytes(nValue);
+        compareS(bTestSuccess, "value=" + std::to_string(nValue), sGotStr, sExpectedStr);
+    }
+    
+    return bTestSuccess;
+}
+

unit-tests.wsjcpp/src/unit_test_get_human_size_bytes.h

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