/* 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
/* This is partially inspirated from the OSSP ts (Test Suite Library) */
-#include "portable.h"
+#include "src/portable.h"
-#include "xbt/sysdep.h" /* vasprintf */
+#include "xbt/sysdep.h" /* bvprintf */
#include "xbt/cunit.h"
#include "xbt/dynar.h"
{
xbt_test_suite_t suite = xbt_new0(struct s_xbt_test_suite, 1);
va_list ap;
- int vres;
if (!_xbt_test_suites)
_xbt_test_suites =
xbt_dynar_new(sizeof(xbt_test_suite_t), xbt_test_suite_free);
va_start(ap, fmt);
- vres = vasprintf(&suite->title, fmt, ap);
+ suite->title = bvprintf(fmt, ap);
suite->units =
xbt_dynar_new(sizeof(xbt_test_unit_t), &xbt_test_unit_free);
va_end(ap);
char *bufname;
va_list ap;
- int vres;
if (_xbt_test_suites)
xbt_dynar_foreach(_xbt_test_suites, it_suite, suite)
return suite;
va_start(ap, fmt);
- vres = vasprintf(&bufname, fmt, ap);
+ bufname = bvprintf(fmt, ap);
va_end(ap);
suite = xbt_test_suite_new(name, bufname, NULL);
free(bufname);
{
xbt_test_unit_t unit;
va_list ap;
- int vres;
xbt_assert(suite);
xbt_assert(func);
unit = xbt_new0(struct s_xbt_test_unit, 1);
va_start(ap, fmt);
- vres = vasprintf(&unit->title, fmt, ap);
+ unit->title = bvprintf(fmt, ap);
va_end(ap);
unit->name = (char *) name;
unit->func = func;
}
/* 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;
unsigned int it_unit, it_test, it_log;
int first = 1; /* for result pretty printing */
- int vres;
if (suite == NULL)
return 0;
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);
unit->test_expect = 0;
/* display unit title */
- vres =
- asprintf(&cp,
- " Unit: %s ......................................"
+ cp = bprintf(" Unit: %s ......................................"
"......................................", unit->title);
cp[70] = '\0';
fprintf(stderr, "%s", cp);
/* 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");
if (suite->unit_disabled) {
fprintf(stderr, "%s%d disabled", (first ? "" : ", "),
suite->unit_disabled);
- first = 0;
}
fprintf(stderr, ")\n Tests: %.0f%% ok (%d tests: ",
suite->nb_tests
if (suite->test_expect) {
fprintf(stderr, "%s%d expected to fail", (first ? "" : "; "),
suite->test_expect);
- first = 0;
}
fprintf(stderr, ")\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: ",
if (_xbt_test_suite_ignore) {
fprintf(stderr, "%s%d ignored", (first ? "" : ", "),
_xbt_test_suite_ignore);
- first = 0;
}
fprintf(stderr, ")\n Units: %.0f%% ok (%d units: ",
_xbt_test_nb_units
if (_xbt_test_unit_ignore) {
fprintf(stderr, "%s%d ignored", (first ? "" : ", "),
_xbt_test_unit_ignore);
- first = 0;
}
fprintf(stderr, ")\n Tests: %.0f%% ok (%d tests: ",
_xbt_test_nb_tests
xbt_test_unit_t unit = _xbt_test_current_unit;
xbt_test_test_t test;
va_list ap;
- int vres;
xbt_assert(unit);
xbt_assert(fmt);
test = xbt_new0(struct s_xbt_test_test, 1);
va_start(ap, fmt);
- vres = vasprintf(&test->title, fmt, ap);
+ test->title = bvprintf(fmt, ap);
va_end(ap);
test->failed = 0;
test->expected_failure = 0;
xbt_test_test_t test;
xbt_test_log_t log;
va_list ap;
- int vres;
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);
log = xbt_new(struct s_xbt_test_log, 1);
va_start(ap, fmt);
- vres = vasprintf(&log->text, fmt, ap);
+ log->text = bvprintf(fmt, ap);
va_end(ap);
log->file = file;
log->line = line;
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_test_test_t test;
xbt_test_log_t log;
va_list ap;
- int vres;
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);
log = xbt_new(struct s_xbt_test_log, 1);
va_start(ap, fmt);
- vres = vasprintf(&log->text, fmt, ap);
+ log->text = bvprintf(fmt, ap);
va_end(ap);
log->file = file;
log->line = line;
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 */