Changeset 471e313 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

edbad13a

Parents:

4e6fb2f

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-11-02 21:01:56)

git-committer:

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

Message:

cpp: added a test set that allows us to run tests and gather summary statistics about their results and then report those

Location:

uspace/lib/cpp

Files:

• include/internal/test/test.hpp (modified) (1 diff)
• include/internal/test/tests.hpp (modified) (1 diff)
• src/internal/test/test.cpp (modified) (1 diff)

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

@@ -41 +41 @@
 
             virtual ~test_suite() = default;
+
+            unsigned int get_failed() const noexcept;
+
+            unsigned int get_succeeded() const noexcept;
 
         protected:

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

@@ -30 +30 @@
 #define LIBCPP_TESTS
 
+#include <cstdio>
 #include <internal/test/test.hpp>
+#include <vector>
 
 namespace std::test
 {
+    class test_set
+    {
+        public:
+            test_set() = default;
+
+            template<class T>
+            void add()
+            {
+                tests_.push_back(new T{});
+            }
+
+            bool run()
+            {
+                bool res{true};
+                unsigned int succeeded{};
+                unsigned int failed{};
+
+                for (auto test: tests_)
+                {
+                    res &= test->run();
+                    succeeded += test->get_succeeded();
+                    failed += test->get_failed();
+                }
+
+                std::printf("\n");
+                if (res)
+                    std::printf("[TESTS SUCCEEDED!]");
+                else
+                    std::printf("[TESTS FAILED]");
+                std::printf("[%u OK][%u FAIL][%u TOTAL]\n",
+                            succeeded, failed, (succeeded + failed));
+
+                return res;
+            }
+
+            ~test_set()
+            {
+                // TODO: Gimme unique_ptr!
+                for (auto ptr: tests_)
+                    delete ptr;
+            }
+        private:
+            std::vector<test_suite*> tests_{};
+    };
+
     class array_test: public test_suite
     {

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

@@ -47 +47 @@
     bool test_suite::end()
     {
-        std::printf("[TEST END][%s][%lu OK][%lu FAIL]\n",
+        std::printf("[TEST END][%s][%u OK][%u FAIL]\n",
                     name(), succeeded_, failed_);
         return ok_;
     }
+
+    unsigned int test_suite::get_failed() const noexcept
+    {
+        return failed_;
+    }
+
+    unsigned int test_suite::get_succeeded() const noexcept
+    {
+        return succeeded_;
+    }
 }