xbt_dynar_t tests; /* of xbt_test_test_t */
int nb_tests;
- int test_failed, test_ignore, test_expect;
+ int test_failed;
+ int test_ignore;
+ int test_expect;
};
static void xbt_test_unit_dump(xbt_test_unit_t unit)
char *title;
xbt_dynar_t units; /* of xbt_test_unit_t */
- int nb_tests, nb_units;
- int test_failed, test_ignore, test_expect;
- int unit_failed, unit_ignore, unit_disabled;
+ int nb_tests;
+ int nb_units;
+ int test_failed;
+ int test_ignore;
+ int test_expect;
+ int unit_failed;
+ int unit_ignore;
+ int unit_disabled;
};
/* destroy test suite */
if (_xbt_test_suites)
xbt_dynar_foreach(_xbt_test_suites, it_suite, suite)
- if (!strcmp(suite->name, name))
- return suite;
+ if (not strcmp(suite->name, name))
+ return suite;
va_start(ap, fmt);
bufname = bvprintf(fmt, ap);
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 */
const char *file;
int line;
char *cp;
- unsigned int it_unit, it_test, it_log;
+ unsigned int it_unit;
+ unsigned int it_test;
+ unsigned int it_log;
int first = 1; /* for result pretty printing */
return 0;
/* suite title pretty-printing */
- {
- char suite_title[81];
- int suite_len = strlen(suite->title);
- int i;
-
- xbt_assert(suite_len < 68, "suite title \"%s\" too long (%d should be less than 68", suite->title, suite_len);
-
- suite_title[0] = ' ';
- for (i = 1; i < 80; i++)
- suite_title[i] = '=';
- suite_title[i++] = '\n';
- suite_title[80] = '\0';
-
- snprintf(suite_title + 40 - (suite_len + 4) / 2, 81-(40 - (suite_len + 4)/ 2), "[ %s ]", suite->title);
- suite_title[40 + (suite_len + 5) / 2] = '=';
- if (!suite->enabled)
- snprintf(suite_title + 70, 11, " DISABLED ");
- fprintf(stderr, "\n%s\n", suite_title);
- }
+ char suite_title[81];
+ int suite_len = strlen(suite->title);
+
+ xbt_assert(suite_len < 68, "suite title \"%s\" too long (%d should be less than 68", suite->title, suite_len);
+
+ suite_title[0] = ' ';
+ for (int i = 1; i < 79; i++)
+ suite_title[i] = '=';
+ suite_title[79] = '\n';
+ suite_title[80] = '\0';
+
+ snprintf(suite_title + 40 - (suite_len + 4) / 2, 81 - (40 - (suite_len + 4) / 2), "[ %s ]", suite->title);
+ suite_title[40 + (suite_len + 5) / 2] = '=';
+ if (not suite->enabled)
+ snprintf(suite_title + 70, 11, " DISABLED ");
+ fprintf(stderr, "\n%s\n", suite_title);
if (suite->enabled) {
/* iterate through all tests */
} else {
unit->nb_tests++;
- if (test->failed && !test->expected_failure)
+ if (test->failed && not test->expected_failure)
unit->test_failed++;
- if (!test->failed && test->expected_failure)
+ if (not test->failed && test->expected_failure)
unit->test_failed++;
if (test->expected_failure)
unit->test_expect++;
xbt_dynar_foreach(unit->tests, it_test, test) {
file = (test->file != nullptr ? test->file : unit->file);
line = (test->line != 0 ? test->line : unit->line);
- fprintf(stderr, " %s: %s [%s:%d]\n", (test->ignored ? " SKIP" : (test->expected_failure
- ? (test-> failed ? "EFAIL" : "EPASS") : (test->failed ? " FAIL" : " PASS"))),test->title, file, line);
+ const char* resname;
+ if (test->ignored)
+ resname = " SKIP";
+ else if (test->expected_failure) {
+ if (test->failed)
+ resname = "EFAIL";
+ else
+ resname = "EPASS";
+ } else {
+ if (test->failed)
+ resname = " FAIL";
+ else
+ resname = " PASS";
+ }
+ fprintf(stderr, " %s: %s [%s:%d]\n", resname, test->title, file, line);
- if ((test->expected_failure && !test->failed) || (!test->expected_failure && test->failed)) {
+ if ((test->expected_failure && not test->failed) || (not test->expected_failure && test->failed)) {
xbt_dynar_foreach(test->logs, it_log, log) {
file = (log->file != nullptr ? log->file : file);
line = (log->line != 0 ? log->line : line);
} else {
fprintf(stderr, "\n");
}
- } else if (!unit->enabled) {
+ } else if (not unit->enabled) {
fprintf(stderr, " disabled\n"); /* no test were run */
} else if (unit->nb_tests) {
fprintf(stderr, "...... ok\n"); /* successful */
suite->nb_units++;
if (unit->test_failed)
suite->unit_failed++;
- } else if (!unit->enabled) {
+ } else if (not unit->enabled) {
suite->unit_disabled++;
} else {
suite->unit_ignore++;
_xbt_test_nb_suites++;
if (suite->test_failed)
_xbt_test_suite_failed++;
- } else if (!suite->enabled) {
+ } else if (not suite->enabled) {
_xbt_test_suite_disabled++;
} else {
_xbt_test_suite_ignore++;
char suitename[512];
char unitname[512];
- if (!selection || selection[0] == '\0')
+ if (not selection || selection[0] == '\0')
return;
/*printf("Test selection: %s\n", selection); */
/* First apply the selection */
- while (!done) {
+ while (not done) {
int enabling = 1;
char *p = strchr(sel, ',');
}
/* Deal with the specific case of 'all' pseudo serie */
- if (!strcmp("all", suitename)) {
+ if (not strcmp("all", suitename)) {
xbt_assert(unitname[0] == '\0', "The 'all' pseudo-suite does not accept any unit specification\n");
xbt_dynar_foreach(_xbt_test_suites, it_suite, suite) {
for (it = 0; it < xbt_dynar_length(_xbt_test_suites); it++) {
xbt_test_suite_t thissuite =
xbt_dynar_get_as(_xbt_test_suites, it, xbt_test_suite_t);
- if (!strcmp(suitename, thissuite->name)) {
+ if (not strcmp(suitename, thissuite->name)) {
/* Do not disable the whole suite when we just want to disable a child */
if (enabling || (unitname[0] == '\0'))
thissuite->enabled = enabling;
it2_unit < xbt_dynar_length(thissuite->units);
it2_unit++) {
xbt_test_unit_t thisunit = xbt_dynar_get_as(thissuite->units, it2_unit, xbt_test_unit_t);
- if (!strcmp(thisunit->name, unitname)) {
+ if (not strcmp(thisunit->name, unitname)) {
thisunit->enabled = enabling;
break;
}
? ((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) {
? ((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) {
return _xbt_test_unit_failed;
}
-void xbt_test_exit(void)
+void xbt_test_exit()
{
xbt_dynar_free(&_xbt_test_suites);
}
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 */
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);
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);
