Changeset 96ae12b in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

fceeb93

Parents:

e54bbde5

git-author:

Dzejrou <dzejrou@…> (2018-05-11 18:05:44)

git-committer:

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

Message:

cpp: updated & fixed tests, now output is optional (for possible use with pcut)

Location:

uspace/lib/cpp

Files:

• include/internal/test/test.hpp (modified) (5 diffs)
• include/internal/test/tests.hpp (modified) (6 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) (3 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -31 +31 @@
 
 #include <utility>
+#include <iterator>
 
 namespace std::test
@@ -37 +38 @@
     {
         public:
-            virtual bool run() = 0;
+            virtual bool run(bool) = 0;
             virtual const char* name() = 0;
 
@@ -54 +55 @@
             unsigned int succeeded_{};
             bool ok_{true};
+            bool report_{true};
 
             template<class... Args>
@@ -81 +83 @@
                            Iterator2 first2, Iterator2 last2)
             {
-                if ((last1 - first1) != (last2 - first2))
+                if (std::distance(first1, last1) != std::distance(first2, last2))
                     return false;
 

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -47 +47 @@
             }
 
-            bool run()
+            bool run(bool report)
             {
                 bool res{true};
@@ -55 +55 @@
                 for (auto test: tests_)
                 {
-                    res &= test->run();
+                    res &= test->run(report);
                     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));
+                if (report)
+                {
+                    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;
@@ -84 +87 @@
     {
         public:
-            bool run() override;
+            bool run(bool) override;
             const char* name() override;
 
@@ -94 +97 @@
     {
         public:
-            bool run() override;
+            bool run(bool) override;
             const char* name() override;
 
@@ -109 +112 @@
     {
         public:
-            bool run() override;
+            bool run(bool) override;
             const char* name() override;
 

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -34 +34 @@
 namespace std::test
 {
-    bool array_test::run()
+    bool array_test::run(bool report)
     {
+        report_ = report;
         start();
 

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -34 +34 @@
 namespace std::test
 {
-    bool string_test::run()
-    {
+    bool string_test::run(bool report)
+    {
+        report_ = report;
         start();
 

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

@@ -34 +34 @@
     void test_suite::report(bool result, const char* tname)
     {
+        if (!report_)
+            return;
+
         if (result)
             std::printf("[%s][%s] ... OK\n", name(), tname);
@@ -42 +45 @@
     void test_suite::start()
     {
-        std::printf("\n[TEST START][%s]\n", name());
+        if (report_)
+            std::printf("\n[TEST START][%s]\n", name());
     }
 
     bool test_suite::end()
     {
-        std::printf("[TEST END][%s][%u OK][%u FAIL]\n",
-                    name(), succeeded_, failed_);
+        if (report_)
+            std::printf("[TEST END][%s][%u OK][%u FAIL]\n",
+                        name(), succeeded_, failed_);
         return ok_;
     }

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -35 +35 @@
 namespace std::test
 {
-    bool vector_test::run()
-    {
+    bool vector_test::run(bool report)
+    {
+        report_ = report;
         start();
 
@@ -129 +130 @@
         );
 
-        test_eq("move assignment origin empty", vec9.size(), 0);
+        test_eq("move assignment origin empty", vec9.size(), 0U);
     }