X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c716caf78a7b4a28c3ac18a4a2f49773d9aad50..daefac7fa79cf337ea13cb729b170b16dd36647a:/src/xbt/cunit.cpp

diff --git a/src/xbt/cunit.cpp b/src/xbt/cunit.cpp
index 440d93396c..f6d6ee0ba6 100644
--- a/src/xbt/cunit.cpp
+++ b/src/xbt/cunit.cpp
@@ -1,6 +1,6 @@
 /* cunit - A little C Unit facility                                         */
 
-/* Copyright (c) 2005-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2005-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -10,7 +10,7 @@
 
 #include "src/internal_config.h"
 #include <algorithm>
-#include <cstdio>
+#include <iostream>
 #include <string>
 #include <vector>
 
@@ -18,13 +18,11 @@
 #include <xbt/ex.hpp>
 #include <xbt/string.hpp>
 
-#include "xbt/sysdep.h"         /* bvprintf */
-#include "xbt/dynar.h"
-
-#define STRLEN 1024
+/* output stream to use everywhere */
+static std::ostream& _xbt_test_out = std::cerr;
 
 /* collection of all suites */
-static xbt_dynar_t _xbt_test_suites = nullptr;
+static std::vector<xbt_test_suite_t> _xbt_test_suites;
 /* global statistics */
 static int _xbt_test_nb_tests = 0;
 static int _xbt_test_test_failed = 0;
@@ -60,7 +58,7 @@ public:
 
 void s_xbt_test_log::dump() const
 {
-  fprintf(stderr, "      log %p(%s:%d)=%s\n", this, this->file_.c_str(), this->line_, this->text_.c_str());
+  _xbt_test_out << "      log " << this << "(" << file_ << ":" << line_ << ")=" << text_ << "\n";
 }
 
 /* test suite test check */
@@ -83,8 +81,8 @@ public:
 
 void s_xbt_test_test::dump() const
 {
-  fprintf(stderr, "    test %p(%s:%d)=%s (%s)\n", this, this->file_.c_str(), this->line_, this->title_.c_str(),
-          this->failed_ ? "failed" : "not failed");
+  _xbt_test_out << "    test " << this << "(" << file_ << ":" << line_ << ")=" << title_ << " ("
+                << (failed_ ? "failed" : "not failed") << ")\n";
   for (s_xbt_test_log const& log : this->logs_)
     log.dump();
 }
