/* 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. */
#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 */
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: "
void xbt_test_exception(xbt_ex_t 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()