UnitTest::onRun return void

src/oatpp-test/UnitTest.cpp

@@ -24,48 +24,36 @@
 
 #include "UnitTest.hpp"
 
-#include "oatpp/core/base/memory/MemoryPool.hpp" // delete
-#include "oatpp/core/base/Controllable.hpp" // delete
+#include "oatpp/core/base/memory/MemoryPool.hpp"
 
 #include <chrono>
 
 namespace oatpp { namespace test {
 
-v_int64 UnitTest::getTickCount(){
-  std::chrono::microseconds ms = std::chrono::duration_cast<std::chrono::microseconds>(
-    std::chrono::system_clock::now().time_since_epoch()
-  );
+void UnitTest::run(v_int32 times) {
   
-  return ms.count();
-  
-}
-  
-bool UnitTest::run(v_int32 times) {
-  
-  OATPP_LOGD(TAG, "START...");
+  OATPP_LOGD(TAG, "\033[1mSTART\033[0m...");
   
   v_counter objectsCount = base::Environment::getObjectsCount();
   v_counter objectsCreated = base::Environment::getObjectsCreated();
   
-  v_int64 ticks = getTickCount();
-  
-  bool result = true;
+  v_int64 ticks = base::Environment::getMicroTickCount();
   
   for(v_int32 i = 0; i < times; i++){
-    result = onRun();
+    onRun();
   }
   
-  v_int64 millis = getTickCount() - ticks;
+  v_int64 millis = base::Environment::getMicroTickCount() - ticks;
   
   v_counter leakingObjects = base::Environment::getObjectsCount() - objectsCount;
   v_counter objectsCreatedPerTest = base::Environment::getObjectsCreated() - objectsCreated;
   
-  if(leakingObjects == 0 && result == true){
-    OATPP_LOGD(TAG, "FINISHED - success");
-    OATPP_LOGD(TAG, "%d(micro), %d(objs)\n", millis, objectsCreatedPerTest);
+  if(leakingObjects == 0){
+    OATPP_LOGD(TAG, "\033[1mFINISHED\033[0m - \033[1;32msuccess!\033[0m");
+    OATPP_LOGD(TAG, "\033[33m%d(micro), %d(objs)\033[0m\n", millis, objectsCreatedPerTest);
   }else{
-    result = false;
-    OATPP_LOGD(TAG, "FINISHED - failed, leakingObjects = %d", leakingObjects);
+
+    OATPP_LOGD(TAG, "\033[1mFINISHED\033[0m - \033[1;31mfailed\033[0m, leakingObjects = %d", leakingObjects);
     
     auto POOLS = oatpp::base::memory::MemoryPool::POOLS;
     auto it = POOLS.begin();
@@ -76,9 +64,6 @@ bool UnitTest::run(v_int32 times) {
     }
   }
   
-  OATPP_ASSERT(result);
-  return result;
-  
 }
 
 }}

src/oatpp-test/UnitTest.hpp

@@ -41,15 +41,13 @@ public:
   virtual ~UnitTest(){
   }
   
-  v_int64 getTickCount();
-  
-  bool run(v_int32 times);
+  void run(v_int32 times);
 
-  bool run(){
-    return run(1);
+  void run(){
+    run(1);
   }
   
-  virtual bool onRun() = 0;
+  virtual void onRun() = 0;
   
   template<class T>
   static void runTest(v_int32 times){

test/oatpp/core/base/CommandLineArgumentsTest.cpp

@@ -30,7 +30,7 @@
 
 namespace oatpp { namespace test { namespace base {
   
-bool CommandLineArgumentsTest::onRun() {
+void CommandLineArgumentsTest::onRun() {
   
   /* -k -c 100 -n 500000 "http://127.0.0.1:8000/" */
   int argc = 6;
@@ -57,8 +57,7 @@ bool CommandLineArgumentsTest::onRun() {
   
   OATPP_ASSERT(std::strcmp(args.getNamedArgumentValue("-n"), "500000") == 0);
   OATPP_ASSERT(std::strcmp(args.getNamedArgumentValue("--non-existing", "default"), "default") == 0);
-  
-  return true;
+
 }
   
 }}}

test/oatpp/core/base/CommandLineArgumentsTest.hpp

@@ -36,7 +36,7 @@ class CommandLineArgumentsTest : public UnitTest{
 public:
   
   CommandLineArgumentsTest():UnitTest("TEST[base::CommandLineArgumentsTest]"){}
-  bool onRun() override;
+  void onRun() override;
   
 };
   

test/oatpp/core/base/RegRuleTest.cpp

@@ -82,7 +82,7 @@ namespace {
   
 }
 
-bool RegRuleTest::onRun() {
+void RegRuleTest::onRun() {
   
   {
     String reg1("");
@@ -153,7 +153,6 @@ bool RegRuleTest::onRun() {
   OATPP_ASSERT(map.find("str_2")->second == "val_2");
   OATPP_ASSERT(map.find("str_3")->second == "val_3");
 
-  return true;
 }
   
 }}}

test/oatpp/core/base/RegRuleTest.hpp

@@ -33,7 +33,7 @@ class RegRuleTest : public UnitTest{
 public:
   
   RegRuleTest():UnitTest("TEST[base::RegRuleTest]"){}
-  bool onRun() override;
+  void onRun() override;
   
 };
   

test/oatpp/core/base/collection/LinkedListTest.cpp

@@ -85,7 +85,7 @@ void testStdListPerformance(v_int32 iterationsCount){
   
 }
   
-bool LinkedListTest::onRun() {
+void LinkedListTest::onRun() {
   
   
   v_int32 iterationsCount = 100000;
@@ -103,8 +103,7 @@ bool LinkedListTest::onRun() {
       testStdListPerformance(iterationsCount);
     }
   }
-  
-  return true;
+
 }
   
 }}}

test/oatpp/core/base/collection/LinkedListTest.hpp

@@ -33,7 +33,7 @@ class LinkedListTest : public UnitTest{
 public:
   
   LinkedListTest():UnitTest("TEST[oatpp::collection::LinkedListTest]"){}
-  bool onRun() override;
+  void onRun() override;
   
 };
   

test/oatpp/core/base/memory/MemoryPoolTest.cpp

@@ -151,7 +151,7 @@ void testPool(v_int32 objectsNumber, v_int32 garbageNumber, v_int32 chunkSize){
   
 }
   
-bool MemoryPoolTest::onRun() {
+void MemoryPoolTest::onRun() {
   
   const v_int32 objectsNumber = 1000000;
   const v_int32 garbageNumber = 1000000;
@@ -190,8 +190,6 @@ bool MemoryPoolTest::onRun() {
     }
   }
   
-  return true;
-  
 }
 
 }}}

