From: Kevin Day Date: Fri, 1 Mar 2024 03:00:38 +0000 (-0600) Subject: Cleanup: Rename existing fl_fss abstruse tests to use "join" and "split" rather than... X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=710a33ba9e30c89bef9600f2fe21be563ca04383;p=fll Cleanup: Rename existing fl_fss abstruse tests to use "join" and "split" rather than "combined". I forgot all about the function and files ending in "combined". I am about to start writing tests for the "join" flag and noticed this discrepancy. Rename everything to prevent any confusion. --- diff --git a/level_1/fl_fss/data/build/settings-tests b/level_1/fl_fss/data/build/settings-tests index 2979d95..0c1eb9c 100644 --- a/level_1/fl_fss/data/build/settings-tests +++ b/level_1/fl_fss/data/build/settings-tests @@ -31,12 +31,12 @@ build_sources_program test-fss-embedded_list_content_read.c test-fss-embedded_li build_sources_program test-fss-extended_content_read.c test-fss-extended_content_write.c test-fss-extended_object_read.c test-fss-extended_object_write.c build_sources_program test-fss-extended_list_content_read.c test-fss-extended_list_content_write.c test-fss-extended_list_object_read.c test-fss-extended_list_object_write.c build_sources_program test-fss-payload_header_map.c -build_sources_program test-fss-payload_header_map-abstruse_int8s.c test-fss-payload_header_map-abstruse_uint8s.c -build_sources_program test-fss-payload_header_map-abstruse_int16s.c test-fss-payload_header_map-abstruse_uint16s.c -build_sources_program test-fss-payload_header_map-abstruse_int32s.c test-fss-payload_header_map-abstruse_uint32s.c -build_sources_program test-fss-payload_header_map-abstruse_int64s.c test-fss-payload_header_map-abstruse_uint64s.c -build_sources_program test-fss-payload_header_map-abstruse_signed.c test-fss-payload_header_map-abstruse_unsigned.c -build_sources_program test-fss-payload_header_map-abstruse_signeds.c test-fss-payload_header_map-abstruse_unsigneds.c +build_sources_program test-fss-payload_header_map-abstruse_int8s-split.c test-fss-payload_header_map-abstruse_uint8s-split.c +build_sources_program test-fss-payload_header_map-abstruse_int16s-split.c test-fss-payload_header_map-abstruse_uint16s-split.c +build_sources_program test-fss-payload_header_map-abstruse_int32s-split.c test-fss-payload_header_map-abstruse_uint32s-split.c +build_sources_program test-fss-payload_header_map-abstruse_int64s-split.c test-fss-payload_header_map-abstruse_uint64s-split.c +build_sources_program test-fss-payload_header_map-abstruse_signed-join.c test-fss-payload_header_map-abstruse_unsigned-join.c +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.c data-fss.c help-fss.c diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int16-0.txt b/level_1/fl_fss/data/tests/headers/payload-join-abstruse_signed-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int16-0.txt rename to level_1/fl_fss/data/tests/headers/payload-join-abstruse_signed-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int32-1.txt b/level_1/fl_fss/data/tests/headers/payload-join-abstruse_signed-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int32-1.txt rename to level_1/fl_fss/data/tests/headers/payload-join-abstruse_signed-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_signed-2.txt b/level_1/fl_fss/data/tests/headers/payload-join-abstruse_signed-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_signed-2.txt rename to level_1/fl_fss/data/tests/headers/payload-join-abstruse_signed-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int32-0.txt b/level_1/fl_fss/data/tests/headers/payload-join-abstruse_unsigned-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int32-0.txt rename to level_1/fl_fss/data/tests/headers/payload-join-abstruse_unsigned-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int64-1.txt b/level_1/fl_fss/data/tests/headers/payload-join-abstruse_unsigned-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int64-1.txt rename to level_1/fl_fss/data/tests/headers/payload-join-abstruse_unsigned-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_unsigned-2.txt b/level_1/fl_fss/data/tests/headers/payload-join-abstruse_unsigned-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_unsigned-2.txt rename to level_1/fl_fss/data/tests/headers/payload-join-abstruse_unsigned-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int64-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int16-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int64-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int16-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int16-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int16-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int16-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int16-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int16-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int16-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int16-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int16-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int16s-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int16s-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int16s-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int16s-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int16s-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int16s-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int16s-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int16s-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int16s-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int16s-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int16s-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int16s-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int8-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int32-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int8-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int32-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_signed-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int32-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_signed-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int32-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int32-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int32-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int32-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int32-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int32s-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int32s-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int32s-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int32s-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int32s-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int32s-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int32s-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int32s-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int32s-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int32s-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int32s-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int32s-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_signed-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int64-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_signed-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int64-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint32-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int64-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint32-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int64-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int64-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int64-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int64-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int64-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int64s-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int64s-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int64s-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int64s-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int64s-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int64s-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int64s-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int64s-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int64s-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int64s-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int64s-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int64s-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint16-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int8-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint16-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int8-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int8-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int8-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int8-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int8-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int8-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int8-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int8-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int8-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int8s-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int8s-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int8s-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int8s-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int8s-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int8s-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int8s-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int8s-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int8s-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_int8s-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_int8s-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_int8s-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_signeds-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_signeds-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_signeds-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_signeds-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_signeds-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_signeds-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_signeds-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_signeds-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_signeds-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_signeds-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_signeds-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_signeds-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint32-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint16-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint32-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint16-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint16-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint16-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint16-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint16-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint16-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint16-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint16-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint16-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint16s-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint16s-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint16s-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint16s-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint16s-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint16s-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint16s-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint16s-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint16s-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint16s-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint16s-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint16s-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint64-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint32-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint64-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint32-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint64-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint32-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint64-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint32-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint32-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint32-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint32-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint32-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint32s-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint32s-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint32s-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint32s-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint32s-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint32s-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint32s-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint32s-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint32s-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint32s-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint32s-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint32s-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint8-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint64-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint8-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint64-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_unsigned-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint64-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_unsigned-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint64-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint64-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint64-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint64-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint64-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint64s-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint64s-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint64s-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint64s-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint64s-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint64s-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint64s-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint64s-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint64s-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint64s-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint64s-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint64s-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_unsigned-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint8-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_unsigned-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint8-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint8-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint8-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint8-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint8-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint8-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint8-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint8-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint8-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint8s-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint8s-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint8s-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint8s-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint8s-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint8s-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint8s-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint8s-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint8s-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint8s-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_uint8s-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_uint8s-2.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_unsigneds-0.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_unsigneds-0.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_unsigneds-0.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_unsigneds-0.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_unsigneds-1.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_unsigneds-1.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_unsigneds-1.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_unsigneds-1.txt diff --git a/level_1/fl_fss/data/tests/headers/payload-combined-abstruse_unsigneds-2.txt b/level_1/fl_fss/data/tests/headers/payload-split-abstruse_unsigneds-2.txt similarity index 100% rename from level_1/fl_fss/data/tests/headers/payload-combined-abstruse_unsigneds-2.txt rename to level_1/fl_fss/data/tests/headers/payload-split-abstruse_unsigneds-2.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int16.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_int16.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int16.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_int16.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int16s.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_int16s.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int16s.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_int16s.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int32.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_int32.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int32.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_int32.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int32s.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_int32s.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int32s.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_int32s.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int64.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_int64.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int64.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_int64.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int64s.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_int64s.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int64s.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_int64s.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int8.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_int8.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int8.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_int8.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int8s.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_int8s.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_int8s.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_int8s.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_signed.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_signed.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_signed.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_signed.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_signeds.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_signeds.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_signeds.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_signeds.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint16.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_uint16.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint16.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_uint16.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint16s.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_uint16s.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint16s.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_uint16s.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint32.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_uint32.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint32.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_uint32.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint32s.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_uint32s.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint32s.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_uint32s.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint64.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_uint64.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint64.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_uint64.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint64s.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_uint64s.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint64s.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_uint64s.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint8.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_uint8.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint8.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_uint8.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint8s.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_uint8s.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_uint8s.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_uint8s.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_unsigned.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_unsigned.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_unsigned.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_unsigned.txt diff --git a/level_1/fl_fss/data/tests/variables/payload-combined-abstruse_unsigneds.txt b/level_1/fl_fss/data/tests/variables/payload-abstruse_unsigneds.txt similarity index 100% rename from level_1/fl_fss/data/tests/variables/payload-combined-abstruse_unsigneds.txt rename to level_1/fl_fss/data/tests/variables/payload-abstruse_unsigneds.txt 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 0983cab..20bba29 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 @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-basic_content_read.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-basic_content_write.c b/level_1/fl_fss/tests/unit/c/test-fss-basic_content_write.c index f173e1f..faa5491 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-basic_content_write.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-basic_content_write.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-basic_content_write.h" #ifdef __cplusplus extern "C" { 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 34210a3..5fc5f4d 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 @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-basic_list_content_read.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-basic_list_content_write.c b/level_1/fl_fss/tests/unit/c/test-fss-basic_list_content_write.c index c623502..ed61cda 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-basic_list_content_write.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-basic_list_content_write.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-basic_list_content_write.h" #ifdef __cplusplus extern "C" { 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 1d24725..fb7b444 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 @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-basic_list_object_read.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-basic_list_object_write.c b/level_1/fl_fss/tests/unit/c/test-fss-basic_list_object_write.c index f527068..b766da3 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-basic_list_object_write.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-basic_list_object_write.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-basic_list_object_write.h" #ifdef __cplusplus extern "C" { 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 87ddb23..2fd4e35 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 @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-basic_object_read.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-basic_object_write.c b/level_1/fl_fss/tests/unit/c/test-fss-basic_object_write.c index 217260f..5910365 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-basic_object_write.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-basic_object_write.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-basic_object_write.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_content_read.c b/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_content_read.c index c331a05..93bf996 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_content_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_content_read.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-embedded_list_content_read.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_content_write.c b/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_content_write.c index 107ab25..7eea7f9 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_content_write.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_content_write.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-embedded_list_content_write.h" #ifdef __cplusplus extern "C" { 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 4e27e97..c7a791d 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 @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-embedded_list_object_read.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_object_write.c b/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_object_write.c index 13066cf..d50719a 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_object_write.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-embedded_list_object_write.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-embedded_list_object_write.h" #ifdef __cplusplus extern "C" { 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 d8e905d..af0b522 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 @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-extended_content_read.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-extended_content_write.c b/level_1/fl_fss/tests/unit/c/test-fss-extended_content_write.c index ba5ede1..ff46e55 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-extended_content_write.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-extended_content_write.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-extended_content_write.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-extended_list_content_read.c b/level_1/fl_fss/tests/unit/c/test-fss-extended_list_content_read.c index 140d8fb..6c75e6e 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-extended_list_content_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-extended_list_content_read.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-extended_list_content_read.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-extended_list_content_write.c b/level_1/fl_fss/tests/unit/c/test-fss-extended_list_content_write.c index e73ca23..9082d80 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-extended_list_content_write.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-extended_list_content_write.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-extended_list_content_write.h" #ifdef __cplusplus extern "C" { 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 acacff6..941479c 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 @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-extended_list_object_read.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-extended_list_object_write.c b/level_1/fl_fss/tests/unit/c/test-fss-extended_list_object_write.c index 4f8a81f..fbb8009 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-extended_list_object_write.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-extended_list_object_write.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-extended_list_object_write.h" #ifdef __cplusplus extern "C" { 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 6154b4b..b91286a 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 @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-extended_object_read.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-extended_object_write.c b/level_1/fl_fss/tests/unit/c/test-fss-extended_object_write.c index edfdd80..78c9690 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-extended_object_write.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-extended_object_write.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-extended_object_write.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.c similarity index 96% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s.c rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.c index acdeded..f8626fe 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.c @@ -1,18 +1,17 @@ #include "test-fss.h" -#include "test-fss-payload_header_map-abstruse_int16s.h" #ifdef __cplusplus extern "C" { #endif -void test__fl_fss_payload_header_map__abstruse_int16s__works_combined(void **void_state) { +void test__fl_fss_payload_header_map__abstruse_int16s__works_split(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", "combined-abstruse_int16s"); + FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_int16s"); FILE *file_headers = 0; assert_non_null(file_variables); @@ -70,7 +69,7 @@ void test__fl_fss_payload_header_map__abstruse_int16s__works_combined(void **voi ++headers.used; - file_headers = data__file_open__named_at("headers", "payload", "combined-abstruse_int16s", at); + file_headers = data__file_open__named_at("headers", "payload", "split-abstruse_int16s", at); assert_non_null(file_headers); help__read_line_object(file_headers, &object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.h similarity index 56% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s.h rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.h index b0543d7..0f8482d 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int16s-split.h @@ -7,14 +7,14 @@ * * Test the fl_fss project. */ -#ifndef _TEST__FL_fss_payload_header_map__abstruse_int16s_h -#define _TEST__FL_fss_payload_header_map__abstruse_int16s_h +#ifndef _TEST__FL_fss_payload_header_map__abstruse_int16s_split_h +#define _TEST__FL_fss_payload_header_map__abstruse_int16s_split_h /** * Test that the function works for abstruse_int16s type. * * @see fl_fss_payload_header_map() */ -extern void test__fl_fss_payload_header_map__abstruse_int16s__works_combined(void **state); +extern void test__fl_fss_payload_header_map__abstruse_int16s__works_split(void **state); -#endif // _TEST__FL_fss_payload_header_map__abstruse_int16s_h +#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.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.c similarity index 96% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s.c rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.c index 6ed1ea3..7b85179 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.c @@ -1,18 +1,17 @@ #include "test-fss.h" -#include "test-fss-payload_header_map-abstruse_int32s.h" #ifdef __cplusplus extern "C" { #endif -void test__fl_fss_payload_header_map__abstruse_int32s__works_combined(void **void_state) { +void test__fl_fss_payload_header_map__abstruse_int32s__works_split(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", "combined-abstruse_int32s"); + FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_int32s"); FILE *file_headers = 0; assert_non_null(file_variables); @@ -70,7 +69,7 @@ void test__fl_fss_payload_header_map__abstruse_int32s__works_combined(void **voi ++headers.used; - file_headers = data__file_open__named_at("headers", "payload", "combined-abstruse_int32s", at); + file_headers = data__file_open__named_at("headers", "payload", "split-abstruse_int32s", at); assert_non_null(file_headers); help__read_line_object(file_headers, &object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.h similarity index 56% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s.h rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.h index a53c963..edbfc10 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int32s-split.h @@ -7,14 +7,14 @@ * * Test the fl_fss project. */ -#ifndef _TEST__FL_fss_payload_header_map__abstruse_int32s_h -#define _TEST__FL_fss_payload_header_map__abstruse_int32s_h +#ifndef _TEST__FL_fss_payload_header_map__abstruse_int32s_split_h +#define _TEST__FL_fss_payload_header_map__abstruse_int32s_split_h /** * Test that the function works for abstruse_int32s type. * * @see fl_fss_payload_header_map() */ -extern void test__fl_fss_payload_header_map__abstruse_int32s__works_combined(void **state); +extern void test__fl_fss_payload_header_map__abstruse_int32s__works_split(void **state); -#endif // _TEST__FL_fss_payload_header_map__abstruse_int32s_h +#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.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.c similarity index 96% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s.c rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.c index 0134de7..bd4d9c1 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.c @@ -1,18 +1,17 @@ #include "test-fss.h" -#include "test-fss-payload_header_map-abstruse_int64s.h" #ifdef __cplusplus extern "C" { #endif -void test__fl_fss_payload_header_map__abstruse_int64s__works_combined(void **void_state) { +void test__fl_fss_payload_header_map__abstruse_int64s__works_split(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", "combined-abstruse_int64s"); + FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_int64s"); FILE *file_headers = 0; assert_non_null(file_variables); @@ -70,7 +69,7 @@ void test__fl_fss_payload_header_map__abstruse_int64s__works_combined(void **voi ++headers.used; - file_headers = data__file_open__named_at("headers", "payload", "combined-abstruse_int64s", at); + file_headers = data__file_open__named_at("headers", "payload", "split-abstruse_int64s", at); assert_non_null(file_headers); help__read_line_object(file_headers, &object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.h similarity index 56% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s.h rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.h index f59a7be..7ebabf1 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int64s-split.h @@ -7,14 +7,14 @@ * * Test the fl_fss project. */ -#ifndef _TEST__FL_fss_payload_header_map__abstruse_int64s_h -#define _TEST__FL_fss_payload_header_map__abstruse_int64s_h +#ifndef _TEST__FL_fss_payload_header_map__abstruse_int64s_split_h +#define _TEST__FL_fss_payload_header_map__abstruse_int64s_split_h /** * Test that the function works for abstruse_int64s type. * * @see fl_fss_payload_header_map() */ -extern void test__fl_fss_payload_header_map__abstruse_int64s__works_combined(void **state); +extern void test__fl_fss_payload_header_map__abstruse_int64s__works_split(void **state); -#endif // _TEST__FL_fss_payload_header_map__abstruse_int64s_h +#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.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.c similarity index 96% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s.c rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.c index 06f796c..8d4be14 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.c @@ -1,18 +1,17 @@ #include "test-fss.h" -#include "test-fss-payload_header_map-abstruse_int8s.h" #ifdef __cplusplus extern "C" { #endif -void test__fl_fss_payload_header_map__abstruse_int8s__works_combined(void **void_state) { +void test__fl_fss_payload_header_map__abstruse_int8s__works_split(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", "combined-abstruse_int8s"); + FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_int8s"); FILE *file_headers = 0; assert_non_null(file_variables); @@ -70,7 +69,7 @@ void test__fl_fss_payload_header_map__abstruse_int8s__works_combined(void **void ++headers.used; - file_headers = data__file_open__named_at("headers", "payload", "combined-abstruse_int8s", at); + file_headers = data__file_open__named_at("headers", "payload", "split-abstruse_int8s", at); assert_non_null(file_headers); help__read_line_object(file_headers, &object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.h similarity index 57% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s.h rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.h index bd758b9..ee11e60 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_int8s-split.h @@ -7,14 +7,14 @@ * * Test the fl_fss project. */ -#ifndef _TEST__FL_fss_payload_header_map__abstruse_int8s_h -#define _TEST__FL_fss_payload_header_map__abstruse_int8s_h +#ifndef _TEST__FL_fss_payload_header_map__abstruse_int8s_split_h +#define _TEST__FL_fss_payload_header_map__abstruse_int8s_split_h /** * Test that the function works for abstruse_int8s type. * * @see fl_fss_payload_header_map() */ -extern void test__fl_fss_payload_header_map__abstruse_int8s__works_combined(void **state); +extern void test__fl_fss_payload_header_map__abstruse_int8s__works_split(void **state); -#endif // _TEST__FL_fss_payload_header_map__abstruse_int8s_h +#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.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.c similarity index 96% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed.c rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.c index 49eb437..73cd677 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.c @@ -1,18 +1,17 @@ #include "test-fss.h" -#include "test-fss-payload_header_map-abstruse_signed.h" #ifdef __cplusplus extern "C" { #endif -void test__fl_fss_payload_header_map__abstruse_signed__works_combined(void **void_state) { +void test__fl_fss_payload_header_map__abstruse_signed__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", "combined-abstruse_signed"); + FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_signed"); FILE *file_headers = 0; assert_non_null(file_variables); @@ -62,7 +61,7 @@ void test__fl_fss_payload_header_map__abstruse_signed__works_combined(void **voi object.used = 0; object.size = 0; - file_headers = data__file_open__named_at("headers", "payload", "combined-abstruse_signed", at); + file_headers = data__file_open__named_at("headers", "payload", "join-abstruse_signed", at); assert_non_null(file_headers); help__read_line_object(file_headers, &object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.h similarity index 57% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed.h rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.h index ea3fc38..25cbf10 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signed-join.h @@ -7,14 +7,14 @@ * * Test the fl_fss project. */ -#ifndef _TEST__FL_fss_payload_header_map__abstruse_signed_h -#define _TEST__FL_fss_payload_header_map__abstruse_signed_h +#ifndef _TEST__FL_fss_payload_header_map__abstruse_signed_join_h +#define _TEST__FL_fss_payload_header_map__abstruse_signed_join_h /** * Test that the function works for abstruse_signed type. * * @see fl_fss_payload_header_map() */ -extern void test__fl_fss_payload_header_map__abstruse_signed__works_combined(void **state); +extern void test__fl_fss_payload_header_map__abstruse_signed__works_join(void **state); -#endif // _TEST__FL_fss_payload_header_map__abstruse_signed_h +#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.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.c similarity index 96% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds.c rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.c index 3acb6b1..f680d9c 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.c @@ -1,18 +1,17 @@ #include "test-fss.h" -#include "test-fss-payload_header_map-abstruse_signeds.h" #ifdef __cplusplus extern "C" { #endif -void test__fl_fss_payload_header_map__abstruse_signeds__works_combined(void **void_state) { +void test__fl_fss_payload_header_map__abstruse_signeds__works_split(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", "combined-abstruse_signeds"); + FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_signeds"); FILE *file_headers = 0; assert_non_null(file_variables); @@ -70,7 +69,7 @@ void test__fl_fss_payload_header_map__abstruse_signeds__works_combined(void **vo ++headers.used; - file_headers = data__file_open__named_at("headers", "payload", "combined-abstruse_signeds", at); + file_headers = data__file_open__named_at("headers", "payload", "split-abstruse_signeds", at); assert_non_null(file_headers); help__read_line_object(file_headers, &object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.h similarity index 56% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds.h rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.h index 77681ae..fff05e1 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_signeds-split.h @@ -7,14 +7,14 @@ * * Test the fl_fss project. */ -#ifndef _TEST__FL_fss_payload_header_map__abstruse_signeds_h -#define _TEST__FL_fss_payload_header_map__abstruse_signeds_h +#ifndef _TEST__FL_fss_payload_header_map__abstruse_signeds_split_h +#define _TEST__FL_fss_payload_header_map__abstruse_signeds_split_h /** * Test that the function works for abstruse_signeds type. * * @see fl_fss_payload_header_map() */ -extern void test__fl_fss_payload_header_map__abstruse_signeds__works_combined(void **state); +extern void test__fl_fss_payload_header_map__abstruse_signeds__works_split(void **state); -#endif // _TEST__FL_fss_payload_header_map__abstruse_signeds_h +#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_uint16s.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.c similarity index 96% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s.c rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.c index a059492..25a98c7 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.c @@ -1,18 +1,17 @@ #include "test-fss.h" -#include "test-fss-payload_header_map-abstruse_uint16s.h" #ifdef __cplusplus extern "C" { #endif -void test__fl_fss_payload_header_map__abstruse_uint16s__works_combined(void **void_state) { +void test__fl_fss_payload_header_map__abstruse_uint16s__works_split(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", "combined-abstruse_uint16s"); + FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_uint16s"); FILE *file_headers = 0; assert_non_null(file_variables); @@ -70,7 +69,7 @@ void test__fl_fss_payload_header_map__abstruse_uint16s__works_combined(void **vo ++headers.used; - file_headers = data__file_open__named_at("headers", "payload", "combined-abstruse_uint16s", at); + file_headers = data__file_open__named_at("headers", "payload", "split-abstruse_uint16s", at); assert_non_null(file_headers); help__read_line_object(file_headers, &object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.h similarity index 56% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s.h rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.h index 9c146dd..7d70090 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint16s-split.h @@ -7,14 +7,14 @@ * * Test the fl_fss project. */ -#ifndef _TEST__FL_fss_payload_header_map__abstruse_uint16s_h -#define _TEST__FL_fss_payload_header_map__abstruse_uint16s_h +#ifndef _TEST__FL_fss_payload_header_map__abstruse_uint16s_split_h +#define _TEST__FL_fss_payload_header_map__abstruse_uint16s_split_h /** * Test that the function works for abstruse_uint16s type. * * @see fl_fss_payload_header_map() */ -extern void test__fl_fss_payload_header_map__abstruse_uint16s__works_combined(void **state); +extern void test__fl_fss_payload_header_map__abstruse_uint16s__works_split(void **state); -#endif // _TEST__FL_fss_payload_header_map__abstruse_uint16s_h +#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.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.c similarity index 96% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s.c rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.c index 6c71bb9..1d65e31 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.c @@ -1,18 +1,17 @@ #include "test-fss.h" -#include "test-fss-payload_header_map-abstruse_uint32s.h" #ifdef __cplusplus extern "C" { #endif -void test__fl_fss_payload_header_map__abstruse_uint32s__works_combined(void **void_state) { +void test__fl_fss_payload_header_map__abstruse_uint32s__works_split(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", "combined-abstruse_uint32s"); + FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_uint32s"); FILE *file_headers = 0; assert_non_null(file_variables); @@ -70,7 +69,7 @@ void test__fl_fss_payload_header_map__abstruse_uint32s__works_combined(void **vo ++headers.used; - file_headers = data__file_open__named_at("headers", "payload", "combined-abstruse_uint32s", at); + file_headers = data__file_open__named_at("headers", "payload", "split-abstruse_uint32s", at); assert_non_null(file_headers); help__read_line_object(file_headers, &object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.h similarity index 56% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s.h rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.h index ddfc74b..d34f5ff 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint32s-split.h @@ -7,14 +7,14 @@ * * Test the fl_fss project. */ -#ifndef _TEST__FL_fss_payload_header_map__abstruse_uint32s_h -#define _TEST__FL_fss_payload_header_map__abstruse_uint32s_h +#ifndef _TEST__FL_fss_payload_header_map__abstruse_uint32s_split_h +#define _TEST__FL_fss_payload_header_map__abstruse_uint32s_split_h /** * Test that the function works for abstruse_uint32s type. * * @see fl_fss_payload_header_map() */ -extern void test__fl_fss_payload_header_map__abstruse_uint32s__works_combined(void **state); +extern void test__fl_fss_payload_header_map__abstruse_uint32s__works_split(void **state); -#endif // _TEST__FL_fss_payload_header_map__abstruse_uint32s_h +#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.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.c similarity index 96% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s.c rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.c index 192dcdc..3a739df 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.c @@ -1,18 +1,17 @@ #include "test-fss.h" -#include "test-fss-payload_header_map-abstruse_uint64s.h" #ifdef __cplusplus extern "C" { #endif -void test__fl_fss_payload_header_map__abstruse_uint64s__works_combined(void **void_state) { +void test__fl_fss_payload_header_map__abstruse_uint64s__works_split(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", "combined-abstruse_uint64s"); + FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_uint64s"); FILE *file_headers = 0; assert_non_null(file_variables); @@ -71,7 +70,7 @@ void test__fl_fss_payload_header_map__abstruse_uint64s__works_combined(void **vo ++headers.used; - file_headers = data__file_open__named_at("headers", "payload", "combined-abstruse_uint64s", at); + file_headers = data__file_open__named_at("headers", "payload", "split-abstruse_uint64s", at); assert_non_null(file_headers); help__read_line_object(file_headers, &object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.h similarity index 56% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s.h rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.h index ee130fe..f1fdec9 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint64s-split.h @@ -7,14 +7,14 @@ * * Test the fl_fss project. */ -#ifndef _TEST__FL_fss_payload_header_map__abstruse_uint64s_h -#define _TEST__FL_fss_payload_header_map__abstruse_uint64s_h +#ifndef _TEST__FL_fss_payload_header_map__abstruse_uint64s_split_h +#define _TEST__FL_fss_payload_header_map__abstruse_uint64s_split_h /** * Test that the function works for abstruse_uint64s type. * * @see fl_fss_payload_header_map() */ -extern void test__fl_fss_payload_header_map__abstruse_uint64s__works_combined(void **state); +extern void test__fl_fss_payload_header_map__abstruse_uint64s__works_split(void **state); -#endif // _TEST__FL_fss_payload_header_map__abstruse_uint64s_h +#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.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.c similarity index 96% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s.c rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.c index 26d210c..bf46673 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.c @@ -1,18 +1,17 @@ #include "test-fss.h" -#include "test-fss-payload_header_map-abstruse_uint8s.h" #ifdef __cplusplus extern "C" { #endif -void test__fl_fss_payload_header_map__abstruse_uint8s__works_combined(void **void_state) { +void test__fl_fss_payload_header_map__abstruse_uint8s__works_split(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", "combined-abstruse_uint8s"); + FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_uint8s"); FILE *file_headers = 0; assert_non_null(file_variables); @@ -70,7 +69,7 @@ void test__fl_fss_payload_header_map__abstruse_uint8s__works_combined(void **voi ++headers.used; - file_headers = data__file_open__named_at("headers", "payload", "combined-abstruse_uint8s", at); + file_headers = data__file_open__named_at("headers", "payload", "split-abstruse_uint8s", at); assert_non_null(file_headers); help__read_line_object(file_headers, &object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.h similarity index 56% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s.h rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.h index fc3087b..47b8826 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_uint8s-split.h @@ -7,14 +7,14 @@ * * Test the fl_fss project. */ -#ifndef _TEST__FL_fss_payload_header_map__abstruse_uint8s_h -#define _TEST__FL_fss_payload_header_map__abstruse_uint8s_h +#ifndef _TEST__FL_fss_payload_header_map__abstruse_uint8s_split_h +#define _TEST__FL_fss_payload_header_map__abstruse_uint8s_split_h /** * Test that the function works for abstruse_uint8s type. * * @see fl_fss_payload_header_map() */ -extern void test__fl_fss_payload_header_map__abstruse_uint8s__works_combined(void **state); +extern void test__fl_fss_payload_header_map__abstruse_uint8s__works_split(void **state); -#endif // _TEST__FL_fss_payload_header_map__abstruse_uint8s_h +#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.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.c similarity index 95% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned.c rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.c index 6912e97..fe54e69 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.c @@ -1,18 +1,17 @@ #include "test-fss.h" -#include "test-fss-payload_header_map-abstruse_unsigned.h" #ifdef __cplusplus extern "C" { #endif -void test__fl_fss_payload_header_map__abstruse_unsigned__works_combined(void **void_state) { +void test__fl_fss_payload_header_map__abstruse_unsigned__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", "combined-abstruse_unsigned"); + FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_unsigned"); FILE *file_headers = 0; assert_non_null(file_variables); @@ -62,7 +61,7 @@ void test__fl_fss_payload_header_map__abstruse_unsigned__works_combined(void **v object.used = 0; object.size = 0; - file_headers = data__file_open__named_at("headers", "payload", "combined-abstruse_unsigned", at); + file_headers = data__file_open__named_at("headers", "payload", "join-abstruse_unsigned", at); assert_non_null(file_headers); help__read_line_object(file_headers, &object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.h similarity index 56% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned.h rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.h index d723318..533756a 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigned-join.h @@ -7,14 +7,14 @@ * * Test the fl_fss project. */ -#ifndef _TEST__FL_fss_payload_header_map__abstruse_unsigned_h -#define _TEST__FL_fss_payload_header_map__abstruse_unsigned_h +#ifndef _TEST__FL_fss_payload_header_map__abstruse_unsigned_join_h +#define _TEST__FL_fss_payload_header_map__abstruse_unsigned_join_h /** * Test that the function works for abstruse_unsigned type. * * @see fl_fss_payload_header_map() */ -extern void test__fl_fss_payload_header_map__abstruse_unsigned__works_combined(void **state); +extern void test__fl_fss_payload_header_map__abstruse_unsigned__works_join(void **state); -#endif // _TEST__FL_fss_payload_header_map__abstruse_unsigned_h +#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.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.c similarity index 97% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds.c rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.c index 772c304..7258e46 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.c @@ -1,18 +1,17 @@ #include "test-fss.h" -#include "test-fss-payload_header_map-abstruse_unsigneds.h" #ifdef __cplusplus extern "C" { #endif -void test__fl_fss_payload_header_map__abstruse_unsigneds__works_combined(void **void_state) { +void test__fl_fss_payload_header_map__abstruse_unsigneds__works_split(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", "combined-abstruse_unsigneds"); + FILE *file_variables = data__file_open__named("variables", "payload", "abstruse_unsigneds"); FILE *file_headers = 0; assert_non_null(file_variables); @@ -70,7 +69,7 @@ void test__fl_fss_payload_header_map__abstruse_unsigneds__works_combined(void ** ++headers.used; - file_headers = data__file_open__named_at("headers", "payload", "combined-abstruse_unsigneds", at); + file_headers = data__file_open__named_at("headers", "payload", "split-abstruse_unsigneds", at); assert_non_null(file_headers); help__read_line_object(file_headers, &object); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds.h b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.h similarity index 55% rename from level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds.h rename to level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.h index 07bec2c..0787c3e 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds.h +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map-abstruse_unsigneds-split.h @@ -7,14 +7,14 @@ * * Test the fl_fss project. */ -#ifndef _TEST__FL_fss_payload_header_map__abstruse_unsigneds_h -#define _TEST__FL_fss_payload_header_map__abstruse_unsigneds_h +#ifndef _TEST__FL_fss_payload_header_map__abstruse_unsigneds_split_h +#define _TEST__FL_fss_payload_header_map__abstruse_unsigneds_split_h /** * Test that the function works for abstruse_unsigneds type. * * @see fl_fss_payload_header_map() */ -extern void test__fl_fss_payload_header_map__abstruse_unsigneds__works_combined(void **state); +extern void test__fl_fss_payload_header_map__abstruse_unsigneds__works_split(void **state); -#endif // _TEST__FL_fss_payload_header_map__abstruse_unsigneds_h +#endif // _TEST__FL_fss_payload_header_map__abstruse_unsigneds_split_h diff --git a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map.c b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map.c index 07c0eec..d70104d 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-payload_header_map.c @@ -1,5 +1,4 @@ #include "test-fss.h" -#include "test-fss-payload_header_map.h" #ifdef __cplusplus extern "C" { diff --git a/level_1/fl_fss/tests/unit/c/test-fss.c b/level_1/fl_fss/tests/unit/c/test-fss.c index 176819d..0c78da9 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss.c +++ b/level_1/fl_fss/tests/unit/c/test-fss.c @@ -60,18 +60,18 @@ int main(void) { cmocka_unit_test(test__fl_fss_extended_list_object_read__works), cmocka_unit_test(test__fl_fss_payload_header_map__returns_data_not), - cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_int8s__works_combined), - cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_int16s__works_combined), - cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_int32s__works_combined), - cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_int64s__works_combined), - cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_signed__works_combined), - cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_signeds__works_combined), - cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_uint8s__works_combined), - cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_uint16s__works_combined), - cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_uint32s__works_combined), - cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_uint64s__works_combined), - cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_unsigned__works_combined), - cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_unsigneds__works_combined), + cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_int8s__works_split), + cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_int16s__works_split), + cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_int32s__works_split), + cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_int64s__works_split), + cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_signed__works_join), + cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_signeds__works_split), + cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_uint8s__works_split), + cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_uint16s__works_split), + cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_uint32s__works_split), + cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_uint64s__works_split), + cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_unsigned__works_join), + cmocka_unit_test(test__fl_fss_payload_header_map__abstruse_unsigneds__works_split), #ifndef _di_level_0_parameter_checking_ cmocka_unit_test(test__fl_fss_basic_content_read__parameter_checking), 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 296f697..5427aab 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss.h +++ b/level_1/fl_fss/tests/unit/c/test-fss.h @@ -61,18 +61,18 @@ #include "test-fss-extended_list_object_read.h" #include "test-fss-extended_list_object_write.h" #include "test-fss-payload_header_map.h" -#include "test-fss-payload_header_map-abstruse_int8s.h" -#include "test-fss-payload_header_map-abstruse_int16s.h" -#include "test-fss-payload_header_map-abstruse_int32s.h" -#include "test-fss-payload_header_map-abstruse_int64s.h" -#include "test-fss-payload_header_map-abstruse_signed.h" -#include "test-fss-payload_header_map-abstruse_signeds.h" -#include "test-fss-payload_header_map-abstruse_uint8s.h" -#include "test-fss-payload_header_map-abstruse_uint16s.h" -#include "test-fss-payload_header_map-abstruse_uint32s.h" -#include "test-fss-payload_header_map-abstruse_uint64s.h" -#include "test-fss-payload_header_map-abstruse_unsigned.h" -#include "test-fss-payload_header_map-abstruse_unsigneds.h" +#include "test-fss-payload_header_map-abstruse_int8s-split.h" +#include "test-fss-payload_header_map-abstruse_int16s-split.h" +#include "test-fss-payload_header_map-abstruse_int32s-split.h" +#include "test-fss-payload_header_map-abstruse_int64s-split.h" +#include "test-fss-payload_header_map-abstruse_signed-join.h" +#include "test-fss-payload_header_map-abstruse_signeds-split.h" +#include "test-fss-payload_header_map-abstruse_uint8s-split.h" +#include "test-fss-payload_header_map-abstruse_uint16s-split.h" +#include "test-fss-payload_header_map-abstruse_uint32s-split.h" +#include "test-fss-payload_header_map-abstruse_uint64s-split.h" +#include "test-fss-payload_header_map-abstruse_unsigned-join.h" +#include "test-fss-payload_header_map-abstruse_unsigneds-split.h" #ifdef __cplusplus extern "C" {