Removed methos compareS / compare N / compareB from unit-tests

sea5kg · sea5kg · commit 8291cd3457e8 · 2020-09-18T23:18:36.000+07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,8 +5,6 @@ project(wsjcpp-core)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src.wsjcpp/CMakeLists.txt)
 
 #### BEGIN_WSJCPP_APPEND
-list (APPEND WSJCPP_SOURCES "./src/some.h")
-list (APPEND WSJCPP_SOURCES "./src/some.cpp")
 #### END_WSJCPP_APPEND
 
 set(CMAKE_CXX_STANDARD 11)
diff --git a/src/wsjcpp_unit_tests.cpp b/src/wsjcpp_unit_tests.cpp
@@ -63,27 +63,6 @@ bool WsjcppUnitTestBase::runTest() {
 
 // ---------------------------------------------------------------------
 
-bool WsjcppUnitTestBase::compareS(const std::string &sMark,
-    const std::string &sValue, const std::string &sExpected) {
-    if (sValue != sExpected) {
-        fail(" {" + sMark + "} Expected '" + sExpected + "', but got '" + sValue + "'");
-        return false;
-    }
-    return true;
-}
-
-// ---------------------------------------------------------------------
-
-bool WsjcppUnitTestBase::compareN(const std::string &sMark, int nValue, int nExpected) {
-    if (nValue != nExpected) {
-        fail(" {" + sMark + "} Expected '" + std::to_string(nExpected) + "', but got '" + std::to_string(nValue) + "'");
-        return false;
-    }
-    return true;
-}
-
-// ---------------------------------------------------------------------
-
 bool WsjcppUnitTestBase::compareD(const std::string &sMark, double nValue, double nExpected) {
     if (abs(nValue - nExpected) > std::numeric_limits<double>::epsilon()) {
         fail(" {" + sMark + "} Expected '" + std::to_string(nExpected) + "', but got '" + std::to_string(nValue) + "'");
@@ -94,16 +73,6 @@ bool WsjcppUnitTestBase::compareD(const std::string &sMark, double nValue, doubl
 
 // ---------------------------------------------------------------------
 
-bool WsjcppUnitTestBase::compareB(const std::string &sMark, bool bValue, bool bExpected) {
-    if (bValue != bExpected) {
-        fail(" {" + sMark + "} Expected '" + (bExpected ? "true" : "false") + "', but got '" + (bValue ? "true" : "false") + "'");
-        return false;
-    }
-    return true;
-}
-
-// ---------------------------------------------------------------------
-
 std::vector<WsjcppUnitTestBase*> *g_pWsjcppUnitTests = nullptr;
 
 void WsjcppUnitTests::initGlobalVariables() {
diff --git a/src/wsjcpp_unit_tests.h b/src/wsjcpp_unit_tests.h
@@ -17,11 +17,8 @@ class WsjcppUnitTestBase {
         virtual bool doAfterTest() = 0;
     protected:
         std::string TAG;
-
-        bool compareS(const std::string &sMark, const std::string &sValue, const std::string &sExpected);
-        bool compareN(const std::string &sMark, int nValue, int nExpected);
+        
         bool compareD(const std::string &sMark, double nValue, double nExpected);
-        bool compareB(const std::string &sMark, bool bValue, bool bExpected);
         template<typename T1, typename T2> bool compare(const std::string &sMark, T1 tGotValue, T2 tExpectedValue) {
             if (tGotValue != tExpectedValue) {
                 std::stringstream ss;
diff --git a/unit-tests.wsjcpp/src/unit_test_create_empty_file.cpp b/unit-tests.wsjcpp/src/unit_test_create_empty_file.cpp
@@ -18,15 +18,15 @@ bool UnitTestCreateEmptyFile::doBeforeTest() {
 // ---------------------------------------------------------------------
 
 void UnitTestCreateEmptyFile::executeTest() {
-    compareB("./data/", WsjcppCore::dirExists("./data/"), true);
+    compare("./data/", WsjcppCore::dirExists("./data/"), true);
     std::string sFilename = "./data/empty.txt";
     if (WsjcppCore::fileExists(sFilename)) {
         WsjcppCore::removeFile(sFilename);
     }
-    compareB("fileExists 1: " + sFilename, WsjcppCore::fileExists(sFilename), false);
-    compareB("createEmptyFile 1: " + sFilename, WsjcppCore::createEmptyFile(sFilename), true);
-    compareB("createEmptyFile 2: " + sFilename, WsjcppCore::createEmptyFile(sFilename), false);
-    compareB("fileExists 2: " + sFilename, WsjcppCore::fileExists(sFilename), true);
+    compare("fileExists 1: " + sFilename, WsjcppCore::fileExists(sFilename), false);
+    compare("createEmptyFile 1: " + sFilename, WsjcppCore::createEmptyFile(sFilename), true);
+    compare("createEmptyFile 2: " + sFilename, WsjcppCore::createEmptyFile(sFilename), false);
+    compare("fileExists 2: " + sFilename, WsjcppCore::fileExists(sFilename), true);
 }
 
 // ---------------------------------------------------------------------
diff --git a/unit-tests.wsjcpp/src/unit_test_decode_uri_component.cpp b/unit-tests.wsjcpp/src/unit_test_decode_uri_component.cpp
@@ -37,7 +37,7 @@ void UnitTestDecodeUriComponent::executeTest() {
     for (int i = 0; i < tests.size(); i++) {
         LTest test = tests[i];
         std::string sStr = WsjcppCore::decodeUriComponent(test.sStr);
-        compareS("test" + std::to_string(i), sStr, test.sExpectedStr);
+        compare("test" + std::to_string(i), sStr, test.sExpectedStr);
     }
 }
 
diff --git a/unit-tests.wsjcpp/src/unit_test_encode_uri_component.cpp b/unit-tests.wsjcpp/src/unit_test_encode_uri_component.cpp
@@ -37,7 +37,7 @@ void UnitTestEncodeUriComponent::executeTest() {
     for (int i = 0; i < tests.size(); i++) {
         LTest test = tests[i];
         std::string sStr = WsjcppCore::encodeUriComponent(test.sStr);
-        compareS("test" + std::to_string(i), sStr, test.sExpectedStr);
+        compare("test" + std::to_string(i), sStr, test.sExpectedStr);
     }
 }
 
diff --git a/unit-tests.wsjcpp/src/unit_test_get_env.cpp b/unit-tests.wsjcpp/src/unit_test_get_env.cpp
@@ -40,8 +40,8 @@ void UnitTestGetEnv::executeTest() {
         std::string sValue;
         bool bResult = WsjcppCore::getEnv(test.sName, sValue);
         std::string testBaseName = "test#" + std::to_string(i) + " (" + test.sName + ")";
-        compareB(testBaseName + "-result", bResult, test.bExpectedResult);
-        compareS(testBaseName + "-value", sValue, test.sExpectedValue);
+        compare(testBaseName + "-result", bResult, test.bExpectedResult);
+        compare(testBaseName + "-value", sValue, test.sExpectedValue);
     }
 }
 
diff --git a/unit-tests.wsjcpp/src/unit_test_get_human_size_bytes.cpp b/unit-tests.wsjcpp/src/unit_test_get_human_size_bytes.cpp
@@ -55,7 +55,7 @@ void UnitTestgetHumanSizeBytes::executeTest() {
         long nValue = tests[i].nValue;
         std::string sExpectedStr = tests[i].sExpectedStr;
         std::string sGotStr = WsjcppCore::getHumanSizeBytes(nValue);
-        compareS("value=" + std::to_string(nValue), sGotStr, sExpectedStr);
+        compare("value=" + std::to_string(nValue), sGotStr, sExpectedStr);
     }
 }
 
diff --git a/unit-tests.wsjcpp/src/unit_test_join.cpp b/unit-tests.wsjcpp/src/unit_test_join.cpp
@@ -24,7 +24,7 @@ void UnitTestJoin::executeTest() {
     vTest.push_back("2");
     vTest.push_back("abc");
     std::string sRet = WsjcppCore::join(vTest, ", ");
-    compareS("join", sRet, ", 1, 2, abc");
+    compare("join", sRet, ", 1, 2, abc");
 }
 
 // ---------------------------------------------------------------------
diff --git a/unit-tests.wsjcpp/src/unit_test_list_of_dirs.cpp b/unit-tests.wsjcpp/src/unit_test_list_of_dirs.cpp
@@ -21,12 +21,12 @@ bool UnitTestListOfDirs::doBeforeTest() {
 void UnitTestListOfDirs::executeTest() {
     std::vector<std::string> vDirs = WsjcppCore::getListOfDirs("./data/list_of_dirs");
 
-    compareN("size", vDirs.size(), 4);
+    compare("size", vDirs.size(), 4);
     if (vDirs.size() == 4) {
-        compareS("name of dir1", vDirs[0], "a1");
-        compareS("name of dir2", vDirs[1], "b2");
-        compareS("name of dir3", vDirs[2], "c3");
-        compareS("name of dir4", vDirs[3], "d4");
+        compare("name of dir1", vDirs[0], "a1");
+        compare("name of dir2", vDirs[1], "b2");
+        compare("name of dir3", vDirs[2], "c3");
+        compare("name of dir4", vDirs[3], "d4");
     }
 }
 
diff --git a/unit-tests.wsjcpp/src/unit_test_read_file_to_buffer.cpp b/unit-tests.wsjcpp/src/unit_test_read_file_to_buffer.cpp
@@ -23,12 +23,12 @@ void UnitTestReadFileToBuffer::executeTest() {
     char *pBuffer = nullptr;
     int nBufferSize = 0;
     WsjcppCore::readFileToBuffer("./data/readFileToBuffer.txt", &pBuffer, nBufferSize);
-    compareN("Size of readed", nBufferSize, sExpected.length());
+    compare("Size of readed", nBufferSize, sExpected.length());
     int nMin = std::min(nBufferSize, (int)sExpected.length());
     for (int i = 0; i < nMin; i++) {
         char c_got = pBuffer[i];
         char c_expected = sExpected[i];
-        compareN("Check the " + std::to_string(i), c_got, c_expected);
+        compare("Check the " + std::to_string(i), c_got, c_expected);
     }
 }
 
diff --git a/unit-tests.wsjcpp/src/unit_test_replace_all.cpp b/unit-tests.wsjcpp/src/unit_test_replace_all.cpp
@@ -43,7 +43,7 @@ void UnitTestReplaceAll::executeTest() {
         LTest test = tests[i];
         std::string sStr = test.sStr;
         WsjcppCore::replaceAll(sStr, test.sFrom, test.sTo);
-        compareS("test" + std::to_string(i), sStr, test.sExpectedStr);
+        compare("test" + std::to_string(i), sStr, test.sExpectedStr);
     }
 }
 
diff --git a/unit-tests.wsjcpp/src/unit_test_split.cpp b/unit-tests.wsjcpp/src/unit_test_split.cpp
@@ -45,10 +45,10 @@ void UnitTestSplit::executeTest() {
         LTest test = tests[i];
         std::string sPrefix = "test" + std::to_string(i) + "(\"" + test.sStr + "\")";
         std::vector<std::string> vSplitted = WsjcppCore::split(test.sStr, test.sDelim);
-        compareN(sPrefix + ": size", vSplitted.size(), test.vExpectedVector.size());
+        compare(sPrefix + ": size", vSplitted.size(), test.vExpectedVector.size());
         int nMin = std::min(vSplitted.size(), test.vExpectedVector.size());
         for (int n = 0; n < nMin; n++) {
-            compareS(sPrefix + ", element: " + std::to_string(n), vSplitted[n], test.vExpectedVector[n]);
+            compare(sPrefix + ", element: " + std::to_string(n), vSplitted[n], test.vExpectedVector[n]);
         }
     }
 }
diff --git a/unit-tests.wsjcpp/src/unit_test_test_resources.cpp b/unit-tests.wsjcpp/src/unit_test_test_resources.cpp
@@ -20,8 +20,8 @@ bool UnitTestTestResources::doBeforeTest() {
 void UnitTestTestResources::executeTest() {
     // std::vector<ResourceFile*> &list();
     WsjcppResourceFile* pFile = WsjcppResourcesManager::get("html/images/points.svg");
-    compareN("getBufferSize", pFile->getBufferSize(), 2979);
-    compareS("getFilename", pFile->getFilename(), "html/images/points.svg");
+    compare("getBufferSize", pFile->getBufferSize(), 2979);
+    compare("getFilename", pFile->getFilename(), "html/images/points.svg");
 }
 
 // ---------------------------------------------------------------------
diff --git a/unit-tests.wsjcpp/src/unit_test_to_lower.cpp b/unit-tests.wsjcpp/src/unit_test_to_lower.cpp
@@ -18,7 +18,7 @@ bool UnitTestToLower::doBeforeTest() {
 // ---------------------------------------------------------------------
 
 void UnitTestToLower::executeTest() {
-    compareS("str1", "abc_def", WsjcppCore::toLower("ABC_DEF"));
+    compare("str1", "abc_def", WsjcppCore::toLower("ABC_DEF"));
 }
 
 // ---------------------------------------------------------------------
diff --git a/unit-tests.wsjcpp/src/unit_test_uint2_hex_string.cpp b/unit-tests.wsjcpp/src/unit_test_uint2_hex_string.cpp
@@ -37,7 +37,7 @@ void UnitTestUint2HexString::executeTest() {
     for (int i = 0; i < tests.size(); i++) {
         LTest test = tests[i];
         std::string sStr = WsjcppCore::uint2hexString(test.nNumber);
-        compareS("test" + std::to_string(i), sStr, test.sExpectedStr);
+        compare("test" + std::to_string(i), sStr, test.sExpectedStr);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void UnitTestDecodeUriComponent::executeTest() {`
`37`	`37`	`for (int i = 0; i < tests.size(); i++) {`
`38`	`38`	`LTest test = tests[i];`
`39`	`39`	`std::string sStr = WsjcppCore::decodeUriComponent(test.sStr);`
`40`		`- compareS("test" + std::to_string(i), sStr, test.sExpectedStr);`
	`40`	`+ compare("test" + std::to_string(i), sStr, test.sExpectedStr);`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void UnitTestEncodeUriComponent::executeTest() {`
`37`	`37`	`for (int i = 0; i < tests.size(); i++) {`
`38`	`38`	`LTest test = tests[i];`
`39`	`39`	`std::string sStr = WsjcppCore::encodeUriComponent(test.sStr);`
`40`		`- compareS("test" + std::to_string(i), sStr, test.sExpectedStr);`
	`40`	`+ compare("test" + std::to_string(i), sStr, test.sExpectedStr);`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ void UnitTestGetEnv::executeTest() {`
`40`	`40`	`std::string sValue;`
`41`	`41`	`bool bResult = WsjcppCore::getEnv(test.sName, sValue);`
`42`	`42`	`std::string testBaseName = "test#" + std::to_string(i) + " (" + test.sName + ")";`
`43`		`- compareB(testBaseName + "-result", bResult, test.bExpectedResult);`
`44`		`- compareS(testBaseName + "-value", sValue, test.sExpectedValue);`
	`43`	`+ compare(testBaseName + "-result", bResult, test.bExpectedResult);`
	`44`	`+ compare(testBaseName + "-value", sValue, test.sExpectedValue);`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ void UnitTestgetHumanSizeBytes::executeTest() {`
`55`	`55`	`long nValue = tests[i].nValue;`
`56`	`56`	`std::string sExpectedStr = tests[i].sExpectedStr;`
`57`	`57`	`std::string sGotStr = WsjcppCore::getHumanSizeBytes(nValue);`
`58`		`- compareS("value=" + std::to_string(nValue), sGotStr, sExpectedStr);`
	`58`	`+ compare("value=" + std::to_string(nValue), sGotStr, sExpectedStr);`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ void UnitTestJoin::executeTest() {`
`24`	`24`	`vTest.push_back("2");`
`25`	`25`	`vTest.push_back("abc");`
`26`	`26`	`std::string sRet = WsjcppCore::join(vTest, ", ");`
`27`		`- compareS("join", sRet, ", 1, 2, abc");`
	`27`	`+ compare("join", sRet, ", 1, 2, abc");`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`// ---------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@ void UnitTestReadFileToBuffer::executeTest() {`
`23`	`23`	`char *pBuffer = nullptr;`
`24`	`24`	`int nBufferSize = 0;`
`25`	`25`	`WsjcppCore::readFileToBuffer("./data/readFileToBuffer.txt", &pBuffer, nBufferSize);`
`26`		`- compareN("Size of readed", nBufferSize, sExpected.length());`
	`26`	`+ compare("Size of readed", nBufferSize, sExpected.length());`
`27`	`27`	`int nMin = std::min(nBufferSize, (int)sExpected.length());`
`28`	`28`	`for (int i = 0; i < nMin; i++) {`
`29`	`29`	`char c_got = pBuffer[i];`
`30`	`30`	`char c_expected = sExpected[i];`
`31`		`- compareN("Check the " + std::to_string(i), c_got, c_expected);`
	`31`	`+ compare("Check the " + std::to_string(i), c_got, c_expected);`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void UnitTestReplaceAll::executeTest() {`
`43`	`43`	`LTest test = tests[i];`
`44`	`44`	`std::string sStr = test.sStr;`
`45`	`45`	`WsjcppCore::replaceAll(sStr, test.sFrom, test.sTo);`
`46`		`- compareS("test" + std::to_string(i), sStr, test.sExpectedStr);`
	`46`	`+ compare("test" + std::to_string(i), sStr, test.sExpectedStr);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,10 @@ void UnitTestSplit::executeTest() {`
`45`	`45`	`LTest test = tests[i];`
`46`	`46`	`std::string sPrefix = "test" + std::to_string(i) + "(\"" + test.sStr + "\")";`
`47`	`47`	`std::vector<std::string> vSplitted = WsjcppCore::split(test.sStr, test.sDelim);`
`48`		`- compareN(sPrefix + ": size", vSplitted.size(), test.vExpectedVector.size());`
	`48`	`+ compare(sPrefix + ": size", vSplitted.size(), test.vExpectedVector.size());`
`49`	`49`	`int nMin = std::min(vSplitted.size(), test.vExpectedVector.size());`
`50`	`50`	`for (int n = 0; n < nMin; n++) {`
`51`		`- compareS(sPrefix + ", element: " + std::to_string(n), vSplitted[n], test.vExpectedVector[n]);`
	`51`	`+ compare(sPrefix + ", element: " + std::to_string(n), vSplitted[n], test.vExpectedVector[n]);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ bool UnitTestToLower::doBeforeTest() {`
`18`	`18`	`// ---------------------------------------------------------------------`
`19`	`19`
`20`	`20`	`void UnitTestToLower::executeTest() {`
`21`		`- compareS("str1", "abc_def", WsjcppCore::toLower("ABC_DEF"));`
	`21`	`+ compare("str1", "abc_def", WsjcppCore::toLower("ABC_DEF"));`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`// ---------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void UnitTestUint2HexString::executeTest() {`
`37`	`37`	`for (int i = 0; i < tests.size(); i++) {`
`38`	`38`	`LTest test = tests[i];`
`39`	`39`	`std::string sStr = WsjcppCore::uint2hexString(test.nNumber);`
`40`		`- compareS("test" + std::to_string(i), sStr, test.sExpectedStr);`
	`40`	`+ compare("test" + std::to_string(i), sStr, test.sExpectedStr);`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`