Avoid unsafe things

[simgrid.git] / src / xbt / cunit.cpp

diff --git a/src/xbt/cunit.cpp b/src/xbt/cunit.cpp
index 3be162f..d98ac9d 100644 (file)
--- a/src/xbt/cunit.cpp
+++ b/src/xbt/cunit.cpp
@@ -233,7 +233,6 @@ void xbt_test_suite_push(xbt_test_suite_t suite, const char *name, ts_test_cb_t
   unit->tests = xbt_dynar_new(sizeof(xbt_test_test_t), xbt_test_test_free);
 
   xbt_dynar_push(suite->units, &unit);
-  return;
 }
 
 /* run test one suite */
@@ -583,7 +582,7 @@ int xbt_test_run(char *selection, int verbosity)
             ? ((1 - (double) _xbt_test_unit_failed / (double) _xbt_test_nb_units) * 100.0) : 100.0, _xbt_test_nb_units);
     first = 1;
     if (_xbt_test_nb_units != _xbt_test_unit_failed) {
-      fprintf(stderr, "%s%d ok", (first ? "" : ", "), _xbt_test_nb_units - _xbt_test_unit_failed);
+      fprintf(stderr, "%d ok", _xbt_test_nb_units - _xbt_test_unit_failed);
       first = 0;
     }
     if (_xbt_test_unit_failed) {
@@ -597,7 +596,7 @@ int xbt_test_run(char *selection, int verbosity)
             ? ((1 - (double) _xbt_test_test_failed / (double) _xbt_test_nb_tests) * 100.0) : 100.0, _xbt_test_nb_tests);
     first = 1;
     if (_xbt_test_nb_tests != _xbt_test_test_failed) {
-      fprintf(stderr, "%s%d ok", (first ? "" : ", "), _xbt_test_nb_tests - _xbt_test_test_failed);
+      fprintf(stderr, "%d ok", _xbt_test_nb_tests - _xbt_test_test_failed);
       first = 0;
     }
     if (_xbt_test_test_failed) {
@@ -620,7 +619,7 @@ int xbt_test_run(char *selection, int verbosity)
   return _xbt_test_unit_failed;
 }
 
-void xbt_test_exit(void)
+void xbt_test_exit()
 {
   xbt_dynar_free(&_xbt_test_suites);
 }
@@ -643,7 +642,6 @@ void _xbt_test_add(const char *file, int line, const char *fmt, ...)
   test->line = line;
   test->logs = xbt_dynar_new(sizeof(xbt_test_log_t), xbt_test_log_free);
   xbt_dynar_push(unit->tests, &test);
-  return;
 }
 
 /* annotate test case with log message and failure */
@@ -670,10 +668,10 @@ void _xbt_test_fail(const char *file, int line, const char *fmt, ...)
 
 void xbt_test_exception(xbt_ex_t e)
 {
-  _xbt_test_fail(e.file, e.line, "Exception %s raised: %s", xbt_ex_catname(e.category), e.what());
+  _xbt_test_fail(e.throwPoint().file, e.throwPoint().line, "Exception %s raised: %s", xbt_ex_catname(e.category), e.what());
 }
 
-void xbt_test_expect_failure(void)
+void xbt_test_expect_failure()
 {
   xbt_assert(xbt_dynar_length(_xbt_test_current_unit->tests),
       "Cannot expect the failure of a test before declaring it (broken unit: %s)", _xbt_test_current_unit->title);
@@ -681,7 +679,7 @@ void xbt_test_expect_failure(void)
   test->expected_failure = 1;
 }
 
-void xbt_test_skip(void)
+void xbt_test_skip()
 {
   xbt_assert(xbt_dynar_length(_xbt_test_current_unit->tests),
       "Test skipped even before being declared (broken unit: %s)", _xbt_test_current_unit->title);