X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/77bbf3027c4240a2e833209a3a3f186589da8577..c4de3b4124781ae066e774981efb0a6ef8c857ed:/src/xbt/cunit.cpp

diff --git a/src/xbt/cunit.cpp b/src/xbt/cunit.cpp
index 7cdedb856c..5076c2ee9f 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-2019. 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. */
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
+#include "simgrid/Exception.hpp"
 #include <xbt/cunit.h>
-#include <xbt/ex.hpp>
 #include <xbt/string.hpp>
 
 /* output stream to use everywhere */
@@ -322,10 +322,11 @@ int s_xbt_test_suite::run(int verbosity)
   if (this->enabled_) {
     bool first = true; /* for result pretty printing */
 
-    _xbt_test_out << " ====================================================================="
-                  << (this->nb_units_ ? (this->unit_failed_ ? "== FAILED" : "====== OK")
-                                      : (this->unit_disabled_ ? " DISABLED" : "==== SKIP"))
-                  << "\n";
+    _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: "
@@ -578,9 +579,10 @@ void _xbt_test_fail(const char *file, int line, const char *fmt, ...)
   test.failed_ = true;
 }
 
-void xbt_test_exception(xbt_ex_t e)
+void xbt_test_exception(xbt_ex e)
 {
-  _xbt_test_fail(e.throwPoint().file, e.throwPoint().line, "Exception %s raised: %s", xbt_ex_catname(e.category), e.what());
+  _xbt_test_fail(e.throw_point().file_, e.throw_point().line_, "Exception %s raised: %s", xbt_ex_catname(e.category),
+                 e.what());
 }
 
 void xbt_test_expect_failure()