@@ -112,8 +110,7 @@ public:
 
 void s_xbt_test_unit::dump() const
 {
-  fprintf(stderr, "  UNIT %s: %s (%s)\n", this->name_.c_str(), this->title_.c_str(),
-          (this->enabled_ ? "enabled" : "disabled"));
+  _xbt_test_out << "  UNIT " << name_ << ": " << title_ << " (" << (this->enabled_ ? "enabled" : "disabled") << ")\n";
   if (this->enabled_) {
     for (s_xbt_test_test const& test : this->tests_)
       test.dump();
@@ -121,69 +118,53 @@ void s_xbt_test_unit::dump() const
 }
 
 /* test suite */
-struct s_xbt_test_suite {
-  int enabled;
-  const char *name;
-  char *title;
-  std::vector<s_xbt_test_unit> units;
-
-  int nb_tests;
-  int nb_units;
-  int test_failed;
-  int test_ignore;
-  int test_expect;
-  int unit_failed;
-  int unit_ignore;
-  int unit_disabled;
-};
-
-/* destroy test suite */
-static void xbt_test_suite_free(void *s)
-{
-  xbt_test_suite_t suite = *(xbt_test_suite_t *) s;
+class s_xbt_test_suite {
+public:
+  s_xbt_test_suite(std::string name, std::string title) : name_(std::move(name)), title_(std::move(title)) {}
+  void dump() const;
+  void push(s_xbt_test_unit unit) { units_.emplace_back(std::move(unit)); }
+  int run(int verbosity);
 
-  if (suite == nullptr)
-    return;
-  xbt_free(suite->title);
-  delete suite;
-}
+  std::string name_;
+  std::string title_;
+  std::vector<s_xbt_test_unit> units_;
+
+  bool enabled_      = true;
+  int nb_tests_      = 0;
+  int nb_units_      = 0;
+  int test_failed_   = 0;
+  int test_ignore_   = 0;
+  int test_expect_   = 0;
+  int unit_failed_   = 0;
+  int unit_ignore_   = 0;
+  int unit_disabled_ = 0;
+};
 
 /** @brief retrieve a testsuite from name, or create a new one */
 xbt_test_suite_t xbt_test_suite_by_name(const char *name, const char *fmt, ...)
 {
-  if (_xbt_test_suites == nullptr) {
-    _xbt_test_suites = xbt_dynar_new(sizeof(xbt_test_suite_t), xbt_test_suite_free);
-  } else {
-    xbt_test_suite_t suite;
-    unsigned int it_suite;
-    xbt_dynar_foreach(_xbt_test_suites, it_suite, suite)
-      if (not strcmp(suite->name, name))
-        return suite;
-  }
+  auto res = std::find_if(begin(_xbt_test_suites), end(_xbt_test_suites),
+                          [&name](xbt_test_suite_t const& suite) { return suite->name_ == name; });
+  if (res != end(_xbt_test_suites))
+    return *res;
 
-  xbt_test_suite_t suite = new s_xbt_test_suite{};
   va_list ap;
   va_start(ap, fmt);
-  suite->title = bvprintf(fmt, ap);
+  xbt_test_suite_t suite = new s_xbt_test_suite(name, simgrid::xbt::string_vprintf(fmt, ap));
   va_end(ap);
-  suite->name    = name;
-  suite->enabled = 1;
 
-  xbt_dynar_push(_xbt_test_suites, &suite);
+  _xbt_test_suites.push_back(suite);
 
   return suite;
 }
 
-static void xbt_test_suite_dump(xbt_test_suite_t suite)
+void s_xbt_test_suite::dump() const
 {
-  if (suite) {
-    fprintf(stderr, "TESTSUITE %s: %s (%s)\n", suite->name, suite->title, suite->enabled ? "enabled" : "disabled");
-    if (suite->enabled) {
-      for (s_xbt_test_unit const& unit : suite->units)
-        unit.dump();
-    }
-  } else {
-    fprintf(stderr, "TESTSUITE IS NULL!\n");
+  _xbt_test_out << "TESTSUITE " << name_ << ": " << title_ << " (" << (this->enabled_ ? "enabled" : "disabled")
+                << ")\n";
+  if (this->enabled_) {
+    for (s_xbt_test_unit const& unit : this->units_)
+      unit.dump();
   }
 }
 
@@ -196,37 +177,29 @@ void xbt_test_suite_push(xbt_test_suite_t suite, const char *name, ts_test_cb_t
 
   va_list ap;
   va_start(ap, fmt);
-  suite->units.emplace_back(name, simgrid::xbt::string_vprintf(fmt, ap), func);
+  s_xbt_test_unit unit(name, simgrid::xbt::string_vprintf(fmt, ap), func);
   va_end(ap);
+  suite->push(unit);
 }
 
 /* run test one suite */
-static int xbt_test_suite_run(xbt_test_suite_t suite, int verbosity)
+int s_xbt_test_suite::run(int verbosity)
 {
-  if (suite == nullptr)
-    return 0;
-
   /* suite title pretty-printing */
-  char suite_title[81];
-  int suite_len = strlen(suite->title);
-
-  xbt_assert(suite_len < 68, "suite title \"%s\" too long (%d should be less than 68", suite->title, suite_len);
-
-  suite_title[0] = ' ';
-  for (int i = 1; i < 79; i++)
-    suite_title[i] = '=';
-  suite_title[79]  = '\n';
-  suite_title[80]  = '\0';
+  int suite_len = this->title_.length();
+  xbt_assert(suite_len < 68, "suite title \"%s\" too long (%d should be less than 68", this->title_.c_str(), suite_len);
 
-  snprintf(suite_title + 40 - (suite_len + 4) / 2, 81 - (40 - (suite_len + 4) / 2), "[ %s ]", suite->title);
-  suite_title[40 + (suite_len + 5) / 2] = '=';
-  if (not suite->enabled)
-    snprintf(suite_title + 70, 11, " DISABLED ");
-  fprintf(stderr, "\n%s\n", suite_title);
+  std::string suite_title = " ";
+  suite_title.resize(40 - (suite_len + 4) / 2, '=');
+  suite_title += std::string("[ ") + this->title_ + " ]";
+  suite_title.resize(79, '=');
+  if (not this->enabled_)
+    suite_title.replace(70, std::string::npos, " DISABLED");
+  _xbt_test_out << "\n" << suite_title << "\n";
 
-  if (suite->enabled) {
+  if (this->enabled_) {
     /* iterate through all tests */
-    for (s_xbt_test_unit& unit : suite->units) {
+    for (s_xbt_test_unit& unit : this->units_) {
       /* init unit case counters */
       unit.nb_tests_    = 0;
       unit.test_ignore_ = 0;
@@ -234,12 +207,9 @@ static int xbt_test_suite_run(xbt_test_suite_t suite, int verbosity)
       unit.test_expect_ = 0;
 
       /* display unit title */
-      char* cp = bprintf(" Unit: %s ......................................"
-                         "......................................",
-                         unit.title_.c_str());
-      cp[70] = '\0';
-      fprintf(stderr, "%s", cp);
-      free(cp);
+      std::string cp = std::string(" Unit: ") + unit.title_ + " ";
+      cp.resize(70, '.');
+      _xbt_test_out << cp;
 
       /* run the test case function */
       _xbt_test_current_unit = &unit;
@@ -263,16 +233,16 @@ static int xbt_test_suite_run(xbt_test_suite_t suite, int verbosity)
       if (unit.test_failed_ > 0 || unit.test_expect_ || (verbosity && unit.nb_tests_ > 0)) {
         /* some tests failed (or were supposed to), so do detailed reporting of test case */
         if (unit.test_failed_ > 0) {
-          fprintf(stderr, ".. failed\n");
+          _xbt_test_out << ".. failed\n";
         } else if (unit.nb_tests_) {
-          fprintf(stderr, "...... ok\n");       /* successful, but show about expected */
+          _xbt_test_out << "...... ok\n"; /* successful, but show about expected */
         } else {
-          fprintf(stderr, ".... skip\n");       /* shouldn't happen, but I'm a bit lost with this logic */
+          _xbt_test_out << ".... skip\n"; /* shouldn't happen, but I'm a bit lost with this logic */
         }
         for (s_xbt_test_test const& test : unit.tests_) {
           std::string file = test.file_;
           int line         = test.line_;
-          const char* resname;
+          std::string resname;
           if (test.ignored_)
             resname = " SKIP";
           else if (test.expected_failure_) {
@@ -286,35 +256,35 @@ static int xbt_test_suite_run(xbt_test_suite_t suite, int verbosity)
             else
               resname = " PASS";
           }
-          fprintf(stderr, "      %s: %s [%s:%d]\n", resname, test.title_.c_str(), file.c_str(), line);
+          _xbt_test_out << "      " << resname << ": " << test.title_ << " [" << file << ":" << line << "]\n";
 
           if ((test.expected_failure_ && not test.failed_) || (not test.expected_failure_ && test.failed_)) {
             for (s_xbt_test_log const& log : test.logs_) {
               file = (log.file_.empty() ? file : log.file_);
               line = (log.line_ == 0 ? line : log.line_);
-              fprintf(stderr, "             %s:%d: %s\n", file.c_str(), line, log.text_.c_str());
+              _xbt_test_out << "             " << file << ":" << line << ": " << log.text_ << "\n";
             }
           }
         }
-        fprintf(stderr, "    Summary: %d of %d tests failed", unit.test_failed_, unit.nb_tests_);
+        _xbt_test_out << "    Summary: " << unit.test_failed_ << " of " << unit.nb_tests_ << " tests failed";
         if (unit.test_ignore_) {
-          fprintf(stderr, " (%d tests ignored)\n", unit.test_ignore_);
+          _xbt_test_out << " (" << unit.test_ignore_ << " tests ignored)\n";
         } else {
-          fprintf(stderr, "\n");
+          _xbt_test_out << "\n";
         }
       } else if (not unit.enabled_) {
-        fprintf(stderr, " disabled\n"); /* no test were run */
+        _xbt_test_out << " disabled\n"; /* no test were run */
       } else if (unit.nb_tests_) {
-        fprintf(stderr, "...... ok\n"); /* successful */
+        _xbt_test_out << "...... ok\n"; /* successful */
       } else {
-        fprintf(stderr, ".... skip\n"); /* no test were run */
+        _xbt_test_out << ".... skip\n"; /* no test were run */
       }
 
       /* Accumulate test counts into the suite */
-      suite->nb_tests += unit.nb_tests_;
-      suite->test_failed += unit.test_failed_;
-      suite->test_ignore += unit.test_ignore_;
-      suite->test_expect += unit.test_expect_;
+      this->nb_tests_ += unit.nb_tests_;
+      this->test_failed_ += unit.test_failed_;
+      this->test_ignore_ += unit.test_ignore_;
+      this->test_expect_ += unit.test_expect_;
 
       _xbt_test_nb_tests += unit.nb_tests_;
       _xbt_test_test_failed += unit.test_failed_;
@@ -323,165 +293,164 @@ static int xbt_test_suite_run(xbt_test_suite_t suite, int verbosity)
 
       /* What's the conclusion of this test anyway? */
       if (unit.nb_tests_) {
-        suite->nb_units++;
+        this->nb_units_++;
         if (unit.test_failed_)
-          suite->unit_failed++;
+          this->unit_failed_++;
       } else if (not unit.enabled_) {
-        suite->unit_disabled++;
+        this->unit_disabled_++;
       } else {
-        suite->unit_ignore++;
+        this->unit_ignore_++;
       }
     }
   }
-  _xbt_test_nb_units += suite->nb_units;
-  _xbt_test_unit_failed += suite->unit_failed;
-  _xbt_test_unit_ignore += suite->unit_ignore;
-  _xbt_test_unit_disabled += suite->unit_disabled;
+  _xbt_test_nb_units += this->nb_units_;
+  _xbt_test_unit_failed += this->unit_failed_;
+  _xbt_test_unit_ignore += this->unit_ignore_;
+  _xbt_test_unit_disabled += this->unit_disabled_;
 
-  if (suite->nb_units) {
+  if (this->nb_units_) {
     _xbt_test_nb_suites++;
-    if (suite->test_failed)
+    if (this->test_failed_)
       _xbt_test_suite_failed++;
-  } else if (not suite->enabled) {
+  } else if (not this->enabled_) {
     _xbt_test_suite_disabled++;
   } else {
     _xbt_test_suite_ignore++;
   }
 
   /* print test suite summary */
-  if (suite->enabled) {
-    int first = 1; /* for result pretty printing */
-
-    fprintf(stderr," =====================================================================%s\n",
-            (suite->nb_units ? (suite->unit_failed ? "== FAILED" : "====== OK") :
-                               (suite->unit_disabled ? " DISABLED" : "==== SKIP")));
-    fprintf(stderr, " Summary: Units: %.0f%% ok (%d units: ", suite->nb_units
-            ? ((1 - (double) suite->unit_failed / (double) suite->nb_units) * 100.0) : 100.0, suite->nb_units);
-
-    if (suite->nb_units != suite->unit_failed) {
-      fprintf(stderr, "%s%d ok", (first ? "" : ", "), suite->nb_units - suite->unit_failed);
-      first = 0;
+  if (this->enabled_) {
+    bool first = true; /* for result pretty printing */
+
+    _xbt_test_out << " =====================================================================";
+    if (this->nb_units_)
+      _xbt_test_out << (this->unit_failed_ ? "== FAILED\n" : "====== OK\n");
+    else
+      _xbt_test_out << (this->unit_disabled_ ? " DISABLED\n" : "==== SKIP\n");
+    _xbt_test_out.setf(std::ios::fixed);
+    _xbt_test_out.precision(0);
+    _xbt_test_out << " Summary: Units: "
+                  << (this->nb_units_ ? ((1 - (double)this->unit_failed_ / (double)this->nb_units_) * 100.0) : 100.0)
+                  << "% ok (" << this->nb_units_ << " units: ";
+    if (this->nb_units_ != this->unit_failed_) {
+      _xbt_test_out << (first ? "" : ", ") << (this->nb_units_ - this->unit_failed_) << " ok";
+      first = false;
     }
-    if (suite->unit_failed) {
-      fprintf(stderr, "%s%d failed", (first ? "" : ", "), suite->unit_failed);
-      first = 0;
+    if (this->unit_failed_) {
+      _xbt_test_out << (first ? "" : ", ") << this->unit_failed_ << " failed";
+      first = false;
     }
-    if (suite->unit_ignore) {
-      fprintf(stderr, "%s%d ignored", (first ? "" : ", "), suite->unit_ignore);
-      first = 0;
+    if (this->unit_ignore_) {
+      _xbt_test_out << (first ? "" : ", ") << this->unit_ignore_ << " ignored";
+      first = false;
     }
-    if (suite->unit_disabled) {
-      fprintf(stderr, "%s%d disabled", (first ? "" : ", "), suite->unit_disabled);
+    if (this->unit_disabled_) {
+      _xbt_test_out << (first ? "" : ", ") << this->unit_disabled_ << " disabled";
     }
-    fprintf(stderr, ")\n          Tests: %.0f%% ok (%d tests: ", suite->nb_tests
-            ? ((1 - (double) suite->test_failed / (double) suite->nb_tests) * 100.0) : 100.0, suite->nb_tests);
-
-    first = 1;
-    if (suite->nb_tests != suite->test_failed) {
-      fprintf(stderr, "%s%d ok", (first ? "" : ", "), suite->nb_tests - suite->test_failed);
-      first = 0;
+    _xbt_test_out << ")\n          Tests: "
+                  << (this->nb_tests_ ? ((1 - (double)this->test_failed_ / (double)this->nb_tests_) * 100.0) : 100.0)
+                  << "% ok (" << this->nb_tests_ << " tests: ";
+    first = true;
+    if (this->nb_tests_ != this->test_failed_) {
+      _xbt_test_out << (first ? "" : ", ") << (this->nb_tests_ - this->test_failed_) << " ok";
+      first = false;
     }
-    if (suite->test_failed) {
-      fprintf(stderr, "%s%d failed", (first ? "" : ", "), suite->test_failed);
-      first = 0;
+    if (this->test_failed_) {
+      _xbt_test_out << (first ? "" : ", ") << this->test_failed_ << " failed";
+      first = false;
     }
-    if (suite->test_ignore) {
-      fprintf(stderr, "%s%d ignored", (first ? "" : "; "), suite->test_ignore);
-      first = 0;
+    if (this->test_ignore_) {
+      _xbt_test_out << (first ? "" : "; ") << this->test_ignore_ << " ignored";
+      first = false;
     }
-    if (suite->test_expect) {
-      fprintf(stderr, "%s%d expected to fail", (first ? "" : "; "), suite->test_expect);
+    if (this->test_expect_) {
+      _xbt_test_out << (first ? "" : "; ") << this->test_expect_ << " expected to fail";
     }
-    fprintf(stderr, ")\n");
+    _xbt_test_out << ")\n";
   }
-  return suite->unit_failed;
+  return this->unit_failed_;
 }
 
 static void apply_selection(char *selection)
 {
-  /* for the parsing */
-  char *sel = selection;
-  int done = 0;
-  char dir[STRLEN]; /* the directive */
-  /* iterators */
-  unsigned int it_suite;
-  xbt_test_suite_t suite;
-
-  char suitename[STRLEN];
-  char unitname[STRLEN];
-
   if (not selection || selection[0] == '\0')
     return;
 
+  /* for the parsing */
+  std::string sel = selection;
+  bool done       = false;
+  std::string dir; /* the directive */
+  std::string suitename;
+  std::string unitname;
+
   /* First apply the selection */
+  size_t p0 = 0;
   while (not done) {
-    int enabling = 1;
+    bool enabling = true;
 
-    char *p = strchr(sel, ',');
-    if (p) {
-      snprintf(dir, STRLEN, "%.*s", (int)(p - sel), sel);
-      sel = p + 1;
+    size_t p = sel.find(',', p0);
+    if (p != std::string::npos) {
+      dir = sel.substr(p0, p - p0);
+      p0  = p + 1;
     } else {
-      snprintf(dir, STRLEN, "%s", sel);
-      done = 1;
+      dir  = sel.substr(p0);
+      done = true;
     }
 
     if (dir[0] == '-') {
-      enabling = 0;
-      memmove(dir, dir + 1, strlen(dir));
+      enabling = false;
+      dir.erase(0, 1);
     }
     if (dir[0] == '+') {
-      enabling = 1;
-      memmove(dir, dir + 1, strlen(dir));
+      enabling = true;
+      dir.erase(0, 1);
     }
 
-    p = strchr(dir, ':');
-    if (p) {
-      snprintf(suitename, STRLEN, "%.*s", (int)(p - dir), dir);
-      snprintf(unitname, STRLEN, "%s", p + 1);
+    p = dir.find(':');
+    if (p != std::string::npos) {
+      suitename = dir.substr(0, p);
+      unitname  = dir.substr(p + 1);
     } else {
-      snprintf(suitename, STRLEN, "%s", dir);
-      unitname[0] = '\0';
+      suitename = dir;
+      unitname  = "";
     }
 
     /* Deal with the specific case of 'all' pseudo serie */
-    if (not strcmp("all", suitename)) {
-      xbt_assert(unitname[0] == '\0', "The 'all' pseudo-suite does not accept any unit specification\n");
+    if (suitename == "all") {
+      xbt_assert(unitname.empty(), "The 'all' pseudo-suite does not accept any unit specification\n");
 
-      xbt_dynar_foreach(_xbt_test_suites, it_suite, suite) {
-        for (s_xbt_test_unit& unit : suite->units) {
+      for (xbt_test_suite_t& suite : _xbt_test_suites) {
+        for (s_xbt_test_unit& unit : suite->units_) {
           unit.enabled_ = enabling;
         }
-        suite->enabled = enabling;
+        suite->enabled_ = enabling;
       }
     } else {
-      unsigned int it;
-      for (it = 0; it < xbt_dynar_length(_xbt_test_suites); it++) {
-        xbt_test_suite_t thissuite =
-            xbt_dynar_get_as(_xbt_test_suites, it, xbt_test_suite_t);
-        if (not strcmp(suitename, thissuite->name)) {
+      bool suitefound = false;
+      for (xbt_test_suite_t& thissuite : _xbt_test_suites) {
+        if (suitename == thissuite->name_) {
           /* Do not disable the whole suite when we just want to disable a child */
-          if (enabling || (unitname[0] == '\0'))
-            thissuite->enabled = enabling;
+          if (enabling || unitname.empty())
+            thissuite->enabled_ = enabling;
 
-          if (unitname[0] == '\0') {
-            for (s_xbt_test_unit& unit : thissuite->units) {
+          if (unitname.empty()) {
+            for (s_xbt_test_unit& unit : thissuite->units_) {
               unit.enabled_ = enabling;
             }
           } else {              /* act on one child only */
             /* search relevant unit */
-            auto unit = std::find_if(begin(thissuite->units), end(thissuite->units),
+            auto unit = std::find_if(begin(thissuite->units_), end(thissuite->units_),
                                      [&unitname](s_xbt_test_unit const& unit) { return unit.name_ == unitname; });
-            if (unit == end(thissuite->units))
-              xbt_die("Suite '%s' has no unit of name '%s'. Cannot apply the selection\n", suitename, unitname);
+            if (unit == end(thissuite->units_))
+              xbt_die("Suite '%s' has no unit of name '%s'. Cannot apply the selection\n", suitename.c_str(),
+                      unitname.c_str());
             unit->enabled_ = enabling;
           }                     /* act on childs (either all or one) */
-
+          suitefound = true;
           break;                /* found the relevant serie. We are happy */
         }
       }                         /* search relevant series */
-      xbt_assert(it != xbt_dynar_length(_xbt_test_suites),
-                 "No suite of name '%s' found. Cannot apply the selection\n", suitename);
+      xbt_assert(suitefound, "No suite of name '%s' found. Cannot apply the selection\n", suitename.c_str());
     }
   }
 }
@@ -490,14 +459,11 @@ void xbt_test_dump(char *selection)
 {
   apply_selection(selection);
 
-  if (_xbt_test_suites) {
-    unsigned int it_suite;
-    xbt_test_suite_t suite;
-
-    xbt_dynar_foreach(_xbt_test_suites, it_suite, suite)
-        xbt_test_suite_dump(suite);
+  if (not _xbt_test_suites.empty()) {
+    for (xbt_test_suite_t suite : _xbt_test_suites)
+      suite->dump();
   } else {
-    printf(" No suite defined.");
+    _xbt_test_out << " No suite defined.";
   }
 }
 
@@ -505,67 +471,73 @@ int xbt_test_run(char *selection, int verbosity)
 {
   apply_selection(selection);
 
-  if (_xbt_test_suites) {
-    unsigned int it_suite;
-    xbt_test_suite_t suite;
-    int first = 1;
+  if (not _xbt_test_suites.empty()) {
+    bool first = true;
 
     /* Run all the suites */
-    xbt_dynar_foreach(_xbt_test_suites, it_suite, suite)
-      xbt_test_suite_run(suite, verbosity);
+    for (xbt_test_suite_t& suite : _xbt_test_suites)
+      if (suite)
+        suite->run(verbosity);
 
     /* Display some more statistics */
-    fprintf(stderr, "\n\n TOTAL: Suites: %.0f%% ok (%d suites: ",_xbt_test_nb_suites
-            ? ((1 - (double) _xbt_test_suite_failed / (double) _xbt_test_nb_suites) * 100.0)
-            : 100.0, _xbt_test_nb_suites);
+    _xbt_test_out.setf(std::ios::fixed);
+    _xbt_test_out.precision(0);
+    _xbt_test_out << "\n\n TOTAL: Suites: "
+                  << (_xbt_test_nb_suites ? ((1 - (double)_xbt_test_suite_failed / (double)_xbt_test_nb_suites) * 100.0)
+                                          : 100.0)
+                  << "% ok (" << _xbt_test_nb_suites << " suites: ";
     if (_xbt_test_nb_suites != _xbt_test_suite_failed) {
-      fprintf(stderr, "%d ok", _xbt_test_nb_suites - _xbt_test_suite_failed);
-      first = 0;
+      _xbt_test_out << (_xbt_test_nb_suites - _xbt_test_suite_failed) << " ok";
+      first = false;
     }
     if (_xbt_test_suite_failed) {
-      fprintf(stderr, "%s%d failed", (first ? "" : ", "), _xbt_test_suite_failed);
-      first = 0;
+      _xbt_test_out << (first ? "" : ", ") << _xbt_test_suite_failed << " failed";
+      first = false;
     }
 
     if (_xbt_test_suite_ignore) {
-      fprintf(stderr, "%s%d ignored", (first ? "" : ", "), _xbt_test_suite_ignore);
+      _xbt_test_out << (first ? "" : ", ") << _xbt_test_suite_ignore << " ignored";
     }
-    fprintf(stderr, ")\n        Units:  %.0f%% ok (%d units: ", _xbt_test_nb_units
-            ? ((1 - (double) _xbt_test_unit_failed / (double) _xbt_test_nb_units) * 100.0) : 100.0, _xbt_test_nb_units);
-    first = 1;
+    _xbt_test_out << ")\n        Units:  "
+                  << (_xbt_test_nb_units ? ((1 - (double)_xbt_test_unit_failed / (double)_xbt_test_nb_units) * 100.0)
+                                         : 100.0)
+                  << "% ok (" << _xbt_test_nb_units << " units: ";
+    first = true;
     if (_xbt_test_nb_units != _xbt_test_unit_failed) {
-      fprintf(stderr, "%d ok", _xbt_test_nb_units - _xbt_test_unit_failed);
-      first = 0;
+      _xbt_test_out << (_xbt_test_nb_units - _xbt_test_unit_failed) << " ok";
+      first = false;
     }
     if (_xbt_test_unit_failed) {
-      fprintf(stderr, "%s%d failed", (first ? "" : ", "), _xbt_test_unit_failed);
-      first = 0;
+      _xbt_test_out << (first ? "" : ", ") << _xbt_test_unit_failed << " failed";
+      first = false;
     }
     if (_xbt_test_unit_ignore) {
-      fprintf(stderr, "%s%d ignored", (first ? "" : ", "), _xbt_test_unit_ignore);
+      _xbt_test_out << (first ? "" : ", ") << _xbt_test_unit_ignore << " ignored";
     }
-    fprintf(stderr, ")\n        Tests:  %.0f%% ok (%d tests: ", _xbt_test_nb_tests
-            ? ((1 - (double) _xbt_test_test_failed / (double) _xbt_test_nb_tests) * 100.0) : 100.0, _xbt_test_nb_tests);
-    first = 1;
+    _xbt_test_out << ")\n        Tests:  "
+                  << (_xbt_test_nb_tests ? ((1 - (double)_xbt_test_test_failed / (double)_xbt_test_nb_tests) * 100.0)
+                                         : 100.0)
+                  << "% ok (" << _xbt_test_nb_tests << " tests: ";
+    first = true;
     if (_xbt_test_nb_tests != _xbt_test_test_failed) {
-      fprintf(stderr, "%d ok", _xbt_test_nb_tests - _xbt_test_test_failed);
-      first = 0;
+      _xbt_test_out << (_xbt_test_nb_tests - _xbt_test_test_failed) << " ok";
+      first = false;
     }
     if (_xbt_test_test_failed) {
-      fprintf(stderr, "%s%d failed", (first ? "" : ", "), _xbt_test_test_failed);
-      first = 0;
+      _xbt_test_out << (first ? "" : ", ") << _xbt_test_test_failed << " failed";
+      first = false;
     }
     if (_xbt_test_test_ignore) {
-      fprintf(stderr, "%s%d ignored", (first ? "" : ", "), _xbt_test_test_ignore);
-      first = 0;
+      _xbt_test_out << (first ? "" : ", ") << _xbt_test_test_ignore << " ignored";
+      first = false;
     }
     if (_xbt_test_test_expect) {
-      fprintf(stderr, "%s%d expected to fail", (first ? "" : ", "), _xbt_test_test_expect);
+      _xbt_test_out << (first ? "" : ", ") << _xbt_test_test_expect << " expected to fail";
     }
 
-    fprintf(stderr, ")\n");
+    _xbt_test_out << ")\n";
   } else {
-    fprintf(stderr, "No unit to run!\n");
+    _xbt_test_out << "No unit to run!\n";
     _xbt_test_unit_failed++;
   }
   return _xbt_test_unit_failed;
@@ -573,7 +545,9 @@ int xbt_test_run(char *selection, int verbosity)
 
 void xbt_test_exit()
 {
-  xbt_dynar_free(&_xbt_test_suites);
+  for (xbt_test_suite_t suite : _xbt_test_suites)
+    delete suite;
+  _xbt_test_suites.clear();
 }
 
 /* annotate test case with test */