test/oatpp/core/base/memory/MemoryPoolTest.hpp

@@ -36,7 +36,7 @@ class MemoryPoolTest : public UnitTest{
 public:
   
   MemoryPoolTest():UnitTest("TEST[base::memory::MemoryPoolTest]"){}
-  bool onRun() override;
+  void onRun() override;
   
 };
   

test/oatpp/core/base/memory/PerfTest.cpp

@@ -92,7 +92,7 @@ namespace {
   
 }
   
-bool PerfTest::onRun() {
+void PerfTest::onRun() {
   
   v_int32 iterations = 1;
   v_int32 threadCount = 100;
@@ -122,8 +122,7 @@ bool PerfTest::onRun() {
      */
     
   }
-  
-  return true;
+
 }
   
 }}}

test/oatpp/core/base/memory/PerfTest.hpp

@@ -33,7 +33,7 @@ class PerfTest : public UnitTest{
 public:
   
   PerfTest():UnitTest("TEST[base::memory::PerfTest]"){}
-  bool onRun() override;
+  void onRun() override;
   
 };
   

test/oatpp/core/data/mapping/type/TypeTest.cpp

@@ -65,7 +65,7 @@ namespace {
   
 }
   
-bool TypeTest::onRun() {
+void TypeTest::onRun() {
   
   auto obj = TestDto::createShared();
   
@@ -117,7 +117,6 @@ bool TypeTest::onRun() {
   OATPP_LOGD(TAG, "type: '%s'", obj->obj1.valueType->name);
   OATPP_ASSERT(obj->obj1.valueType->name == oatpp::data::mapping::type::__class::AbstractObject::CLASS_NAME);
 
-  return true;
 }
   
 }}}}}}

