From: Kevin Day Date: Tue, 15 Sep 2026 01:06:28 +0000 (-0500) Subject: Progress: Make some of the unit tests messages more consistent. X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=e79c51654403c2d2357db7720b778003885b1e9d;p=fll Progress: Make some of the unit tests messages more consistent. --- diff --git a/level_1/fl_fss/tests/unit/c/test-fss-basic_content_read.c b/level_1/fl_fss/tests/unit/c/test-fss-basic_content_read.c index 601748bb6..511fec3ef 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-basic_content_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-basic_content_read.c @@ -106,13 +106,12 @@ void test__fl_fss_basic_content_read__works(void **void_state) { f_range_t found_object = f_range_t_initialize; f_ranges_t found = f_ranges_t_initialize; uint8_t quote = 0; - f_number_unsigned_t line = 0; f_number_unsigneds_t delimits = f_number_unsigneds_t_initialize; f_string_dynamic_t result_string = f_string_dynamic_t_initialize; f_string_dynamic_t delimit_string = f_string_dynamic_t_initialize; f_status_t status_object = F_okay; - for (;; ++line) { + for (f_number_unsigned_t line = 0; ; ++line) { max = 255; @@ -128,7 +127,7 @@ void test__fl_fss_basic_content_read__works(void **void_state) { result = getline(&line_content, &max, file_contents); if (!result) { - printf("[ -------> ] --- [00] Failure with line (%lu) '%s', result = %zd, for loading file='./data/tests/%s/%s-%s.txt'.\n", line, line_content, result, "strings", "basic", "all_read"); + printf("[ -------> ] --- [00] Failure with getline(), line (%lu) '%s', result = %zd, for loading file='./data/tests/%s/%s-%s.txt'.\n", line, line_content, result, "strings", "basic", "all_read"); } assert_return_code(result, 0); @@ -145,7 +144,7 @@ void test__fl_fss_basic_content_read__works(void **void_state) { fl_fss_basic_object_read(buffer_string, &range, &found_object, "e, &delimits, &state); if (!(state.status == F_fss_found_object || state.status == F_fss_found_object_content_not)) { - printf("[ -------> ] --- [01] Failure with line (%lu) '%s', status = %u, expecting %u or %u.\n", line, line_content, state.status, F_fss_found_object, F_fss_found_object_content_not); + printf("[ -------> ] --- [01] Failure with fl_fss_basic_object_read(), line (%lu) '%s', status = %u, expecting %u or %u.\n", line, line_content, state.status, F_fss_found_object, F_fss_found_object_content_not); } assert_true(state.status == F_fss_found_object || state.status == F_fss_found_object_content_not); @@ -157,14 +156,14 @@ void test__fl_fss_basic_content_read__works(void **void_state) { if (status_object == F_fss_found_object) { if (state.status != F_fss_found_content) { - printf("[ -------> ] --- [02] Failure with line (%lu) '%s', status = %u, expecting %u.\n", line, line_content, state.status, F_fss_found_content); + printf("[ -------> ] --- [02] Failure with fl_fss_basic_content_read(), with line %lu '%s', status = %u, expecting %u.\n", line, line_content, state.status, F_fss_found_content); } assert_int_equal(state.status, F_fss_found_content); } else { if (state.status != F_data_not) { - printf("[ -------> ] --- [03] Failure with line (%lu) '%s', status = %u, expecting %u.\n", line, line_content, state.status, F_data_not); + printf("[ -------> ] --- [03] Failure with fl_fss_basic_content_read(), with line %lu '%s', status = %u, expecting %u.\n", line, line_content, state.status, F_data_not); } assert_int_equal(state.status, F_data_not); @@ -172,7 +171,7 @@ void test__fl_fss_basic_content_read__works(void **void_state) { if (state.status == F_fss_found_content) { if (!found.used) { - printf("[ -------> ] --- [04] Failure with line (%lu) '%s', found.used = %lu, expecting found.used <> 0.\n", line, line_content, found.used); + printf("[ -------> ] --- [04] Failure with fl_fss_basic_content_read(), with line %lu '%s', found.used = %lu, expecting found.used <> 0.\n", line, line_content, found.used); } assert_true(found.used); @@ -181,7 +180,7 @@ void test__fl_fss_basic_content_read__works(void **void_state) { const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); if (status != F_okay) { - printf("[ -------> ] --- [05] Failure with line (%lu) '%s', status = %u, expecting %u.\n", line, line_content, state.status, F_okay); + printf("[ -------> ] --- [05] Failure with f_string_dynamic_append(), with line %lu '%s', status = %u, expecting %u.\n", line, line_content, state.status, F_okay); } assert_int_equal(status, F_okay); @@ -192,7 +191,7 @@ void test__fl_fss_basic_content_read__works(void **void_state) { f_fss_apply_delimit(delimits, &delimit_string, &state); if (state.status != F_okay) { - printf("[ -------> ] --- [06] Failure with line (%lu) '%s', status = %u, expecting %u.\n", line, line_content, state.status, F_okay); + printf("[ -------> ] --- [06] Failure with f_fss_apply_delimit(), with line %lu '%s', status = %u, expecting %u.\n", line, line_content, state.status, F_okay); } assert_int_equal(state.status, F_okay); @@ -201,7 +200,7 @@ void test__fl_fss_basic_content_read__works(void **void_state) { const f_status_t status = f_string_dynamic_partial_append_nulless(delimit_string, found.array[0], &result_string); if (!(status == F_okay || status == F_data_not_eos)) { - printf("[ -------> ] --- [07] Failure with line (%lu) '%s', status = %u, expecting %u or %u.\n", line, line_content, state.status, F_okay, F_data_not_eos); + printf("[ -------> ] --- [07] Failure with f_string_dynamic_partial_append_nulless(), with line %lu '%s', status = %u, expecting %u or %u.\n", line, line_content, state.status, F_okay, F_data_not_eos); } assert_true(status == F_okay || status == F_data_not_eos); @@ -211,35 +210,35 @@ void test__fl_fss_basic_content_read__works(void **void_state) { const f_status_t status = f_string_dynamic_terminate_after(&result_string); if (status != F_okay) { - printf("[ -------> ] --- [08] Failure with line (%lu) '%s', status = %u, expecting %u.\n", line, line_content, state.status, F_okay); + printf("[ -------> ] --- [08] Failure with f_string_dynamic_terminate_after(), with line %lu '%s', status = %u, expecting %u.\n", line, line_content, state.status, F_okay); } assert_int_equal(status, F_okay); } - if (state.status != F_okay) { - printf("[ -------> ] --- [09] Failure with line (%lu) '%s', '%s' does not match '%s', line_content.\n", line, line_content, result_string.string, line_content); + if (strcmp(result_string.string, line_content)) { + printf("[ -------> ] --- [09] Failure with line %lu, strings do not match.\n", line); } assert_string_equal(result_string.string, line_content); } else { if (found.used) { - printf("[ -------> ] --- [10] Failure with line (%lu) '%s', found.used = %lu, expecting found.used == 0.\n", line, line_content, found.used); + printf("[ -------> ] --- [10] Failure with line %lu '%s', found.used = %lu, expecting found.used == 0.\n", line, line_content, found.used); } assert_true(!found.used); } - if (line_string) free(line_string); if (line_content) free(line_content); + if (line_string) free(line_string); if (result_string.string) free(result_string.string); if (delimit_string.string) free(delimit_string.string); if (delimits.array) free(delimits.array); if (found.array) free(found.array); - line_string = 0; line_content = 0; + line_string = 0; result_string.string = 0; result_string.used = 0; result_string.size = 0; @@ -259,8 +258,8 @@ void test__fl_fss_basic_content_read__works(void **void_state) { if (delimits.array) free(delimits.array); if (found.array) free(found.array); - if (line_string) free(line_string); if (line_content) free(line_content); + if (line_string) free(line_string); if (result_string.string) free(result_string.string); if (delimit_string.string) free(delimit_string.string); } @@ -320,7 +319,7 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { result = getline(&line_content, &max, file_contents); if (result == -1) { - printf("[ -------> ] --- [00] Failure loading line line %lu for file './data/tests/strings/extended-combining_read.txt', result = %lu.\n", line, result); + printf("[ -------> ] --- [00] Failure with getline(), line %lu for file './data/tests/strings/extended-combining_read.txt', result = %lu.\n", line, result); } assert_return_code(result, 0); @@ -340,7 +339,7 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { // When matches is 2, then this matches both object and content. if (matches == 2) { if (!(state.status == F_fss_found_object)) { - printf("[ -------> ] --- [01] Failure with line (%lu) '%s', matches=%d, status=%u, expected %u.\n", line, line_content, matches, state.status, F_fss_found_object); + printf("[ -------> ] --- [01] Failure with fl_fss_basic_object_read(), with line %lu '%s', matches=%d, status=%u, expected %u.\n", line, line_content, matches, state.status, F_fss_found_object); } assert_true(state.status == F_fss_found_object); @@ -349,7 +348,7 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { // When matches is 1, then this matches only object. else { if (!(state.status == F_fss_found_object_content_not)) { - printf("[ -------> ] --- [02] Failure with line (%lu) '%s', matches=%d, status=%u, expected %u.\n", line, line_content, matches, state.status, F_fss_found_object_content_not); + printf("[ -------> ] --- [02] Failure with fl_fss_basic_object_read(), with line %lu '%s', matches=%d, status=%u, expected %u.\n", line, line_content, matches, state.status, F_fss_found_object_content_not); } assert_true(state.status == F_fss_found_object_content_not); @@ -368,15 +367,15 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { fl_fss_basic_content_read(buffer_string, &range, &found, &delimits, &state); if (status_object == F_fss_found_object) { - if (status_object != F_fss_found_object) { - printf("[ -------> ] --- [04] Failure with line (%lu) '%s', expected %u.\n", line, line_content, F_fss_found_object); + if (state.status != F_fss_found_content) { + printf("[ -------> ] --- [04] Failure with fl_fss_basic_content_read(), with line %lu '%s', expected %u.\n", line, line_content, F_fss_found_content); } assert_int_equal(state.status, F_fss_found_content); } else { if (state.status != F_data_not) { - printf("[ -------> ] --- [05] Failure with line (%lu) '%s', expected %u.\n", line, line_content, F_data_not); + printf("[ -------> ] --- [05] Failure with fl_fss_basic_content_read(), with line %lu '%s', expected %u.\n", line, line_content, F_data_not); } assert_int_equal(state.status, F_data_not); @@ -385,7 +384,7 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { if (matches == 2) { if (state.status == F_fss_found_content) { if (!found.used) { - printf("[ -------> ] --- [06] Failure with line (%lu) '%s', expected found.used <> 0.\n", line, line_content); + printf("[ -------> ] --- [06] Failure with fl_fss_basic_content_read(), with line %lu '%s', expected found.used <> 0.\n", line, line_content); } assert_true(found.used); @@ -394,7 +393,7 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); if (status != F_okay) { - printf("[ -------> ] --- [07] Failure with line (%lu) '%s', expected %u.\n", line, line_content, F_okay); + printf("[ -------> ] --- [07] Failure with f_string_dynamic_append(), with line %lu '%s', expected %u.\n", line, line_content, F_okay); } assert_int_equal(status, F_okay); @@ -403,13 +402,18 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { state.status = F_none; f_fss_apply_delimit(delimits, &delimit_string, &state); + + if (state.status != F_okay) { + printf("[ -------> ] --- [08] Failure with f_fss_apply_delimit(), with line %lu '%s', expected %u.\n", line, line_content, F_okay); + } + assert_int_equal(state.status, F_okay); { const f_status_t status = f_string_dynamic_partial_append_nulless(delimit_string, found.array[0], &result_string); if (!(status == F_okay || status == F_data_not_eos)) { - printf("[ -------> ] --- [08] Failure with line (%lu) '%s', status=%u, expected %u or %#0x.\n", line, line_content, status, F_okay, F_data_not_eos); + printf("[ -------> ] --- [09] Failure with f_string_dynamic_partial_append_nulless(), with line %lu '%s', status=%u, expected %u or %#0x.\n", line, line_content, status, F_okay, F_data_not_eos); } assert_true(status == F_okay || status == F_data_not_eos); @@ -419,38 +423,38 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { const f_status_t status = f_string_dynamic_terminate_after(&result_string); if (status != F_okay) { - printf("[ -------> ] --- [09] Failure with line (%lu) '%s', expected %u.\n", line, line_content, F_okay); + printf("[ -------> ] --- [10] Failure with f_string_dynamic_terminate_after(), Failure with line %lu '%s', expected %u.\n", line, line_content, F_okay); } assert_int_equal(status, F_okay); } if (strcmp((const char *) result_string.string, (const char *) line_content)) { - printf("[ -------> ] --- [10] Failure with line (%lu) '%s', got '%s', expected '%s'.\n", line, line_content, result_string.string, line_content); + printf("[ -------> ] --- [11] Failure with line %lu, strings do not match.\n", line); } assert_string_equal(result_string.string, line_content); } else { if (found.used) { - printf("[ -------> ] --- [11] Failure with line (%lu) '%s', expected found.used == 0.\n", line, line_content); + printf("[ -------> ] --- [12] Failure with fl_fss_basic_content_read(), with line %lu '%s', expected found.used == 0.\n", line, line_content); } assert_true(!found.used); } } - if (line_string) free(line_string); if (line_content) free(line_content); if (line_matches) free(line_matches); + if (line_string) free(line_string); if (result_string.string) free(result_string.string); if (delimit_string.string) free(delimit_string.string); if (delimits.array) free(delimits.array); if (found.array) free(found.array); - line_string = 0; line_content = 0; line_matches = 0; + line_string = 0; result_string.string = 0; result_string.used = 0; result_string.size = 0; @@ -471,9 +475,9 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { if (delimits.array) free(delimits.array); if (found.array) free(found.array); - if (line_string) free(line_string); if (line_content) free(line_content); if (line_matches) free(line_matches); + if (line_string) free(line_string); if (result_string.string) free(result_string.string); if (delimit_string.string) free(delimit_string.string); } diff --git a/level_1/fl_fss/tests/unit/c/test-fss-basic_list_content_read.c b/level_1/fl_fss/tests/unit/c/test-fss-basic_list_content_read.c index d6cfe025c..091134979 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-basic_list_content_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-basic_list_content_read.c @@ -334,6 +334,7 @@ void test__fl_fss_basic_list_content_read__works_using_combining(void **void_sta { // Note: These files are required to have the same number of lines and each line should probably be at max 255 characters. + FILE *file_matches = data__file_open__named("matches", "basic_list", "combining_read"); FILE *file_strings = data__file_open__named("strings", "basic_list", "combining_read"); FILE *file_contents[] = { @@ -345,6 +346,7 @@ void test__fl_fss_basic_list_content_read__works_using_combining(void **void_sta data__file_open__named_at("contents", "basic_list", "combining_read", 5), }; + assert_non_null(file_matches); assert_non_null(file_strings); assert_non_null(file_contents[0]); assert_non_null(file_contents[1]); @@ -353,7 +355,9 @@ void test__fl_fss_basic_list_content_read__works_using_combining(void **void_sta assert_non_null(file_contents[4]); assert_non_null(file_contents[5]); + int matches = 0; size_t max = 0; + char *line_matches = 0; char *line_string = 0; char *line_content[] = { 0, @@ -379,7 +383,14 @@ void test__fl_fss_basic_list_content_read__works_using_combining(void **void_sta f_string_dynamic_t delimit_string = f_string_dynamic_t_initialize; f_status_t status_object = F_okay; - for (;;) { + for (f_number_unsigned_t line = 0; ; ++line) { + + max = 255; + + result = getline(&line_matches, &max, file_matches); + if (result == -1) break; + + matches = atoi(line_matches); max = 255; @@ -403,7 +414,7 @@ void test__fl_fss_basic_list_content_read__works_using_combining(void **void_sta else { line_content[i][0] = 0; } - } // or + } // for state.status = F_none; range.start = 0; @@ -413,7 +424,32 @@ void test__fl_fss_basic_list_content_read__works_using_combining(void **void_sta fl_fss_basic_list_object_read(buffer_string, &range, &found_object, &delimits, &state); - assert_true(state.status == F_fss_found_object || state.status == F_fss_found_object_not); + if (matches) { + // When matches is 2, then this matches both object and content. + if (matches == 2) { + if (!(state.status == F_fss_found_object)) { + printf("[ -------> ] --- [00] Failure with fl_fss_basic_list_object_read(), with line %lu, matches=%d, status=%u, expected %u.\n", line, matches, state.status, F_fss_found_object); + } + + assert_true(state.status == F_fss_found_object); + } + + // When matches is 1, then this matches only object. + else { + if (!(state.status == F_fss_found_object_content_not)) { + printf("[ -------> ] --- [01] Failure with fl_fss_basic_list_object_read(), with line %lu, matches=%d, status=%u, expected %u.\n", line, matches, state.status, F_fss_found_object_content_not); + } + + assert_true(state.status == F_fss_found_object_content_not); + } + } + else { + if (!(state.status == F_fss_found_object_not)) { + printf("[ -------> ] --- [02] Failure with with fl_fss_basic_list_object_read(), line %lu, matches=%d, status=%u, expected %u.\n", line, matches, state.status, F_fss_found_object_not); + } + + assert_true(state.status == F_fss_found_object_not); + } status_object = state.status; state.status = F_none; @@ -421,20 +457,43 @@ void test__fl_fss_basic_list_content_read__works_using_combining(void **void_sta if (status_object == F_fss_found_object) { fl_fss_basic_list_content_read(buffer_string, &range, &found, &delimits, &comments, &state); + if (!(state.status == F_fss_found_content || state.status == F_data_not)) { + printf("[ -------> ] --- [03] Failure with fl_fss_basic_list_content_read(), with line %lu, status=%u, expected %u or %u.\n", line, state.status, F_fss_found_content, F_data_not); + } + assert_true(state.status == F_fss_found_content || state.status == F_data_not); if (state.status == F_fss_found_content) { + if (!found.used) { + printf("[ -------> ] --- [04] Failure with fl_fss_basic_list_content_read(), with line %lu, expected found.used > 0.\n", line); + } + assert_true(found.used); + + if (found.used <= (f_number_unsigned_t) total_content) { + printf("[ -------> ] --- [05] Failure with fl_fss_basic_list_content_read(), with line %lu, expected found.used (%lu) <= total_conent (%lu).\n", line, found.used, (f_number_unsigned_t) total_content); + } + assert_true(found.used <= (f_number_unsigned_t) total_content); { const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); + + if (status != F_okay) { + printf("[ -------> ] --- [06] Failure with f_string_dynamic_append(), with line %lu, status=%u, expected=%u.\n", line, status, F_okay); + } + assert_int_equal(status, F_okay); } state.status = F_none; f_fss_apply_delimit(delimits, &delimit_string, &state); + + if (state.status != F_okay) { + printf("[ -------> ] --- [07] Failure with f_fss_apply_delimit(), with line %lu, status=%u, expected=%u.\n", line, state.status, F_okay); + } + assert_int_equal(state.status, F_okay); { @@ -446,14 +505,28 @@ void test__fl_fss_basic_list_content_read__works_using_combining(void **void_sta { const f_status_t status = f_string_dynamic_partial_append_nulless(delimit_string, found.array[i], &result_string); + + if (!(status == F_okay || status == F_data_not_eos)) { + printf("[ -------> ] --- [08] Failure with f_string_dynamic_partial_append_nulless(), with line %lu, status=%u, expected %u or %u.\n", line, status, F_okay, F_data_not_eos); + } + assert_true(status == F_okay || status == F_data_not_eos); } { const f_status_t status = f_string_dynamic_terminate_after(&result_string); + + if (!(status == F_okay)) { + printf("[ -------> ] --- [09] Failure with f_string_dynamic_terminate_after(), with line %lu, status=%u, expected %u.\n", line, status, F_okay); + } + assert_int_equal(status, F_okay); } + if (strcmp(result_string.string, line_content[i])) { + printf("[ -------> ] --- [10] Failure with line %lu, strings do not match.\n", line); + } + assert_string_equal(result_string.string, line_content[i]); } // for @@ -468,6 +541,7 @@ void test__fl_fss_basic_list_content_read__works_using_combining(void **void_sta } } + if (line_matches) free(line_matches); if (line_string) free(line_string); if (result_string.string) free(result_string.string); if (delimit_string.string) free(delimit_string.string); @@ -483,6 +557,7 @@ void test__fl_fss_basic_list_content_read__works_using_combining(void **void_sta line_content[i] = 0; } // for + line_matches = 0; line_string = 0; result_string.string = 0; result_string.used = 0; @@ -518,6 +593,7 @@ void test__fl_fss_basic_list_content_read__works_using_combining(void **void_sta if (found.array) free(found.array); if (comments.array) free(comments.array); if (quotes.array) free(quotes.array); + if (line_matches) free(line_matches); if (line_string) free(line_string); if (result_string.string) free(result_string.string); if (delimit_string.string) free(delimit_string.string); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-basic_list_object_read.c b/level_1/fl_fss/tests/unit/c/test-fss-basic_list_object_read.c index 253272718..a109b2daa 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-basic_list_object_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-basic_list_object_read.c @@ -107,7 +107,7 @@ void test__fl_fss_basic_list_object_read__works(void **void_state) { f_string_dynamic_t result_string = f_string_dynamic_t_initialize; f_string_dynamic_t delimit_string = f_string_dynamic_t_initialize; - for (int line = 1;; ++line) { + for (f_number_unsigned_t line = 1; ; ++line) { max = 255; @@ -127,7 +127,7 @@ void test__fl_fss_basic_list_object_read__works(void **void_state) { fl_fss_basic_list_object_read(buffer_string, &range, &found, &delimits, &state); if (!(state.status == F_fss_found_object || state.status == F_fss_found_object_not)) { - printf("[ -------> ] --- [00] Failure with line (%u) '%s', status=%u, expected %u or %u.\n", line, line_string, state.status, F_fss_found_object, F_fss_found_object_not); + printf("[ -------> ] --- [00] Failure with fl_fss_basic_list_object_read(), with line %lu '%s', status=%u, expected %u or %u.\n", line, line_string, state.status, F_fss_found_object, F_fss_found_object_not); } assert_true(state.status == F_fss_found_object || state.status == F_fss_found_object_not); @@ -138,7 +138,7 @@ void test__fl_fss_basic_list_object_read__works(void **void_state) { result = getline(&line_object, &max, file_objects); if (!result) { - printf("[ -------> ] --- [01] Failure with line (%u) '%s', line_object = '%s', result=%zu.\n", line, line_string, line_object, result); + printf("[ -------> ] --- [01] Failure with getline(), with line %lu '%s', line_object = '%s', result=%zu.\n", line, line_string, line_object, result); } assert_return_code(result, 0); @@ -151,7 +151,7 @@ void test__fl_fss_basic_list_object_read__works(void **void_state) { const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); if (status != F_okay) { - printf("[ -------> ] --- [02] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); + printf("[ -------> ] --- [02] Failure with f_string_dynamic_append(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); } assert_int_equal(status, F_okay); @@ -162,7 +162,7 @@ void test__fl_fss_basic_list_object_read__works(void **void_state) { f_fss_apply_delimit(delimits, &delimit_string, &state); if (state.status != F_okay) { - printf("[ -------> ] --- [03] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, state.status, F_okay); + printf("[ -------> ] --- [03] Failure with f_fss_apply_delimit(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, state.status, F_okay); } assert_int_equal(state.status, F_okay); @@ -171,7 +171,7 @@ void test__fl_fss_basic_list_object_read__works(void **void_state) { const f_status_t status = f_string_dynamic_partial_append_nulless(delimit_string, found, &result_string); if (!(status == F_okay || status == F_data_not_eos)) { - printf("[ -------> ] --- [04] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u or %u.\n", line, line_string, line_object, status, F_okay, F_data_not_eos); + printf("[ -------> ] --- [04] Failure with f_string_dynamic_partial_append_nulless(), with line %lu '%s', line_object = '%s', status=%u, expected %u or %u.\n", line, line_string, line_object, status, F_okay, F_data_not_eos); } assert_true(status == F_okay || status == F_data_not_eos); @@ -181,21 +181,21 @@ void test__fl_fss_basic_list_object_read__works(void **void_state) { const f_status_t status = f_string_dynamic_terminate_after(&result_string); if (status != F_okay) { - printf("[ -------> ] --- [05] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); + printf("[ -------> ] --- [05] Failure with f_string_dynamic_terminate_after(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); } assert_int_equal(status, F_okay); } if (strncmp(result_string.string, line_object, result_string.used)) { - printf("[ -------> ] --- [06] Failure with line (%u) '%s', line_object = '%s', result '%s'.\n", line, line_string, line_object, result_string.string); + printf("[ -------> ] --- [06] Failure with line %lu, line_object = '%s, strings do not match.\n", line, line_object); } assert_string_equal(result_string.string, line_object); } else { if (line_object[0]) { - printf("[ -------> ] --- [07] Failure with line (%u) '%s', line_object[0]=%c.\n", line, line_string, line_object[0]); + printf("[ -------> ] --- [07] Failure with fl_fss_basic_list_object_read(), with line %lu '%s', line_object[0]=%c.\n", line, line_string, line_object[0]); } assert_int_equal(line_object[0], 0); @@ -255,7 +255,7 @@ void test__fl_fss_basic_list_object_read__works_using_combining(void **void_stat f_string_dynamic_t result_string = f_string_dynamic_t_initialize; f_string_dynamic_t delimit_string = f_string_dynamic_t_initialize; - for (int line = 1;; ++line) { + for (f_number_unsigned_t line = 1; ; ++line) { max = 255; @@ -275,7 +275,7 @@ void test__fl_fss_basic_list_object_read__works_using_combining(void **void_stat fl_fss_basic_list_object_read(buffer_string, &range, &found, &delimits, &state); if (!(state.status == F_fss_found_object || state.status == F_fss_found_object_not)) { - printf("[ -------> ] --- [00] Failure with line (%u) '%s', status=%u, expected %u or %u.\n", line, line_string, state.status, F_fss_found_object, F_fss_found_object_not); + printf("[ -------> ] --- [00] Failure with fl_fss_basic_list_object_read(), with line %lu '%s', status=%u, expected %u or %u.\n", line, line_string, state.status, F_fss_found_object, F_fss_found_object_not); } assert_true(state.status == F_fss_found_object || state.status == F_fss_found_object_not); @@ -286,7 +286,7 @@ void test__fl_fss_basic_list_object_read__works_using_combining(void **void_stat result = getline(&line_object, &max, file_objects); if (!result) { - printf("[ -------> ] --- [01] Failure with line (%u) '%s', line_object = '%s', result=%zu.\n", line, line_string, line_object, result); + printf("[ -------> ] --- [01] Failure with getline(), with line %lu '%s', line_object = '%s', result=%zu.\n", line, line_string, line_object, result); } assert_return_code(result, 0); @@ -299,7 +299,7 @@ void test__fl_fss_basic_list_object_read__works_using_combining(void **void_stat const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); if (status != F_okay) { - printf("[ -------> ] --- [02] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); + printf("[ -------> ] --- [02] Failure with f_string_dynamic_append(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); } assert_int_equal(status, F_okay); @@ -310,7 +310,7 @@ void test__fl_fss_basic_list_object_read__works_using_combining(void **void_stat f_fss_apply_delimit(delimits, &delimit_string, &state); if (state.status != F_okay) { - printf("[ -------> ] --- [03] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, state.status, F_okay); + printf("[ -------> ] --- [03] Failure with f_fss_apply_delimit(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, state.status, F_okay); } assert_int_equal(state.status, F_okay); @@ -319,7 +319,7 @@ void test__fl_fss_basic_list_object_read__works_using_combining(void **void_stat const f_status_t status = f_string_dynamic_partial_append_nulless(delimit_string, found, &result_string); if (!(status == F_okay || status == F_data_not_eos)) { - printf("[ -------> ] --- [04] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u or %u.\n", line, line_string, line_object, status, F_okay, F_data_not_eos); + printf("[ -------> ] --- [04] Failure with f_string_dynamic_partial_append_nulless(), with line %lu '%s', line_object = '%s', status=%u, expected %u or %u.\n", line, line_string, line_object, status, F_okay, F_data_not_eos); } assert_true(status == F_okay || status == F_data_not_eos); @@ -329,21 +329,21 @@ void test__fl_fss_basic_list_object_read__works_using_combining(void **void_stat const f_status_t status = f_string_dynamic_terminate_after(&result_string); if (status != F_okay) { - printf("[ -------> ] --- [05] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); + printf("[ -------> ] --- [05] Failure with f_string_dynamic_terminate_after(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); } assert_int_equal(status, F_okay); } if (strncmp(result_string.string, line_object, result_string.used)) { - printf("[ -------> ] --- [06] Failure with line (%u) '%s', line_object = '%s', result '%s'.\n", line, line_string, line_object, result_string.string); + printf("[ -------> ] --- [06] Failure with line %lu, line_object = '%s', strings do not match.\n", line, line_object); } assert_string_equal(result_string.string, line_object); } else { if (line_object[0]) { - printf("[ -------> ] --- [07] Failure with line (%u) '%s', line_object[0]=%c.\n", line, line_string, line_object[0]); + printf("[ -------> ] --- [07] Failure with fl_fss_basic_list_object_read(), with line %lu '%s', line_object[0]=%c.\n", line, line_string, line_object[0]); } assert_int_equal(line_object[0], 0); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-basic_object_read.c b/level_1/fl_fss/tests/unit/c/test-fss-basic_object_read.c index 877de9186..24ec27b60 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-basic_object_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-basic_object_read.c @@ -293,7 +293,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { result = getline(&line_object, &max, file_objects); if (result == -1) { - printf("[ -------> ] --- [00] Failure loading line line %lu for file './data/tests/strings/basic-combining_read.txt', result = %lu.\n", line, result); + printf("[ -------> ] --- [00] Failure with getline(), loading line line %lu for file './data/tests/strings/basic-combining_read.txt', result = %lu.\n", line, result); } assert_return_code(result, 0); @@ -313,13 +313,13 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { // When matches is 2, then this matches both object and content. if (matches == 2) { if (!(state.status == F_fss_found_object)) { - printf("[ -------> ] --- [01] Failure with line '%s', matches=%d, status=%u.\n", line_object, matches, state.status); + printf("[ -------> ] --- [01] Failure with fl_fss_basic_object_read(), Failure with line '%s', matches=%d, status=%u.\n", line_object, matches, state.status); } assert_true(state.status == F_fss_found_object); if (!(found.start <= found.stop)) { - printf("[ -------> ] --- [02] Failure with line '%s', matches=%d, found=(%lu, %lu).\n", line_object, matches, found.start, found.stop); + printf("[ -------> ] --- [02] Failure with fl_fss_basic_object_read(), with line '%s', matches=%d, found=(%lu, %lu).\n", line_object, matches, found.start, found.stop); } assert_true(found.start <= found.stop); @@ -328,7 +328,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { // When matches is 1, then this matches only object. else { if (!(state.status == F_fss_found_object_content_not)) { - printf("[ -------> ] --- [03] Failure with line '%s', matches=%d, status=%u.\n", line_object, matches, state.status); + printf("[ -------> ] --- [03] Failure with fl_fss_basic_object_read(), with line '%s', matches=%d, status=%u.\n", line_object, matches, state.status); } assert_true(state.status == F_fss_found_object_content_not); @@ -337,7 +337,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { else { // This is currently not supported. - printf("[ -------> ] --- [04] Failure line %lu matches of 0 is not supported.\n", line); + printf("[ -------> ] --- [04] Failure with fl_fss_basic_object_read(), line %lu matches of 0 is not supported.\n", line); assert_true(F_false); } @@ -346,7 +346,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); if (status != F_okay) { - printf("[ -------> ] --- [05] Failure with line '%s'.\n", line_object); + printf("[ -------> ] --- [05] Failure with f_string_dynamic_append(), Failure with line '%s'.\n", line_object); } assert_int_equal(status, F_okay); @@ -357,7 +357,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { f_fss_apply_delimit(delimits, &delimit_string, &state); if (state.status != F_okay) { - printf("[ -------> ] --- [06] Failure with line '%s'.\n", line_object); + printf("[ -------> ] --- [06] Failure with f_fss_apply_delimit(), Failure with line '%s'.\n", line_object); } assert_int_equal(state.status, F_okay); @@ -366,7 +366,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { const f_status_t status = f_string_dynamic_partial_append_nulless(delimit_string, found, &result_string); if (!(status == F_okay || status == F_data_not_eos)) { - printf("[ -------> ] --- [07] Failure with line '%s', status=%u.\n", line_object, status); + printf("[ -------> ] --- [07] Failure with f_string_dynamic_partial_append_nulless(), Failure with line '%s', status=%u.\n", line_object, status); } assert_true(status == F_okay || status == F_data_not_eos); @@ -376,14 +376,14 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { const f_status_t status = f_string_dynamic_terminate_after(&result_string); if (status != F_okay) { - printf("[ -------> ] --- [08] Failure with line '%s'.\n", line_object); + printf("[ -------> ] --- [08] Failure with f_string_dynamic_terminate_after(), with line '%s'.\n", line_object); } assert_int_equal(status, F_okay); } if (strcmp((const char *) result_string.string, (const char *) line_object)) { - printf("[ -------> ] --- [09] Failure with line '%s'.\n", line_object); + printf("[ -------> ] --- [09] Failure with line %lu, line_object = '%s', strings do not match.\n", line, line_object); } assert_string_equal(result_string.string, line_object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_object_read.c b/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_object_read.c index d0f4d4bc8..0ed8f7507 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_object_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_object_read.c @@ -107,7 +107,7 @@ void test__fl_fss_embedded_list_object_read__works(void **void_state) { f_string_dynamic_t result_string = f_string_dynamic_t_initialize; f_string_dynamic_t delimit_string = f_string_dynamic_t_initialize; - for (int line = 1;; ++line) { + for (f_number_unsigned_t line = 1; ; ++line) { max = 255; @@ -127,7 +127,7 @@ void test__fl_fss_embedded_list_object_read__works(void **void_state) { fl_fss_embedded_list_object_read(buffer_string, &range, &found, &delimits, &state); if (!(state.status == F_fss_found_object || state.status == F_fss_found_object_not)) { - printf("[ -------> ] --- [00] Failure with line (%u) '%s', status=%u, expected %u or %u.\n", line, line_string, state.status, F_fss_found_object, F_fss_found_object_not); + printf("[ -------> ] --- [00] Failure with fl_fss_embedded_list_object_read(), with line %lu '%s', status=%u, expected %u or %u.\n", line, line_string, state.status, F_fss_found_object, F_fss_found_object_not); } assert_true(state.status == F_fss_found_object || state.status == F_fss_found_object_not); @@ -138,7 +138,7 @@ void test__fl_fss_embedded_list_object_read__works(void **void_state) { result = getline(&line_object, &max, file_objects); if (!result) { - printf("[ -------> ] --- [01] Failure with line (%u) '%s', line_object = '%s', result=%zu.\n", line, line_string, line_object, result); + printf("[ -------> ] --- [01] Failure with getline(), with line %lu '%s', line_object = '%s', result=%zu.\n", line, line_string, line_object, result); } assert_return_code(result, 0); @@ -151,7 +151,7 @@ void test__fl_fss_embedded_list_object_read__works(void **void_state) { const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); if (status != F_okay) { - printf("[ -------> ] --- [02] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); + printf("[ -------> ] --- [02] Failure with f_string_dynamic_append(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); } assert_int_equal(status, F_okay); @@ -162,7 +162,7 @@ void test__fl_fss_embedded_list_object_read__works(void **void_state) { f_fss_apply_delimit(delimits, &delimit_string, &state); if (state.status != F_okay) { - printf("[ -------> ] --- [03] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, state.status, F_okay); + printf("[ -------> ] --- [03] Failure with f_fss_apply_delimit(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, state.status, F_okay); } assert_int_equal(state.status, F_okay); @@ -171,7 +171,7 @@ void test__fl_fss_embedded_list_object_read__works(void **void_state) { const f_status_t status = f_string_dynamic_partial_append_nulless(delimit_string, found, &result_string); if (!(status == F_okay || status == F_data_not_eos)) { - printf("[ -------> ] --- [04] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u or %u.\n", line, line_string, line_object, status, F_okay, F_data_not_eos); + printf("[ -------> ] --- [04] Failure with f_string_dynamic_partial_append_nulless(), with line %lu '%s', line_object = '%s', status=%u, expected %u or %u.\n", line, line_string, line_object, status, F_okay, F_data_not_eos); } assert_true(status == F_okay || status == F_data_not_eos); @@ -181,21 +181,21 @@ void test__fl_fss_embedded_list_object_read__works(void **void_state) { const f_status_t status = f_string_dynamic_terminate_after(&result_string); if (status != F_okay) { - printf("[ -------> ] --- [05] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); + printf("[ -------> ] --- [05] Failure with f_string_dynamic_terminate_after(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); } assert_int_equal(status, F_okay); } if (strncmp(result_string.string, line_object, result_string.used)) { - printf("[ -------> ] --- [06] Failure with line (%u) '%s', line_object = '%s', result '%s'.\n", line, line_string, line_object, result_string.string); + printf("[ -------> ] --- [06] Failure with line %lu, line_object = '%s', strings do not match.\n", line, line_object); } assert_string_equal(result_string.string, line_object); } else { if (line_object[0]) { - printf("[ -------> ] --- [07] Failure with line (%u) '%s', line_object[0]=%c.\n", line, line_string, line_object[0]); + printf("[ -------> ] --- [07] Failure with fl_fss_embedded_list_object_read(), with line %lu '%s', line_object[0]=%c.\n", line, line_string, line_object[0]); } assert_int_equal(line_object[0], 0); @@ -255,7 +255,7 @@ void test__fl_fss_embedded_list_object_read__works_using_combining(void **void_s f_string_dynamic_t result_string = f_string_dynamic_t_initialize; f_string_dynamic_t delimit_string = f_string_dynamic_t_initialize; - for (int line = 1;; ++line) { + for (f_number_unsigned_t line = 1; ; ++line) { max = 255; @@ -275,7 +275,7 @@ void test__fl_fss_embedded_list_object_read__works_using_combining(void **void_s fl_fss_embedded_list_object_read(buffer_string, &range, &found, &delimits, &state); if (!(state.status == F_fss_found_object || state.status == F_fss_found_object_not)) { - printf("[ -------> ] --- [00] Failure with line (%u) '%s', status=%u, expected %u or %u.\n", line, line_string, state.status, F_fss_found_object, F_fss_found_object_not); + printf("[ -------> ] --- [00] Failure with line %lu '%s', status=%u, expected %u or %u.\n", line, line_string, state.status, F_fss_found_object, F_fss_found_object_not); } assert_true(state.status == F_fss_found_object || state.status == F_fss_found_object_not); @@ -286,7 +286,7 @@ void test__fl_fss_embedded_list_object_read__works_using_combining(void **void_s result = getline(&line_object, &max, file_objects); if (!result) { - printf("[ -------> ] --- [01] Failure with line (%u) '%s', line_object = '%s', result=%zu.\n", line, line_string, line_object, result); + printf("[ -------> ] --- [01] Failure with line %lu '%s', line_object = '%s', result=%zu.\n", line, line_string, line_object, result); } assert_return_code(result, 0); @@ -299,7 +299,7 @@ void test__fl_fss_embedded_list_object_read__works_using_combining(void **void_s const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); if (status != F_okay) { - printf("[ -------> ] --- [02] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); + printf("[ -------> ] --- [02] Failure with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); } assert_int_equal(status, F_okay); @@ -310,7 +310,7 @@ void test__fl_fss_embedded_list_object_read__works_using_combining(void **void_s f_fss_apply_delimit(delimits, &delimit_string, &state); if (state.status != F_okay) { - printf("[ -------> ] --- [03] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, state.status, F_okay); + printf("[ -------> ] --- [03] Failure with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, state.status, F_okay); } assert_int_equal(state.status, F_okay); @@ -319,7 +319,7 @@ void test__fl_fss_embedded_list_object_read__works_using_combining(void **void_s const f_status_t status = f_string_dynamic_partial_append_nulless(delimit_string, found, &result_string); if (!(status == F_okay || status == F_data_not_eos)) { - printf("[ -------> ] --- [04] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u or %u.\n", line, line_string, line_object, status, F_okay, F_data_not_eos); + printf("[ -------> ] --- [04] Failure with line %lu '%s', line_object = '%s', status=%u, expected %u or %u.\n", line, line_string, line_object, status, F_okay, F_data_not_eos); } assert_true(status == F_okay || status == F_data_not_eos); @@ -329,21 +329,21 @@ void test__fl_fss_embedded_list_object_read__works_using_combining(void **void_s const f_status_t status = f_string_dynamic_terminate_after(&result_string); if (status != F_okay) { - printf("[ -------> ] --- [05] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); + printf("[ -------> ] --- [05] Failure with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); } assert_int_equal(status, F_okay); } if (strncmp(result_string.string, line_object, result_string.used)) { - printf("[ -------> ] --- [06] Failure with line (%u) '%s', line_object = '%s', result '%s'.\n", line, line_string, line_object, result_string.string); + printf("[ -------> ] --- [06] Failure with line %lu, line_object = '%s', strings do not match.\n", line, line_object); } assert_string_equal(result_string.string, line_object); } else { if (line_object[0]) { - printf("[ -------> ] --- [07] Failure with line (%u) '%s', line_object[0]=%c.\n", line, line_string, line_object[0]); + printf("[ -------> ] --- [07] Failure with line %lu '%s', line_object[0]=%c.\n", line, line_string, line_object[0]); } assert_int_equal(line_object[0], 0); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-extended_content_read.c b/level_1/fl_fss/tests/unit/c/test-fss-extended_content_read.c index 8cf931320..521858b07 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-extended_content_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-extended_content_read.c @@ -533,7 +533,7 @@ void test__fl_fss_extended_content_read__works_using_combining(void **void_state } if (strcmp(result_string.string, line_content[i])) { - printf("[ -------> ] --- [12] Failure with f_string_dynamic_terminate_after() line %lu and found[%u], strings do not match.\n", line, i); + printf("[ -------> ] --- [12] Failure with line %lu and found[%u], strings do not match.\n", line, i); } assert_string_equal(result_string.string, line_content[i]); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-extended_list_object_read.c b/level_1/fl_fss/tests/unit/c/test-fss-extended_list_object_read.c index 0f27bd686..90ae13ecf 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-extended_list_object_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-extended_list_object_read.c @@ -107,7 +107,7 @@ void test__fl_fss_extended_list_object_read__works(void **void_state) { f_string_dynamic_t result_string = f_string_dynamic_t_initialize; f_string_dynamic_t delimit_string = f_string_dynamic_t_initialize; - for (int line = 1;; ++line) { + for (f_number_unsigned_t line = 1; ; ++line) { max = 255; @@ -127,7 +127,7 @@ void test__fl_fss_extended_list_object_read__works(void **void_state) { fl_fss_extended_list_object_read(buffer_string, &range, &found, &delimits, &state); if (!(state.status == F_fss_found_object || state.status == F_fss_found_object_not)) { - printf("[ -------> ] --- [00] Failure with line (%u) '%s', status=%u, expected %u or %u.\n", line, line_string, state.status, F_fss_found_object, F_fss_found_object_not); + printf("[ -------> ] --- [00] Failure with fl_fss_extended_list_object_read(), with line %lu '%s', status=%u, expected %u or %u.\n", line, line_string, state.status, F_fss_found_object, F_fss_found_object_not); } assert_true(state.status == F_fss_found_object || state.status == F_fss_found_object_not); @@ -138,7 +138,7 @@ void test__fl_fss_extended_list_object_read__works(void **void_state) { result = getline(&line_object, &max, file_objects); if (!result) { - printf("[ -------> ] --- [01] Failure with line (%u) '%s', line_object = '%s', result=%zu.\n", line, line_string, line_object, result); + printf("[ -------> ] --- [01] Failure with getline(), with line %lu '%s', line_object = '%s', result=%zu.\n", line, line_string, line_object, result); } assert_return_code(result, 0); @@ -151,7 +151,7 @@ void test__fl_fss_extended_list_object_read__works(void **void_state) { const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); if (status != F_okay) { - printf("[ -------> ] --- [02] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); + printf("[ -------> ] --- [02] Failure with f_string_dynamic_append(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); } assert_int_equal(status, F_okay); @@ -162,7 +162,7 @@ void test__fl_fss_extended_list_object_read__works(void **void_state) { f_fss_apply_delimit(delimits, &delimit_string, &state); if (state.status != F_okay) { - printf("[ -------> ] --- [03] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, state.status, F_okay); + printf("[ -------> ] --- [03] Failure with f_fss_apply_delimit(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, state.status, F_okay); } assert_int_equal(state.status, F_okay); @@ -171,7 +171,7 @@ void test__fl_fss_extended_list_object_read__works(void **void_state) { const f_status_t status = f_string_dynamic_partial_append_nulless(delimit_string, found, &result_string); if (!(status == F_okay || status == F_data_not_eos)) { - printf("[ -------> ] --- [04] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u or %u.\n", line, line_string, line_object, status, F_okay, F_data_not_eos); + printf("[ -------> ] --- [04] Failure with f_string_dynamic_partial_append_nulless(), with line %lu '%s', line_object = '%s', status=%u, expected %u or %u.\n", line, line_string, line_object, status, F_okay, F_data_not_eos); } assert_true(status == F_okay || status == F_data_not_eos); @@ -181,21 +181,21 @@ void test__fl_fss_extended_list_object_read__works(void **void_state) { const f_status_t status = f_string_dynamic_terminate_after(&result_string); if (status != F_okay) { - printf("[ -------> ] --- [05] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); + printf("[ -------> ] --- [05] Failure with f_string_dynamic_terminate_after(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); } assert_int_equal(status, F_okay); } if (strncmp(result_string.string, line_object, result_string.used)) { - printf("[ -------> ] --- [06] Failure with line (%u) '%s', line_object = '%s', result '%s'.\n", line, line_string, line_object, result_string.string); + printf("[ -------> ] --- [06] Failure with line %lu, line_object = '%s', strings do not match.\n", line, line_object); } assert_string_equal(result_string.string, line_object); } else { if (line_object[0]) { - printf("[ -------> ] --- [07] Failure with line (%u) '%s', line_object[0]=%c.\n", line, line_string, line_object[0]); + printf("[ -------> ] --- [07] Failure with fl_fss_extended_list_object_read(), with line %lu '%s', line_object[0]=%c.\n", line, line_string, line_object[0]); } assert_int_equal(line_object[0], 0); @@ -255,7 +255,7 @@ void test__fl_fss_extended_list_object_read__works_using_combining(void **void_s f_string_dynamic_t result_string = f_string_dynamic_t_initialize; f_string_dynamic_t delimit_string = f_string_dynamic_t_initialize; - for (int line = 1;; ++line) { + for (f_number_unsigned_t line = 1; ; ++line) { max = 255; @@ -275,7 +275,7 @@ void test__fl_fss_extended_list_object_read__works_using_combining(void **void_s fl_fss_extended_list_object_read(buffer_string, &range, &found, &delimits, &state); if (!(state.status == F_fss_found_object || state.status == F_fss_found_object_not)) { - printf("[ -------> ] --- [00] Failure with line (%u) '%s', status=%u, expected %u or %u.\n", line, line_string, state.status, F_fss_found_object, F_fss_found_object_not); + printf("[ -------> ] --- [00] Failure with fl_fss_extended_list_object_read(), with line %lu '%s', status=%u, expected %u or %u.\n", line, line_string, state.status, F_fss_found_object, F_fss_found_object_not); } assert_true(state.status == F_fss_found_object || state.status == F_fss_found_object_not); @@ -286,7 +286,7 @@ void test__fl_fss_extended_list_object_read__works_using_combining(void **void_s result = getline(&line_object, &max, file_objects); if (!result) { - printf("[ -------> ] --- [01] Failure with line (%u) '%s', line_object = '%s', result=%zu.\n", line, line_string, line_object, result); + printf("[ -------> ] --- [01] Failure with fl_fss_extended_list_object_read(), with line %lu '%s', line_object = '%s', result=%zu.\n", line, line_string, line_object, result); } assert_return_code(result, 0); @@ -299,7 +299,7 @@ void test__fl_fss_extended_list_object_read__works_using_combining(void **void_s const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); if (status != F_okay) { - printf("[ -------> ] --- [02] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); + printf("[ -------> ] --- [02] Failure with f_string_dynamic_append(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); } assert_int_equal(status, F_okay); @@ -310,7 +310,7 @@ void test__fl_fss_extended_list_object_read__works_using_combining(void **void_s f_fss_apply_delimit(delimits, &delimit_string, &state); if (state.status != F_okay) { - printf("[ -------> ] --- [03] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, state.status, F_okay); + printf("[ -------> ] --- [03] Failure with f_fss_apply_delimit(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, state.status, F_okay); } assert_int_equal(state.status, F_okay); @@ -319,7 +319,7 @@ void test__fl_fss_extended_list_object_read__works_using_combining(void **void_s const f_status_t status = f_string_dynamic_partial_append_nulless(delimit_string, found, &result_string); if (!(status == F_okay || status == F_data_not_eos)) { - printf("[ -------> ] --- [04] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u or %u.\n", line, line_string, line_object, status, F_okay, F_data_not_eos); + printf("[ -------> ] --- [04] Failure with f_string_dynamic_partial_append_nulless(), with line %lu '%s', line_object = '%s', status=%u, expected %u or %u.\n", line, line_string, line_object, status, F_okay, F_data_not_eos); } assert_true(status == F_okay || status == F_data_not_eos); @@ -329,21 +329,21 @@ void test__fl_fss_extended_list_object_read__works_using_combining(void **void_s const f_status_t status = f_string_dynamic_terminate_after(&result_string); if (status != F_okay) { - printf("[ -------> ] --- [05] Failure with line (%u) '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); + printf("[ -------> ] --- [05] Failure with f_string_dynamic_terminate_after(), with line %lu '%s', line_object = '%s', status=%u, expected %u.\n", line, line_string, line_object, status, F_okay); } assert_int_equal(status, F_okay); } if (strncmp(result_string.string, line_object, result_string.used)) { - printf("[ -------> ] --- [06] Failure with line (%u) '%s', line_object = '%s', result '%s'.\n", line, line_string, line_object, result_string.string); + printf("[ -------> ] --- [06] Failure with line %lu, line_object = '%s', strings do not match.\n", line, line_object); } assert_string_equal(result_string.string, line_object); } else { if (line_object[0]) { - printf("[ -------> ] --- [07] Failure with line (%u) '%s', line_object[0]=%c.\n", line, line_string, line_object[0]); + printf("[ -------> ] --- [07] Failure with fl_fss_extended_list_object_read(), with line %lu '%s', line_object[0]=%c.\n", line, line_string, line_object[0]); } assert_int_equal(line_object[0], 0); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-extended_object_read.c b/level_1/fl_fss/tests/unit/c/test-fss-extended_object_read.c index 01b86b631..c5f79d174 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-extended_object_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-extended_object_read.c @@ -309,7 +309,7 @@ void test__fl_fss_extended_object_read__works_using_combining(void **void_state) result = getline(&line_object, &max, file_objects); if (result == -1) { - printf("[ -------> ] --- [00] Failure loading line line %lu for file './data/tests/strings/extended-combining_read.txt', result = %lu.\n", line, result); + printf("[ -------> ] --- [00] Failure with getline(), loading line line %lu for file './data/tests/strings/extended-combining_read.txt', result = %lu.\n", line, result); } assert_return_code(result, 0); @@ -329,13 +329,13 @@ void test__fl_fss_extended_object_read__works_using_combining(void **void_state) // When matches is 2, then this matches both object and content. if (matches == 2) { if (!(state.status == F_fss_found_object)) { - printf("[ -------> ] --- [01] Failure with line %lu '%s', matches=%d, status=%u.\n", line, line_object, matches, state.status); + printf("[ -------> ] --- [01] Failure with fl_fss_extended_object_read(), with line %lu '%s', matches=%d, status=%u.\n", line, line_object, matches, state.status); } assert_true(state.status == F_fss_found_object); if (!(found.start <= found.stop)) { - printf("[ -------> ] --- [02] Failure with line %lu '%s', matches=%d, found=(%lu, %lu).\n", line, line_object, matches, found.start, found.stop); + printf("[ -------> ] --- [02] Failure with fl_fss_extended_object_read(), with line %lu '%s', matches=%d, found=(%lu, %lu).\n", line, line_object, matches, found.start, found.stop); } assert_true(found.start <= found.stop); @@ -344,7 +344,7 @@ void test__fl_fss_extended_object_read__works_using_combining(void **void_state) // When matches is 1, then this matches only object. else { if (!(state.status == F_fss_found_object_content_not)) { - printf("[ -------> ] --- [03] Failure with line %lu '%s', matches=%d, status=%u.\n", line, line_object, matches, state.status); + printf("[ -------> ] --- [03] Failure with fl_fss_extended_object_read(), with line %lu '%s', matches=%d, status=%u.\n", line, line_object, matches, state.status); } assert_true(state.status == F_fss_found_object_content_not); @@ -353,7 +353,7 @@ void test__fl_fss_extended_object_read__works_using_combining(void **void_state) else { // This is currently not supported. - printf("[ -------> ] --- [04] Failure line %lu matches of 0 is not supported.\n", line); + printf("[ -------> ] --- [04] Failure with fl_fss_extended_object_read(), line %lu matches of 0 is not supported.\n", line); assert_true(F_false); } @@ -361,7 +361,7 @@ void test__fl_fss_extended_object_read__works_using_combining(void **void_state) const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); if (!(status == F_okay || status == F_data_not_eos)) { - printf("[ -------> ] --- [05] Failure with fl_fss_extended_object_read() line %lu, got status=%u, expected either %u or %u.\n", line, status, F_okay, F_data_not_eos); + printf("[ -------> ] --- [05] Failure with fl_fss_extended_object_read(), with fl_fss_extended_object_read() line %lu, got status=%u, expected either %u or %u.\n", line, status, F_okay, F_data_not_eos); } assert_int_equal(status, F_okay); @@ -398,7 +398,7 @@ void test__fl_fss_extended_object_read__works_using_combining(void **void_state) } if (strcmp(result_string.string, line_object)) { - printf("[ -------> ] --- [09] Failure with f_string_dynamic_terminate_after() line %lu, strings do not match.\n", line); + printf("[ -------> ] --- [09] Failure with f_string_dynamic_terminate_after() with line %lu, strings do not match.\n", line); } assert_string_equal(result_string.string, line_object);