From 9a782faf2bdf2c492f0ec919ecb9a142fa5ac55b Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Wed, 20 Nov 2024 22:50:18 -0600 Subject: [PATCH] Cleanup: Unit test for f_iki. Use the version 0.1.0 in the test string so that it no longer gets changed with release changes. Add the missing undef for `_inline_macro_total_rows`. Fix the constant status declaration scope. --- level_0/f_iki/tests/unit/c/test-iki-read.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/level_0/f_iki/tests/unit/c/test-iki-read.c b/level_0/f_iki/tests/unit/c/test-iki-read.c index 07a275c..caeb614 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-read.c +++ b/level_0/f_iki/tests/unit/c/test-iki-read.c @@ -110,9 +110,9 @@ void test__f_iki_read__works(void **state) { macro_f_string_static_t_initialize("IKI Content:\"May have spaces\\\" and quotes.\"", 0, 43), macro_f_string_static_t_initialize("IKI Content:'May have spaces\\' and\" quotes.'", 0, 44), macro_f_string_static_t_initialize("IKI Content:\"May have spaces\\\" and' quotes.\"", 0, 44), - macro_f_string_static_t_initialize("url:'https://localhost/fake-0.6.13.tar.gz?query=xx¶meter=yyy%20' end.", 0, 73), - macro_f_string_static_t_initialize("url:\"https://localhost/fake-0.6.13.tar.gz?query=xx¶meter=yyy%20\" end.", 0, 73), - macro_f_string_static_t_initialize("url:`https://localhost/fake-0.6.13.tar.gz?query=xx¶meter=yyy%20` end.", 0, 73), + macro_f_string_static_t_initialize("url:'https://localhost/fake-0.1.0.tar.gz?query=xx¶meter=yyy%20' end.", 0, 72), + macro_f_string_static_t_initialize("url:\"https://localhost/fake-0.1.0.tar.gz?query=xx¶meter=yyy%20\" end.", 0, 72), + macro_f_string_static_t_initialize("url:`https://localhost/fake-0.1.0.tar.gz?query=xx¶meter=yyy%20` end.", 0, 72), macro_f_string_static_t_initialize("iki:'\"`' iki:'`\"'", 0, 17), macro_f_string_static_t_initialize("[iki]:\"one\"", 0, 11), macro_f_string_static_t_initialize("[iki]\\:\"none\"", 0, 13), @@ -221,9 +221,9 @@ void test__f_iki_read__works(void **state) { { macro_f_string_range_t_initialize(4, 42), f_string_range_t_initialize }, { macro_f_string_range_t_initialize(4, 43), f_string_range_t_initialize }, { macro_f_string_range_t_initialize(4, 43), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize(0, 67), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize(0, 67), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize(0, 67), f_string_range_t_initialize }, + { macro_f_string_range_t_initialize(0, 66), f_string_range_t_initialize }, + { macro_f_string_range_t_initialize(0, 66), f_string_range_t_initialize }, + { macro_f_string_range_t_initialize(0, 66), f_string_range_t_initialize }, { macro_f_string_range_t_initialize(0, 7), macro_f_string_range_t_initialize(9, 16) }, { macro_f_string_range_t_initialize(0, 10), f_string_range_t_initialize }, { f_string_range_t_initialize, f_string_range_t_initialize }, @@ -295,9 +295,9 @@ void test__f_iki_read__works(void **state) { { macro_f_string_range_t_initialize(13, 41), f_string_range_t_initialize }, { macro_f_string_range_t_initialize(13, 42), f_string_range_t_initialize }, { macro_f_string_range_t_initialize(13, 42), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize(5, 66), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize(5, 66), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize(5, 66), f_string_range_t_initialize }, + { macro_f_string_range_t_initialize(5, 65), f_string_range_t_initialize }, + { macro_f_string_range_t_initialize(5, 65), f_string_range_t_initialize }, + { macro_f_string_range_t_initialize(5, 65), f_string_range_t_initialize }, { macro_f_string_range_t_initialize(5, 6), macro_f_string_range_t_initialize(14, 15) }, { macro_f_string_range_t_initialize(7, 9), f_string_range_t_initialize }, { f_string_range_t_initialize, f_string_range_t_initialize }, @@ -316,9 +316,11 @@ void test__f_iki_read__works(void **state) { f_string_range_t range = macro_f_string_range_t_initialize2(buffers[i].used); f_iki_data_t iki = f_iki_data_t_initialize; - const f_status_t status = f_iki_read(the_state, &buffers[i], &range, &iki); + { + const f_status_t status = f_iki_read(the_state, &buffers[i], &range, &iki); - assert_int_equal(status, statuss[i]); + assert_int_equal(status, statuss[i]); + } if (matches[i] == 2) { const f_status_t status = f_iki_read(the_state, &buffers[i], &range, &iki); @@ -357,6 +359,8 @@ void test__f_iki_read__works(void **state) { iki.content.used = 0; iki.delimits.used = 0; } // for + + #undef _inline_macro_total_rows } #ifdef __cplusplus -- 1.8.3.1