test/oatpp/core/data/mapping/type/TypeTest.hpp

@@ -33,7 +33,7 @@ class TypeTest : public UnitTest{
 public:
   
   TypeTest():UnitTest("TEST[core::data::mapping::type::TypeTest]"){}
-  bool onRun() override;
+  void onRun() override;
   
 };
   

test/oatpp/core/data/share/MemoryLabelTest.cpp

@@ -33,7 +33,7 @@
 
 namespace oatpp { namespace test { namespace core { namespace data { namespace share {
   
-bool MemoryLabelTest::onRun() {
+void MemoryLabelTest::onRun() {
   
   oatpp::String sharedData = "big text goes here";
   oatpp::String key1 = "key1";
@@ -140,9 +140,7 @@ bool MemoryLabelTest::onRun() {
         OATPP_ASSERT(headers["header7"].equals("value7", 6));
         OATPP_ASSERT(headers["header8"].equals("value8", 6));
         OATPP_ASSERT(headers["header9"].equals("value9", 6));
-        
-        
-        /*
+
         OATPP_ASSERT(headers["header0"].equals("value0"));
         OATPP_ASSERT(headers["header1"].equals("value1"));
         OATPP_ASSERT(headers["header2"].equals("value2"));
@@ -153,15 +151,13 @@ bool MemoryLabelTest::onRun() {
         OATPP_ASSERT(headers["header7"].equals("value7"));
         OATPP_ASSERT(headers["header8"].equals("value8"));
         OATPP_ASSERT(headers["header9"].equals("value9"));
-        */
          
       }
       
     }
 
   }
-    
-  return true;
+
 }
   
 }}}}}

test/oatpp/core/data/share/MemoryLabelTest.hpp

@@ -33,7 +33,7 @@ class MemoryLabelTest : public UnitTest{
 public:
   
   MemoryLabelTest():UnitTest("TEST[core::data::share::MemoryLabelTest]"){}
-  bool onRun() override;
+  void onRun() override;
   
 };
   

test/oatpp/core/parser/CaretTest.cpp

