Changeset 96ae12b in mainline for uspace/lib/cpp/src

Timestamp:

2018-07-05T21:41:23Z (7 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/src/internal/test

Files:

• array.cpp (modified) (2 diffs)
• string.cpp (modified) (2 diffs)
• test.cpp (modified) (2 diffs)
• vector.cpp (modified) (3 diffs)

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);
     }