/* cunit - A little C Unit facility */
-/* Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2005-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
}
/* run test one suite */
-static int xbt_test_suite_run(xbt_test_suite_t suite)
+static int xbt_test_suite_run(xbt_test_suite_t suite, int verbosity)
{
xbt_test_unit_t unit;
xbt_test_test_t test;
int suite_len = strlen(suite->title);
int i;
- xbt_assert2(suite_len < 68,
+ xbt_assert(suite_len < 68,
"suite title \"%s\" too long (%d should be less than 68",
suite->title, suite_len);
/* Display whether this unit went well */
- if (unit->test_failed > 0 || unit->test_expect) {
+ 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");
}
}
-int xbt_test_run(char *selection)
+int xbt_test_run(char *selection, int verbosity)
{
apply_selection(selection);
/* Run all the suites */
xbt_dynar_foreach(_xbt_test_suites, it_suite, suite)
- xbt_test_suite_run(suite);
+ xbt_test_suite_run(suite, verbosity);
/* Display some more statistics */
fprintf(stderr, "\n\n TOTAL: Suites: %.0f%% ok (%d suites: ",
xbt_assert(unit);
xbt_assert(fmt);
- xbt_assert1(xbt_dynar_length(_xbt_test_current_unit->tests),
+ xbt_assert(xbt_dynar_length(_xbt_test_current_unit->tests),
"Test failed even before being declared (broken unit: %s)",
unit->title);
void xbt_test_expect_failure(void)
{
xbt_test_test_t test;
- xbt_assert1(xbt_dynar_length(_xbt_test_current_unit->tests),
+ 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);
test =
{
xbt_test_test_t test;
- xbt_assert1(xbt_dynar_length(_xbt_test_current_unit->tests),
+ xbt_assert(xbt_dynar_length(_xbt_test_current_unit->tests),
"Test skiped even before being declared (broken unit: %s)",
_xbt_test_current_unit->title);
xbt_assert(unit);
xbt_assert(fmt);
- xbt_assert1(xbt_dynar_length(_xbt_test_current_unit->tests),
+ xbt_assert(xbt_dynar_length(_xbt_test_current_unit->tests),
"Test logged into even before being declared (broken test unit: %s)",
unit->title);
XBT_TEST_UNIT("expect", test_expected_failure, "expected failures")
{
- xbt_test_add0("Skipped test");
+ xbt_test_add("Skipped test");
xbt_test_skip();
- xbt_test_add2("%s %s", "EXPECTED", "FAILURE");
+ xbt_test_add("%s %s", "EXPECTED", "FAILURE");
xbt_test_expect_failure();
- xbt_test_log2("%s %s", "Test", "log");
- xbt_test_fail0("EXPECTED FAILURE");
+ xbt_test_log("%s %s", "Test", "log");
+ xbt_test_fail("EXPECTED FAILURE");
}
#endif /* SIMGRID_TEST */