From: Kevin Day Date: Sun, 3 Mar 2024 01:31:50 +0000 (-0600) Subject: Progress: Further simplify tests, merging the number and the string helper tests. X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=f554ba05f82245f66e06025314958557d86e9ec0;p=fll Progress: Further simplify tests, merging the number and the string helper tests. The number helper can also be used as-is for the string helper and so rename the file and functions to a "payload" helper. I originally had "at" in the file names because I was passing an index. That index parameter got removed but I forgot to remove the "at" from the name of the functions. The "at" is now removed. I began adding the strings tests but I ran out of time to do further work on them. --- diff --git a/level_1/fl_fss/data/build/settings-tests b/level_1/fl_fss/data/build/settings-tests index 7adf134..8e5330c 100644 --- a/level_1/fl_fss/data/build/settings-tests +++ b/level_1/fl_fss/data/build/settings-tests @@ -44,7 +44,7 @@ build_sources_program test-fss-payload_header_map-abstruse_signeds-join.c test-f build_sources_program test-fss-payload_header_map-abstruse_signeds-split.c test-fss-payload_header_map-abstruse_unsigneds-split.c build_sources_program test-fss-payload_header_map-abstruse_string-join.c -build_sources_program test-fss.c data-fss.c help-fss.c help-fss-number.c +build_sources_program test-fss.c data-fss.c help-fss.c help-fss-payload.c build_script no build_shared yes diff --git a/level_1/fl_fss/data/tests/headers/payload-join-abstruse_strings-0.txt b/level_1/fl_fss/data/tests/headers/payload-join-abstruse_strings-0.txt new file mode 100644 index 0000000..7b06942 --- /dev/null +++ b/level_1/fl_fss/data/tests/headers/payload-join-abstruse_strings-0.txt @@ -0,0 +1,6 @@ +a +4 +0 +hello +"some thing" +3全#$⸙ diff --git a/level_1/fl_fss/data/tests/headers/payload-join-abstruse_strings-1.txt b/level_1/fl_fss/data/tests/headers/payload-join-abstruse_strings-1.txt new file mode 100644 index 0000000..50e859f --- /dev/null +++ b/level_1/fl_fss/data/tests/headers/payload-join-abstruse_strings-1.txt @@ -0,0 +1,5 @@ +b +3 +全 +⸙ +"␀ ␀ ␀ ␀ ␀ ␀" diff --git a/level_1/fl_fss/data/tests/headers/payload-join-abstruse_strings-2.txt b/level_1/fl_fss/data/tests/headers/payload-join-abstruse_strings-2.txt new file mode 100644 index 0000000..41f6980 --- /dev/null +++ b/level_1/fl_fss/data/tests/headers/payload-join-abstruse_strings-2.txt @@ -0,0 +1,4 @@ +c +2 +� +""a b \" c" diff --git a/level_1/fl_fss/data/tests/variables/payload-abstruse_strings.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_strings.txt new file mode 100644 index 0000000..d64b7e9 --- /dev/null +++ b/level_1/fl_fss/data/tests/variables/payload-abstruse_strings.txt @@ -0,0 +1,15 @@ +a +4 +0 +hello +some thing +3全#$⸙ +b +3 +全 +⸙ +␀ ␀ ␀ ␀ ␀ ␀ +c +2 +� +"a b " c diff --git a/level_1/fl_fss/tests/unit/c/help-fss-number.c b/level_1/fl_fss/tests/unit/c/help-fss-payload.c similarity index 93% rename from level_1/fl_fss/tests/unit/c/help-fss-number.c rename to level_1/fl_fss/tests/unit/c/help-fss-payload.c index 4f6adaa..c1ad745 100644 --- a/level_1/fl_fss/tests/unit/c/help-fss-number.c +++ b/level_1/fl_fss/tests/unit/c/help-fss-payload.c @@ -4,7 +4,7 @@ extern "C" { #endif -void help_number__test_payload(const f_string_t context_variables, const f_string_t context_headers, const uint64_t flag, void (*load_contents_at)(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state)) { +void help_payload__test(const f_string_t context_variables, const f_string_t context_headers, const uint64_t flag, void (*load_contents)(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state)) { // Note: Each line should probably be at max 255 characters. // The payload begins with a digit on the first line representing the number of Content lines following the Object line. @@ -39,7 +39,7 @@ void help_number__test_payload(const f_string_t context_variables, const f_strin state.status = f_memory_array_increase(state.step_small, sizeof(f_abstruse_map_t), (void **) &headers.array, &headers.used, &headers.size); assert_true(F_status_is_error_not(state.status)); - load_contents_at(object, contents, &headers, &state); + load_contents(object, contents, &headers, &state); if (object.string) free(object.string); diff --git a/level_1/fl_fss/tests/unit/c/help-fss-number.h b/level_1/fl_fss/tests/unit/c/help-fss-payload.h similarity index 60% rename from level_1/fl_fss/tests/unit/c/help-fss-number.h rename to level_1/fl_fss/tests/unit/c/help-fss-payload.h index da90da0..d189548 100644 --- a/level_1/fl_fss/tests/unit/c/help-fss-number.h +++ b/level_1/fl_fss/tests/unit/c/help-fss-payload.h @@ -7,8 +7,8 @@ * * Helper for the fss project tests. */ -#ifndef _HELP__FL_fss_number_h -#define _HELP__FL_fss_number_h +#ifndef _HELP__FL_fss_payload_h +#define _HELP__FL_fss_payload_h #ifdef __cplusplus extern "C" { @@ -23,13 +23,13 @@ extern "C" { * The context name of the headers file for data__file_open__named_at(). * @param flag * The payload header state data flag. - * @param load_contents_at + * @param load_contents * A callback to perform the type-specific content loading translation of the number. */ -void help_number__test_payload(const f_string_t context_variables, const f_string_t context_headers, const uint64_t flag, void (*load_contents_at)(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state)); +void help_payload__test(const f_string_t context_variables, const f_string_t context_headers, const uint64_t flag, void (*load_contents)(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state)); #ifdef __cplusplus } // extern "C" #endif -#endif // _HELP__FL_fss_number_h +#endif // _HELP__FL_fss_payload_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-join.c index 279402d..eca852c 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-join.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_int16s__works_join(void **void_state) { - help_number__test_payload("abstruse_int16s", "join-abstruse_int16s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_int16s__join_load_contents_at); + help_payload__test("abstruse_int16s", "join-abstruse_int16s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_int16s__join_load_contents); } -void test__fl_fss_payload_header_map__abstruse_int16s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_int16s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_int16s_t * const is_a = &headers->array[0].value.is.a_i16s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-join.h index cac38e8..f6fcd8e 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-join.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_int16s__works_join(void ** * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_int16s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_int16s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_int16s_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.c index 344fa49..7c073bd 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_int16s__works_split(void **void_state) { - help_number__test_payload("abstruse_int16s", "split-abstruse_int16s", 0, test__fl_fss_payload_header_map__abstruse_int16s__split_load_contents_at); + help_payload__test("abstruse_int16s", "split-abstruse_int16s", 0, test__fl_fss_payload_header_map__abstruse_int16s__split_load_contents); } -void test__fl_fss_payload_header_map__abstruse_int16s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_int16s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_int16s_t * const is_a = &headers->array[0].value.is.a_i16s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.h index 9558b21..812af3c 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_int16s__works_split(void * * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_int16s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_int16s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_int16s_split_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-join.c index b15d338..1b47d60 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-join.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_int32s__works_join(void **void_state) { - help_number__test_payload("abstruse_int32s", "join-abstruse_int32s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_int32s__join_load_contents_at); + help_payload__test("abstruse_int32s", "join-abstruse_int32s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_int32s__join_load_contents); } -void test__fl_fss_payload_header_map__abstruse_int32s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_int32s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_int32s_t * const is_a = &headers->array[0].value.is.a_i32s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-join.h index 7c15758..398523e 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-join.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_int32s__works_join(void ** * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_int32s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_int32s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_int32s_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.c index 675b381..6ccfa2f 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_int32s__works_split(void **void_state) { - help_number__test_payload("abstruse_int32s", "split-abstruse_int32s", 0, test__fl_fss_payload_header_map__abstruse_int32s__split_load_contents_at); + help_payload__test("abstruse_int32s", "split-abstruse_int32s", 0, test__fl_fss_payload_header_map__abstruse_int32s__split_load_contents); } -void test__fl_fss_payload_header_map__abstruse_int32s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_int32s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_int32s_t * const is_a = &headers->array[0].value.is.a_i32s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.h index 828dbd7..b3dd588 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_int32s__works_split(void * * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_int32s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_int32s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_int32s_split_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-join.c index 2620647..bfd9649 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-join.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_int64s__works_join(void **void_state) { - help_number__test_payload("abstruse_int64s", "join-abstruse_int64s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_int64s__join_load_contents_at); + help_payload__test("abstruse_int64s", "join-abstruse_int64s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_int64s__join_load_contents); } -void test__fl_fss_payload_header_map__abstruse_int64s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_int64s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_int64s_t * const is_a = &headers->array[0].value.is.a_i64s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-join.h index 9a50ac9..df2ce19 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-join.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_int64s__works_join(void ** * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_int64s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_int64s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_int64s_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.c index 41b1416..057caa7 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_int64s__works_split(void **void_state) { - help_number__test_payload("abstruse_int64s", "split-abstruse_int64s", 0, test__fl_fss_payload_header_map__abstruse_int64s__split_load_contents_at); + help_payload__test("abstruse_int64s", "split-abstruse_int64s", 0, test__fl_fss_payload_header_map__abstruse_int64s__split_load_contents); } -void test__fl_fss_payload_header_map__abstruse_int64s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_int64s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_int64s_t * const is_a = &headers->array[0].value.is.a_i64s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.h index ec51131..20d33b7 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_int64s__works_split(void * * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_int64s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_int64s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_int64s_split_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-join.c index ff45ab5..823de7a 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-join.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_int8s__works_join(void **void_state) { - help_number__test_payload("abstruse_int8s", "join-abstruse_int8s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_int8s__join_load_contents_at); + help_payload__test("abstruse_int8s", "join-abstruse_int8s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_int8s__join_load_contents); } -void test__fl_fss_payload_header_map__abstruse_int8s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_int8s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_int8s_t * const is_a = &headers->array[0].value.is.a_i8s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-join.h index a610d1a..a8d1a05 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-join.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_int8s__works_join(void **s * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_int8s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_int8s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_int8s_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.c index bfca9a3..f49e3e6 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_int8s__works_split(void **void_state) { - help_number__test_payload("abstruse_int8s", "split-abstruse_int8s", 0, test__fl_fss_payload_header_map__abstruse_int8s__split_load_contents_at); + help_payload__test("abstruse_int8s", "split-abstruse_int8s", 0, test__fl_fss_payload_header_map__abstruse_int8s__split_load_contents); } -void test__fl_fss_payload_header_map__abstruse_int8s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_int8s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_int8s_t * const is_a = &headers->array[0].value.is.a_i8s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.h index 7172c7f..41e9b98 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_int8s__works_split(void ** * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_int8s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_int8s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_int8s_split_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.c index 876687b..b34ee34 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_signed__works_join(void **void_state) { - help_number__test_payload("abstruse_signed", "join-abstruse_signed", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_signed__join_load_contents_at); + help_payload__test("abstruse_signed", "join-abstruse_signed", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_signed__join_load_contents); } -void test__fl_fss_payload_header_map__abstruse_signed__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_signed__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { for (f_number_unsigned_t i = 0; i < contents.used; ++i, ++headers->used) { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.h index 617cbe5..618e6e9 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_signed__works_join(void ** * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_signed__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_signed__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_signed_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-join.c index 728a0a6..e9140db 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-join.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_signeds__works_join(void **void_state) { - help_number__test_payload("abstruse_signeds", "join-abstruse_signeds", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_signeds__join_load_contents_at); + help_payload__test("abstruse_signeds", "join-abstruse_signeds", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_signeds__join_load_contents); } -void test__fl_fss_payload_header_map__abstruse_signeds__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_signeds__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_number_signeds_t * const is_a = &headers->array[0].value.is.a_signeds; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-join.h index 53cb59f..c69539f 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-join.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_signeds__works_join(void * * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_signeds__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_signeds__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_signeds_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.c index 50bbd82..29b7a53 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_signeds__works_split(void **void_state) { - help_number__test_payload("abstruse_signeds", "split-abstruse_signeds", 0, test__fl_fss_payload_header_map__abstruse_signeds__split_load_contents_at); + help_payload__test("abstruse_signeds", "split-abstruse_signeds", 0, test__fl_fss_payload_header_map__abstruse_signeds__split_load_contents); } -void test__fl_fss_payload_header_map__abstruse_signeds__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_signeds__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_number_signeds_t * const is_a = &headers->array[0].value.is.a_signeds; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.h index 7171f7b..4989bab 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_signeds__works_split(void * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_signeds__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_signeds__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_signeds_split_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_string-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_string-join.c index c1e7429..fefa7d2 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_string-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_string-join.c @@ -6,127 +6,21 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_string__works_join(void **void_state) { - // Note: Each line should probably be at max 255 characters. - // The payload begins with a digit on the first line representing the number of Content lines following the Object line. - // Following the digit is a single Object line. - // Following the Object line is a line for each Content designated by the first line (can be 0). - // Following this Content line (even if 0 lines) should be the end of the test file or the start of the next set for the next line in the headers file. - FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_string"); - FILE *file_headers = 0; - - assert_non_null(file_variables); - - f_abstruse_maps_t headers = f_abstruse_maps_t_initialize; - f_state_t state = f_state_t_initialize; - f_fss_payload_header_state_t data = f_fss_payload_header_state_t_initialize; - f_string_dynamic_t object = f_string_dynamic_t_initialize; - f_string_dynamics_t contents = f_string_dynamics_t_initialize; - f_string_dynamic_t cache = f_string_dynamic_t_initialize; - f_string_maps_t destinations = f_string_maps_t_initialize; - f_string_maps_t expects = f_string_maps_t_initialize; - - { - state.status = F_none; - state.data = &data; - data.cache = &cache; - - for (uint16_t at = 0; ; ++at) { - - if (help__read_line_object(file_variables, &object)) break; - if (help__read_line_contents__single(file_variables, &contents, F_false)) break; - - state.status = f_memory_array_increase_by(contents.used, sizeof(f_abstruse_map_t), (void **) &headers.array, &headers.used, &headers.size); - assert_true(F_status_is_error_not(state.status)); - - for (f_number_unsigned_t i = 0; i < contents.used; ++i, ++headers.used) { - - headers.array[headers.used].key.used = 0; - - state.status = f_string_dynamic_append(object, &headers.array[headers.used].key); - assert_int_equal(state.status, F_okay); - - headers.array[headers.used].value.type = f_abstruse_string_e; - headers.array[headers.used].value.is.a_string = contents.array[i].string; - } // for - - if (object.string) free(object.string); - - object.string = 0; - object.used = 0; - object.size = 0; - - file_headers = data__file_open__named_at("headers", "payload", "join-abstruse_string", at); - assert_non_null(file_headers); - - help__read_line_object(file_headers, &object); - - for (;;) { - state.status = f_memory_array_increase(state.step_small, sizeof(f_string_map_t), (void **) &expects.array, &expects.used, &expects.size); - assert_true(F_status_is_error_not(state.status)); - - if (help__read_line_expects__single(file_headers, object, &expects)) break; - } // for - - fl_fss_payload_header_map(headers, &destinations, &state); - assert_int_equal(state.status, F_okay); - assert_int_equal(destinations.used, expects.used); - - for (f_number_unsigned_t i = 0; i < destinations.used; ++i) { - - assert_int_equal(destinations.array[i].key.used, expects.array[i].key.used); - assert_int_equal(destinations.array[i].value.used, expects.array[i].value.used); - - assert_string_equal(destinations.array[i].key.string, expects.array[i].key.string); - assert_string_equal(destinations.array[i].value.string, expects.array[i].value.string); - } // for - - if (object.string) free(object.string); - if (cache.string) free(cache.string); - if (file_headers) fclose(file_headers); - - f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &contents.array, &contents.used, &contents.size, &f_string_dynamics_delete_callback); - f_memory_arrays_resize(0, sizeof(f_abstruse_map_t), (void **) &headers.array, &headers.used, &headers.size, &f_abstruse_maps_delete_callback); - f_memory_arrays_resize(0, sizeof(f_string_map_t), (void **) &destinations.array, &destinations.used, &destinations.size, &f_string_maps_delete_callback); - f_memory_arrays_resize(0, sizeof(f_string_map_t), (void **) &expects.array, &expects.used, &expects.size, &f_string_maps_delete_callback); - - file_headers = 0; - - object.string = 0; - object.used = 0; - object.size = 0; - - cache.string = 0; - cache.used = 0; - cache.size = 0; - - contents.array = 0; - contents.used = 0; - contents.size = 0; - - headers.array = 0; - headers.used = 0; - headers.size = 0; + help_payload__test("abstruse_string", "join-abstruse_string", 0, test__fl_fss_payload_header_map__abstruse_string__join_load_contents); +} - destinations.array = 0; - destinations.used = 0; - destinations.size = 0; +void test__fl_fss_payload_header_map__abstruse_string__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { - expects.array = 0; - expects.used = 0; - expects.size = 0; - } // for - } + for (f_number_unsigned_t i = 0; i < contents.used; ++i, ++headers->used) { - if (file_variables) fclose(file_variables); - if (file_headers) fclose(file_headers); + headers->array[headers->used].key.used = 0; - if (object.string) free(object.string); - if (cache.string) free(cache.string); + state->status = f_string_dynamic_append(object, &headers->array[headers->used].key); + assert_int_equal(state->status, F_okay); - f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &contents.array, &contents.used, &contents.size, &f_string_dynamics_delete_callback); - f_memory_arrays_resize(0, sizeof(f_abstruse_map_t), (void **) &headers.array, &headers.used, &headers.size, &f_abstruse_maps_delete_callback); - f_memory_arrays_resize(0, sizeof(f_string_map_t), (void **) &destinations.array, &destinations.used, &destinations.size, &f_string_maps_delete_callback); - f_memory_arrays_resize(0, sizeof(f_string_map_t), (void **) &expects.array, &expects.used, &expects.size, &f_string_maps_delete_callback); + headers->array[headers->used].value.type = f_abstruse_string_e; + headers->array[headers->used].value.is.a_string = contents.array[i].string; + } // for } #ifdef __cplusplus diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_string-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_string-join.h index cc19eba..dcb7bed 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_string-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_string-join.h @@ -17,4 +17,18 @@ */ extern void test__fl_fss_payload_header_map__abstruse_string__works_join(void **state); +/** + * Callback to load the contents for the test. + * + * @param object + * The object parameter. + * @param contents + * The contents parameter. + * @param headers + * The headers parameter. + * @param state + * The state parameter. + */ +extern void test__fl_fss_payload_header_map__abstruse_string__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); + #endif // _TEST__FL_fss_payload_header_map__abstruse_string_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-join.c index 820b062..93de46f 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-join.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_uint16s__works_join(void **void_state) { - help_number__test_payload("abstruse_uint16s", "join-abstruse_uint16s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_uint16s__join_load_contents_at); + help_payload__test("abstruse_uint16s", "join-abstruse_uint16s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_uint16s__join_load_contents); } -void test__fl_fss_payload_header_map__abstruse_uint16s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_uint16s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_uint16s_t * const is_a = &headers->array[0].value.is.a_u16s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-join.h index 68209af..116e06f 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-join.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_uint16s__works_join(void * * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_uint16s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_uint16s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_uint16s_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.c index f1c084a..bd5bdca 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_uint16s__works_split(void **void_state) { - help_number__test_payload("abstruse_uint16s", "split-abstruse_uint16s", 0, test__fl_fss_payload_header_map__abstruse_uint16s__split_load_contents_at); + help_payload__test("abstruse_uint16s", "split-abstruse_uint16s", 0, test__fl_fss_payload_header_map__abstruse_uint16s__split_load_contents); } -void test__fl_fss_payload_header_map__abstruse_uint16s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_uint16s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_uint16s_t * const is_a = &headers->array[0].value.is.a_u16s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.h index 7cfeeeb..666c1b7 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_uint16s__works_split(void * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_uint16s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_uint16s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_uint16s_split_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-join.c index 6ba4048..485c364 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-join.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_uint32s__works_join(void **void_state) { - help_number__test_payload("abstruse_uint32s", "join-abstruse_uint32s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_uint32s__join_load_contents_at); + help_payload__test("abstruse_uint32s", "join-abstruse_uint32s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_uint32s__join_load_contents); } -void test__fl_fss_payload_header_map__abstruse_uint32s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_uint32s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_uint32s_t * const is_a = &headers->array[0].value.is.a_u32s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-join.h index 87f8f8d..cf841ed 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-join.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_uint32s__works_join(void * * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_uint32s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_uint32s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_uint32s_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.c index 2316bbc..481d40b 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_uint32s__works_split(void **void_state) { - help_number__test_payload("abstruse_uint32s", "split-abstruse_uint32s", 0, test__fl_fss_payload_header_map__abstruse_uint32s__split_load_contents_at); + help_payload__test("abstruse_uint32s", "split-abstruse_uint32s", 0, test__fl_fss_payload_header_map__abstruse_uint32s__split_load_contents); } -void test__fl_fss_payload_header_map__abstruse_uint32s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_uint32s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_uint32s_t * const is_a = &headers->array[0].value.is.a_u32s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.h index 958de22..1fe5106 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_uint32s__works_split(void * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_uint32s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_uint32s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_uint32s_split_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-join.c index 628cc3e..73f100a 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-join.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_uint64s__works_join(void **void_state) { - help_number__test_payload("abstruse_uint64s", "join-abstruse_uint64s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_uint64s__join_load_contents_at); + help_payload__test("abstruse_uint64s", "join-abstruse_uint64s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_uint64s__join_load_contents); } -void test__fl_fss_payload_header_map__abstruse_uint64s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_uint64s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_uint64s_t * const is_a = &headers->array[0].value.is.a_u64s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-join.h index 8bef639..424f064 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-join.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_uint64s__works_join(void * * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_uint64s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_uint64s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_uint64s_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.c index 655434c..3683896 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_uint64s__works_split(void **void_state) { - help_number__test_payload("abstruse_uint64s", "split-abstruse_uint64s", 0, test__fl_fss_payload_header_map__abstruse_uint64s__split_load_contents_at); + help_payload__test("abstruse_uint64s", "split-abstruse_uint64s", 0, test__fl_fss_payload_header_map__abstruse_uint64s__split_load_contents); } -void test__fl_fss_payload_header_map__abstruse_uint64s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_uint64s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_uint64s_t * const is_a = &headers->array[0].value.is.a_u64s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.h index dc063f7..02fbafc 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_uint64s__works_split(void * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_uint64s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_uint64s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_uint64s_split_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-join.c index ff04243..f6a2a97 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-join.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_uint8s__works_join(void **void_state) { - help_number__test_payload("abstruse_uint8s", "join-abstruse_uint8s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_uint8s__join_load_contents_at); + help_payload__test("abstruse_uint8s", "join-abstruse_uint8s", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_uint8s__join_load_contents); } -void test__fl_fss_payload_header_map__abstruse_uint8s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_uint8s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_uint8s_t * const is_a = &headers->array[0].value.is.a_u8s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-join.h index 8339589..2d47f69 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-join.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_uint8s__works_join(void ** * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_uint8s__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_uint8s__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_uint8s_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.c index 9a0b796..d8d7113 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_uint8s__works_split(void **void_state) { - help_number__test_payload("abstruse_uint8s", "split-abstruse_uint8s", 0, test__fl_fss_payload_header_map__abstruse_uint8s__split_load_contents_at); + help_payload__test("abstruse_uint8s", "split-abstruse_uint8s", 0, test__fl_fss_payload_header_map__abstruse_uint8s__split_load_contents); } -void test__fl_fss_payload_header_map__abstruse_uint8s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_uint8s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_uint8s_t * const is_a = &headers->array[0].value.is.a_u8s; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.h index 7fe85cd..e04fd8a 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_uint8s__works_split(void * * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_uint8s__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_uint8s__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_uint8s_split_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.c index dae916f..adfb87d 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_unsigned__works_join(void **void_state) { - help_number__test_payload("abstruse_unsigned", "join-abstruse_unsigned", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_unsigned__join_load_contents_at); + help_payload__test("abstruse_unsigned", "join-abstruse_unsigned", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_unsigned__join_load_contents); } -void test__fl_fss_payload_header_map__abstruse_unsigned__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_unsigned__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { for (f_number_unsigned_t i = 0; i < contents.used; ++i, ++headers->used) { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.h index cf0c5ef..8c04f95 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_unsigned__works_join(void * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_unsigned__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_unsigned__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_unsigned_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-join.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-join.c index 13ddc81..26b8743 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-join.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-join.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_unsigneds__works_join(void **void_state) { - help_number__test_payload("abstruse_unsigneds", "join-abstruse_unsigneds", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_unsigneds__join_load_contents_at); + help_payload__test("abstruse_unsigneds", "join-abstruse_unsigneds", f_fss_payload_header_map_flag_join_digits_e, test__fl_fss_payload_header_map__abstruse_unsigneds__join_load_contents); } -void test__fl_fss_payload_header_map__abstruse_unsigneds__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_unsigneds__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_number_unsigneds_t * const is_a = &headers->array[0].value.is.a_unsigneds; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-join.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-join.h index 580477d..7586d0e 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-join.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-join.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_unsigneds__works_join(void * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_unsigneds__join_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_unsigneds__join_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_unsigneds_join_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.c index a8be2d1..8c420a1 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.c @@ -6,10 +6,10 @@ extern "C" { void test__fl_fss_payload_header_map__abstruse_unsigneds__works_split(void **void_state) { - help_number__test_payload("abstruse_unsigneds", "split-abstruse_unsigneds", 0, test__fl_fss_payload_header_map__abstruse_unsigneds__split_load_contents_at); + help_payload__test("abstruse_unsigneds", "split-abstruse_unsigneds", 0, test__fl_fss_payload_header_map__abstruse_unsigneds__split_load_contents); } -void test__fl_fss_payload_header_map__abstruse_unsigneds__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { +void test__fl_fss_payload_header_map__abstruse_unsigneds__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state) { f_number_unsigneds_t * const is_a = &headers->array[0].value.is.a_unsigneds; diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.h index bd431cf..2b3b3f2 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.h @@ -29,6 +29,6 @@ extern void test__fl_fss_payload_header_map__abstruse_unsigneds__works_split(voi * @param state * The state parameter. */ -void test__fl_fss_payload_header_map__abstruse_unsigneds__split_load_contents_at(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); +extern void test__fl_fss_payload_header_map__abstruse_unsigneds__split_load_contents(const f_string_static_t object, const f_string_dynamics_t contents, f_abstruse_maps_t * const headers, f_state_t * const state); #endif // _TEST__FL_fss_payload_header_map__abstruse_unsigneds_split_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss.h b/level_1/fl_fss/tests/unit/c/test-fss.h index d0e0e5a..53b443a 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss.h +++ b/level_1/fl_fss/tests/unit/c/test-fss.h @@ -38,7 +38,7 @@ // Data includes. #include "data-fss.h" #include "help-fss.h" -#include "help-fss-number.h" +#include "help-fss-payload.h" // Test includes. #include "test-fss-basic_content_read.h"