organicmaps/libexpat
13
Fork 0
mirror of https://github.com/libexpat/libexpat.git synced 2025-04-05 13:14:59 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

tests: Rename fail_unless to assert_true for clarity

Browse source
This commit is contained in:
Sebastian Pipping 2023-10-20 23:37:32 +02:00
parent cce19de59f
commit da64791736
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
expat/tests/basic_tests.c
View file

@ -1855,16 +1855,16 @@ START_TEST(test_default_current) {
while (cdata_len_remaining > 0) {
const struct handler_record_entry *c_entry
= handler_record_get(&storage, i++);
fail_unless(strcmp(c_entry->name, "record_cdata_handler") == 0);
fail_unless(c_entry->arg > 0);
fail_unless(c_entry->arg <= cdata_len_remaining);
assert_true(strcmp(c_entry->name, "record_cdata_handler") == 0);
assert_true(c_entry->arg > 0);
assert_true(c_entry->arg <= cdata_len_remaining);
cdata_len_remaining -= c_entry->arg;
// default handler must follow, with the exact same len argument.
assert_record_handler_called(&storage, i++, "record_default_handler",
c_entry->arg);
}
assert_record_handler_called(&storage, i++, "record_default_handler", 6);
fail_unless(storage.count == i);
assert_true(storage.count == i);
}
/* Again, without the defaulting */
@ -1886,13 +1886,13 @@ START_TEST(test_default_current) {
while (cdata_len_remaining > 0) {
const struct handler_record_entry *c_entry
= handler_record_get(&storage, i++);
fail_unless(strcmp(c_entry->name, "record_cdata_nodefault_handler") == 0);
fail_unless(c_entry->arg > 0);
fail_unless(c_entry->arg <= cdata_len_remaining);
assert_true(strcmp(c_entry->name, "record_cdata_nodefault_handler") == 0);
assert_true(c_entry->arg > 0);
assert_true(c_entry->arg <= cdata_len_remaining);
cdata_len_remaining -= c_entry->arg;
}
assert_record_handler_called(&storage, i++, "record_default_handler", 6);
fail_unless(storage.count == i);
assert_true(storage.count == i);
}
/* Now with an internal entity to complicate matters */
@ -1928,7 +1928,7 @@ START_TEST(test_default_current) {
assert_record_handler_called(&storage, 16, "record_default_handler", 5);
assert_record_handler_called(&storage, 17, "record_default_handler", 8);
assert_record_handler_called(&storage, 18, "record_default_handler", 6);
fail_unless(storage.count == 19);
assert_true(storage.count == 19);
}
/* Again, with a skip handler */
@ -1965,7 +1965,7 @@ START_TEST(test_default_current) {
assert_record_handler_called(&storage, 16, "record_default_handler", 5);
assert_record_handler_called(&storage, 17, "record_skip_handler", 0);
assert_record_handler_called(&storage, 18, "record_default_handler", 6);
fail_unless(storage.count == 19);
assert_true(storage.count == 19);
}
/* This time, allow the entity through */
@ -2001,7 +2001,7 @@ START_TEST(test_default_current) {
assert_record_handler_called(&storage, 17, "record_cdata_handler", 1);
assert_record_handler_called(&storage, 18, "record_default_handler", 1);
assert_record_handler_called(&storage, 19, "record_default_handler", 6);
fail_unless(storage.count == 20);
assert_true(storage.count == 20);
}
/* Finally, without passing the cdata to the default handler */
@ -2037,7 +2037,7 @@ START_TEST(test_default_current) {
assert_record_handler_called(&storage, 17, "record_cdata_nodefault_handler",
1);
assert_record_handler_called(&storage, 18, "record_default_handler", 6);
fail_unless(storage.count == 19);
assert_true(storage.count == 19);
}
}
END_TEST

2
expat/tests/handlers.c
View file

@ -1658,7 +1658,7 @@ static void
record_call(struct handler_record_list *const rec, const char *funcname,
const int arg) {
const int max_entries = sizeof(rec->entries) / sizeof(rec->entries[0]);
fail_unless(rec->count < max_entries);
assert_true(rec->count < max_entries);
struct handler_record_entry *const e = &rec->entries[rec->count++];
e->name = funcname;
e->arg = arg;

4
expat/tests/handlers.h
View file

@ -515,8 +515,8 @@ _handler_record_get(const struct handler_record_list *storage, const int index,
do { \
const struct handler_record_entry *e \
= handler_record_get(storage, index); \
fail_unless(strcmp(e->name, expected_name) == 0); \
fail_unless(e->arg == (expected_arg)); \
assert_true(strcmp(e->name, expected_name) == 0); \
assert_true(e->arg == (expected_arg)); \
} while (0)
/* Entity Declaration Handlers */

2
expat/tests/minicheck.h
View file

@ -84,7 +84,7 @@ extern "C" {
void PRINTF_LIKE(1, 2) set_subtest(char const *fmt, ...);
# define fail(msg) _assert_true(0, __FILE__, __LINE__, msg)
# define fail_unless(cond) \
# define assert_true(cond) \
_assert_true((cond), __FILE__, __LINE__, "check failed: " #cond)
typedef void (*tcase_setup_function)(void);