Changeset 509738fd in mainline

Timestamp:

2018-07-05T21:41:18Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d49bae9

Parents:

a6ca1bc

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-11-02 17:59:05)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:18)

Message:

cpp: improved the testing framework

Location:

uspace/lib/cpp

Files:

• include/internal/test/test.hpp (modified) (2 diffs)
• src/internal/test/array.cpp (modified) (2 diffs)
• src/internal/test/string.cpp (modified) (2 diffs)
• src/internal/test/test.cpp (modified) (2 diffs)
• src/internal/test/vector.cpp (modified) (1 diff)

uspace/lib/cpp/include/internal/test/test.hpp

@@ -44 +44 @@
         protected:
             void report(bool, const char*);
+            void start();
+            bool end();
+
+            unsigned int failed_{};
+            unsigned int succeeded_{};
+            bool ok_{true};
 
             template<class... Args>
@@ -49 +55 @@
             {
                 if (!assert_eq(std::forward<Args>(args)...))
+                {
                     report(false, tname);
+                    ++failed_;
+                    ok_ = false;
+                }
                 else
+                {
                     report(true, tname);
+                    ++succeeded_;
+                }
             }
 

uspace/lib/cpp/src/internal/test/array.cpp

@@ -36 +36 @@
     bool array_test::run()
     {
+        start();
+
         auto check1 = {1, 2, 3, 4};
         auto check2 = {4, 3, 2, 1};
@@ -99 +101 @@
         // TODO: test bound checking of at when implemented
 
-        return true;
+        return end();
     }
 

uspace/lib/cpp/src/internal/test/string.cpp

@@ -36 +36 @@
     bool string_test::run()
     {
+        start();
+
         test_construction_and_assignment();
         test_append();
@@ -44 +46 @@
         test_find();
 
-        return true;
+        return end();
     }
 

uspace/lib/cpp/src/internal/test/test.cpp

@@ -32 +32 @@
 namespace std::test
 {
-
     void test_suite::report(bool result, const char* tname)
     {
@@ -41 +40 @@
     }
 
+    void test_suite::start()
+    {
+        std::printf("\n[TEST START][%s]\n", name());
+    }
+
+    bool test_suite::end()
+    {
+        std::printf("[TEST END][%s][%lu OK][%lu FAIL]\n",
+                    name(), succeeded_, failed_);
+        return ok_;
+    }
 }

uspace/lib/cpp/src/internal/test/vector.cpp

@@ -37 +37 @@
     bool vector_test::run()
     {
+        start();
+
         test_construction_and_assignment();
         test_insert();
         test_erase();
-        return true;
+
+        return end();
     }