@@ -32,7 +32,7 @@ namespace oatpp { namespace test { namespace parser {
     typedef oatpp::parser::Caret Caret;
   }
 
-bool CaretTest::onRun() {
+void CaretTest::onRun() {
 
   {
     Caret caret(" \t\n\r\f \t\n\r\f \t\n\r\fhello!\t\n\r\f");
@@ -82,7 +82,6 @@ bool CaretTest::onRun() {
     OATPP_ASSERT(caret.getPosition() == caret.getDataSize());
   }
 
-  return true;
 }
 
 }}}

test/oatpp/core/parser/CaretTest.hpp

@@ -33,7 +33,7 @@ class CaretTest : public UnitTest{
 public:
 
   CaretTest():UnitTest("TEST[parser::CaretTest]"){}
-  bool onRun() override;
+  void onRun() override;
 
 };
 

test/oatpp/encoding/Base64Test.cpp

@@ -28,7 +28,7 @@
 
 namespace oatpp { namespace test { namespace encoding {
   
-bool Base64Test::onRun() {
+void Base64Test::onRun() {
 
   oatpp::String message = "oat++ web framework";
   oatpp::String messageEncoded = "b2F0Kysgd2ViIGZyYW1ld29yaw==";
@@ -47,8 +47,7 @@ bool Base64Test::onRun() {
     oatpp::String decoded = oatpp::encoding::Base64::decode(encoded, oatpp::encoding::Base64::ALPHABET_BASE64_URL_SAFE_AUXILIARY_CHARS);
     OATPP_ASSERT(message->equals(decoded.get()));
   }
-  
-  return true;
+
 }
   
 }}}

test/oatpp/encoding/Base64Test.hpp

@@ -32,7 +32,7 @@ namespace oatpp { namespace test { namespace encoding {
 class Base64Test : public UnitTest{
 public:
   Base64Test():UnitTest("TEST[encoding::Base64Test]"){}
-  bool onRun() override;
+  void onRun() override;
 };
   
 }}}

test/oatpp/encoding/UnicodeTest.cpp

@@ -58,7 +58,7 @@ void writeBinaryInt(v_int32 value){
 
 // 38327
   
-bool UnicodeTest::onRun(){
+void UnicodeTest::onRun(){
   
   v_char8 buff[128];
   v_int32 cnt;
@@ -130,8 +130,7 @@ bool UnicodeTest::onRun(){
     check = oatpp::encoding::Unicode::utf16SurrogatePairToCode(high, low);
     OATPP_ASSERT(code == check);
   }
-  
-  return true;
+
 }
   
 }}}

test/oatpp/encoding/UnicodeTest.hpp

@@ -32,7 +32,7 @@ namespace oatpp { namespace test { namespace encoding {
 class UnicodeTest : public UnitTest{
 public:
   UnicodeTest():UnitTest("TEST[encoding::UnicodeTest]"){}
-  bool onRun() override;
+  void onRun() override;
 };
   
 }}}

test/oatpp/network/virtual_/InterfaceTest.cpp

@@ -131,7 +131,7 @@ namespace {
   
 }
   
-bool InterfaceTest::onRun() {
+void InterfaceTest::onRun() {
   
   oatpp::String dataSample = "1234567890-=][poiuytrewqasdfghjkl;'/.,mnbvcxzzxcvbnm,./';lkjhgfdsaqwertyuiop][=-0987654321";
   
@@ -154,8 +154,7 @@ bool InterfaceTest::onRun() {
   }
   
   server->join();
-  
-  return true;
+
 }
   
 }}}}

test/oatpp/network/virtual_/InterfaceTest.hpp

@@ -32,7 +32,7 @@ namespace oatpp { namespace test { namespace network { namespace virtual_ {
 class InterfaceTest : public UnitTest {
 public:
   InterfaceTest():UnitTest("TEST[network::virtual_::InterfaceTest]"){}
-  bool onRun() override;
+  void onRun() override;
 };
   
 }}}}

test/oatpp/network/virtual_/PipeTest.cpp

@@ -133,7 +133,7 @@ namespace {
   
 }
   
-bool PipeTest::onRun() {
+void PipeTest::onRun() {
   
   auto pipe = Pipe::createShared();
 
@@ -143,8 +143,7 @@ bool PipeTest::onRun() {
   runTransfer(pipe, chunkCount, true, false);
   runTransfer(pipe, chunkCount, false, true);
   runTransfer(pipe, chunkCount, true, true);
-  
-  return true;
+
 }
   
 }}}}

test/oatpp/network/virtual_/PipeTest.hpp

@@ -32,7 +32,7 @@ namespace oatpp { namespace test { namespace network { namespace virtual_ {
 class PipeTest : public UnitTest {
 public:
   PipeTest():UnitTest("TEST[network::virtual_::PipeTest]"){}
-  bool onRun() override;
+  void onRun() override;
 };
   
 }}}}

test/oatpp/parser/json/mapping/DTOMapperPerfTest.cpp

@@ -65,7 +65,7 @@ typedef oatpp::parser::json::mapping::Deserializer Deserializer;
   
 }
   
-bool DTOMapperPerfTest::onRun() {
+void DTOMapperPerfTest::onRun() {
   
   v_int32 numIterations = 1000000;
   
@@ -89,7 +89,7 @@ bool DTOMapperPerfTest::onRun() {
       mapper->readFromCaret<Test1>(caret);
     }
   }
-  return true;
+
 }
   
 }}}}}

test/oatpp/parser/json/mapping/DTOMapperPerfTest.hpp

@@ -33,7 +33,7 @@ class DTOMapperPerfTest : public UnitTest{
 public:
   
   DTOMapperPerfTest():UnitTest("TEST[parser::json::mapping::DTOMapperPerfTest]"){}
-  bool onRun() override;
+  void onRun() override;
   
 };
   

test/oatpp/parser/json/mapping/DTOMapperTest.cpp

@@ -86,7 +86,7 @@ class Test : public DTO {
   
 }
   
-bool DTOMapperTest::onRun(){
+void DTOMapperTest::onRun(){
   
   auto mapper = oatpp::parser::json::mapping::ObjectMapper::createShared();
   
@@ -190,8 +190,7 @@ bool DTOMapperTest::onRun(){
   result = mapper->writeToString(obj);
   
   OATPP_LOGD(TAG, "json='%s'", (const char*) result->getData());
-  
-  return true;
+
 }
   
 #include OATPP_CODEGEN_END(DTO)

test/oatpp/parser/json/mapping/DTOMapperTest.hpp

@@ -33,7 +33,7 @@ class DTOMapperTest : public UnitTest{
 public:
   
   DTOMapperTest():UnitTest("TEST[parser::json::mapping::DTOMapperTest]"){}
-  bool onRun() override;
+  void onRun() override;
   
 };
   

test/oatpp/parser/json/mapping/DeserializerTest.cpp

@@ -82,7 +82,7 @@ class Test4 : public DTO {
   
 }
   
-bool DeserializerTest::onRun(){
+void DeserializerTest::onRun(){
   
   auto mapper = oatpp::parser::json::mapping::ObjectMapper::createShared();
   
@@ -175,8 +175,7 @@ bool DeserializerTest::onRun(){
   OATPP_ASSERT(obj4->list);
   OATPP_ASSERT(obj4->list->count() == 0);
   OATPP_ASSERT(obj4->map->count() == 0);
-  
-  return true;
+
 }
   
 }}}}}

test/oatpp/parser/json/mapping/DeserializerTest.hpp

@@ -33,7 +33,7 @@ class DeserializerTest : public UnitTest{
 public:
   
   DeserializerTest():UnitTest("TEST[parser::json::mapping::DeserializerTestTest]"){}
-  bool onRun() override;
+  void onRun() override;
   
 };
   

test/oatpp/web/FullAsyncTest.cpp

@@ -42,7 +42,7 @@
 
 namespace oatpp { namespace test { namespace web {
   
-bool FullAsyncTest::onRun() {
+void FullAsyncTest::onRun() {
   
   auto interface = oatpp::network::virtual_::Interface::createShared("virtualhost");
   
@@ -136,8 +136,7 @@ bool FullAsyncTest::onRun() {
   serverThread.join();
   
   std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-  
-  return true;
+
 }
   
 }}}

test/oatpp/web/FullAsyncTest.hpp

@@ -33,7 +33,7 @@ class FullAsyncTest : public UnitTest {
 public:
   
   FullAsyncTest():UnitTest("TEST[web::FullAsyncTest]"){}
-  bool onRun() override;
+  void onRun() override;
   
 };
   

test/oatpp/web/FullTest.cpp

@@ -44,7 +44,7 @@
 
 namespace oatpp { namespace test { namespace web {
   
-bool FullTest::onRun() {
+void FullTest::onRun() {
   
   auto interface = oatpp::network::virtual_::Interface::createShared("virtualhost");
   
@@ -131,8 +131,7 @@ bool FullTest::onRun() {
   
   clientThread.join();
   serverThread.join();
-  
-  return true;
+
 }
   
 }}}

test/oatpp/web/FullTest.hpp

@@ -33,7 +33,7 @@ class FullTest : public UnitTest {
 public:
   
   FullTest():UnitTest("TEST[web::FullTest]"){}
-  bool onRun() override;
+  void onRun() override;
   
 };