From 68987b8b99e6d0a663d0508f4c66e1ebb5703edf Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 14 Jan 2023 17:31:20 -0600 Subject: [PATCH] Bugfix: Fix some of the outdated unit tests. The unit tests are out of date. Fix a few of the obvious problems. There will be more problems to solve that are not solved in this commit. --- level_0/f_capability/tests/unit/c/test-capability-ambient_get.c | 2 +- .../tests/unit/c/test-capability-file_descriptor_get.c | 2 +- .../tests/unit/c/test-capability-file_descriptor_set.c | 2 +- level_0/f_capability/tests/unit/c/test-capability-file_get.c | 2 +- level_0/f_capability/tests/unit/c/test-capability-file_set.c | 2 +- level_0/f_capability/tests/unit/c/test-capability-owner_set.c | 2 +- .../f_capability/tests/unit/c/test-capability-security_bits_set.c | 2 +- level_0/f_console/tests/unit/c/test-console-identify.c | 2 +- level_0/f_file/tests/unit/c/test-file-clone.c | 8 ++++---- level_0/f_file/tests/unit/c/test-file-copy.c | 6 +++--- level_0/f_file/tests/unit/c/test-file-create.c | 2 +- level_0/f_file/tests/unit/c/test-file-create_at.c | 2 +- level_0/f_file/tests/unit/c/test-file-create_device.c | 2 +- level_0/f_file/tests/unit/c/test-file-create_device_at.c | 2 +- level_0/f_file/tests/unit/c/test-file-create_node.c | 2 +- level_0/f_file/tests/unit/c/test-file-create_node_at.c | 2 +- level_0/f_file/tests/unit/c/test-file-flush.c | 4 ++-- level_0/f_file/tests/unit/c/test-file-open.c | 2 +- level_0/f_file/tests/unit/c/test-file-open_at.c | 2 +- level_0/f_file/tests/unit/c/test-file-stream_open.c | 2 +- level_0/f_signal/tests/unit/c/test-signal-queue.c | 2 +- level_0/f_socket/tests/unit/c/test-socket-accept.c | 2 +- level_0/f_socket/tests/unit/c/test-socket-disconnect.c | 2 +- level_0/f_socket/tests/unit/c/test-socket-listen.c | 2 +- level_0/f_status_string/tests/unit/c/test-status_string-to.c | 2 +- level_0/f_thread/tests/unit/c/test-thread-clock_get_id.c | 2 +- level_0/f_thread/tests/unit/c/test-thread-join.c | 2 +- level_0/f_thread/tests/unit/c/test-thread-join_timed.c | 2 +- level_0/f_thread/tests/unit/c/test-thread-join_try.c | 2 +- .../f_thread/tests/unit/c/test-thread-scheduler_parameter_get.c | 2 +- level_0/f_thread/tests/unit/c/test-thread-semaphore_create.c | 2 +- level_0/f_thread/tests/unit/c/test-thread-signal_queue.c | 2 +- level_2/fll_status_string/tests/unit/c/test-status_string-from.c | 2 +- 33 files changed, 39 insertions(+), 39 deletions(-) diff --git a/level_0/f_capability/tests/unit/c/test-capability-ambient_get.c b/level_0/f_capability/tests/unit/c/test-capability-ambient_get.c index 317292b..395fcd7 100644 --- a/level_0/f_capability/tests/unit/c/test-capability-ambient_get.c +++ b/level_0/f_capability/tests/unit/c/test-capability-ambient_get.c @@ -16,7 +16,7 @@ void test__f_capability_ambient_get__fails(void **state) { const f_status_t status = f_capability_ambient_get(value, &ambient); - assert_int_equal(F_status_set_fine(status), F_supported_not); + assert_int_equal(F_status_set_fine(status), F_support_not); assert_int_equal(ambient, -1); } #endif // !defined(_di_libcap_) && !defined(_libcap_legacy_only_) diff --git a/level_0/f_capability/tests/unit/c/test-capability-file_descriptor_get.c b/level_0/f_capability/tests/unit/c/test-capability-file_descriptor_get.c index c531bf9..768accd 100644 --- a/level_0/f_capability/tests/unit/c/test-capability-file_descriptor_get.c +++ b/level_0/f_capability/tests/unit/c/test-capability-file_descriptor_get.c @@ -31,7 +31,7 @@ void test__f_capability_file_descriptor_get__fails(void **state) { F_memory_not, F_directory_not, F_prohibited, - F_supported_not, + F_support_not, F_failure, }; diff --git a/level_0/f_capability/tests/unit/c/test-capability-file_descriptor_set.c b/level_0/f_capability/tests/unit/c/test-capability-file_descriptor_set.c index ef2a75b..9c81a2d 100644 --- a/level_0/f_capability/tests/unit/c/test-capability-file_descriptor_set.c +++ b/level_0/f_capability/tests/unit/c/test-capability-file_descriptor_set.c @@ -31,7 +31,7 @@ void test__f_capability_file_descriptor_set__fails(void **state) { F_memory_not, F_directory_not, F_prohibited, - F_supported_not, + F_support_not, F_failure, }; diff --git a/level_0/f_capability/tests/unit/c/test-capability-file_get.c b/level_0/f_capability/tests/unit/c/test-capability-file_get.c index 79ad9aa..330c7ba 100644 --- a/level_0/f_capability/tests/unit/c/test-capability-file_get.c +++ b/level_0/f_capability/tests/unit/c/test-capability-file_get.c @@ -31,7 +31,7 @@ void test__f_capability_file_get__fails(void **state) { F_memory_not, F_directory_not, F_prohibited, - F_supported_not, + F_support_not, F_failure, }; diff --git a/level_0/f_capability/tests/unit/c/test-capability-file_set.c b/level_0/f_capability/tests/unit/c/test-capability-file_set.c index 781e273..230d9d6 100644 --- a/level_0/f_capability/tests/unit/c/test-capability-file_set.c +++ b/level_0/f_capability/tests/unit/c/test-capability-file_set.c @@ -31,7 +31,7 @@ void test__f_capability_file_set__fails(void **state) { F_memory_not, F_directory_not, F_prohibited, - F_supported_not, + F_support_not, F_failure, }; diff --git a/level_0/f_capability/tests/unit/c/test-capability-owner_set.c b/level_0/f_capability/tests/unit/c/test-capability-owner_set.c index 74334f2..2f62f8d 100644 --- a/level_0/f_capability/tests/unit/c/test-capability-owner_set.c +++ b/level_0/f_capability/tests/unit/c/test-capability-owner_set.c @@ -31,7 +31,7 @@ void test__f_capability_owner_set__fails(void **state) { F_memory_not, F_directory_not, F_prohibited, - F_supported_not, + F_support_not, F_failure, }; diff --git a/level_0/f_capability/tests/unit/c/test-capability-security_bits_set.c b/level_0/f_capability/tests/unit/c/test-capability-security_bits_set.c index e043699..7cd8cba 100644 --- a/level_0/f_capability/tests/unit/c/test-capability-security_bits_set.c +++ b/level_0/f_capability/tests/unit/c/test-capability-security_bits_set.c @@ -30,7 +30,7 @@ void test__f_capability_security_bits_set__fails(void **state) { F_memory_not, F_directory_not, F_prohibited, - F_supported_not, + F_support_not, F_failure, }; diff --git a/level_0/f_console/tests/unit/c/test-console-identify.c b/level_0/f_console/tests/unit/c/test-console-identify.c index 07dae40..6d57eea 100644 --- a/level_0/f_console/tests/unit/c/test-console-identify.c +++ b/level_0/f_console/tests/unit/c/test-console-identify.c @@ -18,7 +18,7 @@ void test__f_console_identify__parameter_checking(void **state) { void test__f_console_identify__works(void **state) { - f_console_id_t id = f_console_id_t_initialize; + f_console_result_t id = f_console_result_t_initialize; { const f_string_t input = f_string_t_initialize; diff --git a/level_0/f_file/tests/unit/c/test-file-clone.c b/level_0/f_file/tests/unit/c/test-file-clone.c index 88e56b0..0e04d54 100644 --- a/level_0/f_file/tests/unit/c/test-file-clone.c +++ b/level_0/f_file/tests/unit/c/test-file-clone.c @@ -367,7 +367,7 @@ void test__f_file_clone__fails_for_other(void **state) { const f_status_t status = f_file_clone(path, path, 0, f_file_stat_flag_exclusive_e); - assert_int_equal(F_status_set_fine(status), F_supported_not); + assert_int_equal(F_status_set_fine(status), F_support_not); } // for } } @@ -453,7 +453,7 @@ void test__f_file_clone__fails_for_regular(void **state) { F_memory_not, F_space_not, F_file_type_not_directory, - F_supported_not, + F_support_not, F_number_overflow, F_prohibited, F_read_only, @@ -755,7 +755,7 @@ void test__f_file_clone__fails_for_regular(void **state) { F_memory_not, F_space_not, F_file_type_not_directory, - F_supported_not, + F_support_not, F_number_overflow, F_prohibited, F_read_only, @@ -837,7 +837,7 @@ void test__f_file_clone__fails_for_regular(void **state) { F_memory_not, F_space_not, F_file_type_not_directory, - F_supported_not, + F_support_not, F_number_overflow, F_prohibited, F_read_only, diff --git a/level_0/f_file/tests/unit/c/test-file-copy.c b/level_0/f_file/tests/unit/c/test-file-copy.c index d148adc..1de16ac 100644 --- a/level_0/f_file/tests/unit/c/test-file-copy.c +++ b/level_0/f_file/tests/unit/c/test-file-copy.c @@ -819,7 +819,7 @@ void test__f_file_copy__fails_for_regular(void **state) { F_memory_not, F_space_not, F_file_type_not_directory, - F_supported_not, + F_support_not, F_number_overflow, F_prohibited, F_read_only, @@ -997,7 +997,7 @@ void test__f_file_copy__fails_for_regular(void **state) { F_memory_not, F_space_not, F_file_type_not_directory, - F_supported_not, + F_support_not, F_number_overflow, F_prohibited, F_read_only, @@ -1080,7 +1080,7 @@ void test__f_file_copy__fails_for_regular(void **state) { F_memory_not, F_space_not, F_file_type_not_directory, - F_supported_not, + F_support_not, F_number_overflow, F_prohibited, F_read_only, diff --git a/level_0/f_file/tests/unit/c/test-file-create.c b/level_0/f_file/tests/unit/c/test-file-create.c index efd8a32..b1de61f 100644 --- a/level_0/f_file/tests/unit/c/test-file-create.c +++ b/level_0/f_file/tests/unit/c/test-file-create.c @@ -50,7 +50,7 @@ void test__f_file_create__fails(void **state) { F_memory_not, F_space_not, F_file_type_not_directory, - F_supported_not, + F_support_not, F_number_overflow, F_prohibited, F_read_only, diff --git a/level_0/f_file/tests/unit/c/test-file-create_at.c b/level_0/f_file/tests/unit/c/test-file-create_at.c index d925840..056fe85 100644 --- a/level_0/f_file/tests/unit/c/test-file-create_at.c +++ b/level_0/f_file/tests/unit/c/test-file-create_at.c @@ -52,7 +52,7 @@ void test__f_file_create_at__fails(void **state) { F_memory_not, F_space_not, F_file_type_not_directory, - F_supported_not, + F_support_not, F_number_overflow, F_prohibited, F_read_only, diff --git a/level_0/f_file/tests/unit/c/test-file-create_device.c b/level_0/f_file/tests/unit/c/test-file-create_device.c index 61d4c70..0ffe153 100644 --- a/level_0/f_file/tests/unit/c/test-file-create_device.c +++ b/level_0/f_file/tests/unit/c/test-file-create_device.c @@ -93,7 +93,7 @@ void test__f_file_create_device__returns_supported_not(void **state) { const f_status_t status = f_file_create_device(path, modes[i], 0, 0); - assert_int_equal(F_status_set_fine(status), F_supported_not); + assert_int_equal(F_status_set_fine(status), F_support_not); } // for } } diff --git a/level_0/f_file/tests/unit/c/test-file-create_device_at.c b/level_0/f_file/tests/unit/c/test-file-create_device_at.c index a97b984..970d615 100644 --- a/level_0/f_file/tests/unit/c/test-file-create_device_at.c +++ b/level_0/f_file/tests/unit/c/test-file-create_device_at.c @@ -95,7 +95,7 @@ void test__f_file_create_device_at__returns_supported_not(void **state) { const f_status_t status = f_file_create_device_at(0, path, modes[i], 0, 0); - assert_int_equal(F_status_set_fine(status), F_supported_not); + assert_int_equal(F_status_set_fine(status), F_support_not); } // for } } diff --git a/level_0/f_file/tests/unit/c/test-file-create_node.c b/level_0/f_file/tests/unit/c/test-file-create_node.c index a5c369b..b92549a 100644 --- a/level_0/f_file/tests/unit/c/test-file-create_node.c +++ b/level_0/f_file/tests/unit/c/test-file-create_node.c @@ -93,7 +93,7 @@ void test__f_file_create_node__returns_supported_not(void **state) { const f_status_t status = f_file_create_node(path, modes[i], 0); - assert_int_equal(F_status_set_fine(status), F_supported_not); + assert_int_equal(F_status_set_fine(status), F_support_not); } // for } } diff --git a/level_0/f_file/tests/unit/c/test-file-create_node_at.c b/level_0/f_file/tests/unit/c/test-file-create_node_at.c index 4b44c22..952984d 100644 --- a/level_0/f_file/tests/unit/c/test-file-create_node_at.c +++ b/level_0/f_file/tests/unit/c/test-file-create_node_at.c @@ -95,7 +95,7 @@ void test__f_file_create_node_at__returns_supported_not(void **state) { const f_status_t status = f_file_create_node_at(0, path, modes[i], 0); - assert_int_equal(F_status_set_fine(status), F_supported_not); + assert_int_equal(F_status_set_fine(status), F_support_not); } // for } } diff --git a/level_0/f_file/tests/unit/c/test-file-flush.c b/level_0/f_file/tests/unit/c/test-file-flush.c index cc5a2ae..7641af5 100644 --- a/level_0/f_file/tests/unit/c/test-file-flush.c +++ b/level_0/f_file/tests/unit/c/test-file-flush.c @@ -20,10 +20,10 @@ void test__f_file_flush__fails(void **state) { f_status_t statuss[] = { F_file_descriptor, F_filesystem_quota_block, - F_supported_not, + F_support_not, F_input_output, F_space_not, - F_supported_not, + F_support_not, F_file_synchronize, }; diff --git a/level_0/f_file/tests/unit/c/test-file-open.c b/level_0/f_file/tests/unit/c/test-file-open.c index c31d3c9..a2cbef0 100644 --- a/level_0/f_file/tests/unit/c/test-file-open.c +++ b/level_0/f_file/tests/unit/c/test-file-open.c @@ -49,7 +49,7 @@ void test__f_file_open__fails(void **state) { F_memory_not, F_space_not, F_file_type_not_directory, - F_supported_not, + F_support_not, F_number_overflow, F_prohibited, F_read_only, diff --git a/level_0/f_file/tests/unit/c/test-file-open_at.c b/level_0/f_file/tests/unit/c/test-file-open_at.c index 7f2df1a..8111e57 100644 --- a/level_0/f_file/tests/unit/c/test-file-open_at.c +++ b/level_0/f_file/tests/unit/c/test-file-open_at.c @@ -51,7 +51,7 @@ void test__f_file_open_at__fails(void **state) { F_memory_not, F_space_not, F_file_type_not_directory, - F_supported_not, + F_support_not, F_number_overflow, F_prohibited, F_read_only, diff --git a/level_0/f_file/tests/unit/c/test-file-stream_open.c b/level_0/f_file/tests/unit/c/test-file-stream_open.c index aa3aa29..284f6c2 100644 --- a/level_0/f_file/tests/unit/c/test-file-stream_open.c +++ b/level_0/f_file/tests/unit/c/test-file-stream_open.c @@ -52,7 +52,7 @@ void test__f_file_stream_open__fails(void **state) { F_read_only, F_busy, F_directory, - F_supported_not, + F_support_not, F_number_overflow, F_failure, }; diff --git a/level_0/f_signal/tests/unit/c/test-signal-queue.c b/level_0/f_signal/tests/unit/c/test-signal-queue.c index 34a575e..98a44ab 100644 --- a/level_0/f_signal/tests/unit/c/test-signal-queue.c +++ b/level_0/f_signal/tests/unit/c/test-signal-queue.c @@ -21,7 +21,7 @@ void test__f_signal_queue__fails(void **state) { f_status_t statuss[] = { F_resource_not, - F_supported_not, + F_support_not, F_parameter, F_found_not, F_failure, diff --git a/level_0/f_socket/tests/unit/c/test-socket-accept.c b/level_0/f_socket/tests/unit/c/test-socket-accept.c index 2484cc9..e4ec324 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-accept.c +++ b/level_0/f_socket/tests/unit/c/test-socket-accept.c @@ -58,7 +58,7 @@ void test__f_socket_accept__fails(void **state) { F_stream_not, F_protocol, F_prohibited, - F_supported_not, + F_support_not, F_protocol_not, F_time_out, F_block, diff --git a/level_0/f_socket/tests/unit/c/test-socket-disconnect.c b/level_0/f_socket/tests/unit/c/test-socket-disconnect.c index 79d20a5..771ebb5 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-disconnect.c +++ b/level_0/f_socket/tests/unit/c/test-socket-disconnect.c @@ -101,7 +101,7 @@ void test__f_socket_disconnect__fails_for_close_unknown(void **state) { const f_status_t status = f_socket_disconnect(&socket, 100); - assert_int_equal(status, F_status_set_error(F_supported_not)); + assert_int_equal(status, F_status_set_error(F_support_not)); assert_int_equal(socket.id, 1); } } diff --git a/level_0/f_socket/tests/unit/c/test-socket-listen.c b/level_0/f_socket/tests/unit/c/test-socket-listen.c index f8cdc04..fcc57b9 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-listen.c +++ b/level_0/f_socket/tests/unit/c/test-socket-listen.c @@ -21,7 +21,7 @@ void test__f_socket_listen__fails(void **state) { F_busy_address, F_file_descriptor, F_socket_not, - F_supported_not, + F_support_not, F_failure, }; diff --git a/level_0/f_status_string/tests/unit/c/test-status_string-to.c b/level_0/f_status_string/tests/unit/c/test-status_string-to.c index 9e1064d..b94a6c2 100644 --- a/level_0/f_status_string/tests/unit/c/test-status_string-to.c +++ b/level_0/f_status_string/tests/unit/c/test-status_string-to.c @@ -354,7 +354,7 @@ void test__f_status_string_to__works(void **state) { F_success, F_success_not, F_supported, - F_supported_not, + F_support_not, F_syntax, F_syntax_not, F_terminate, diff --git a/level_0/f_thread/tests/unit/c/test-thread-clock_get_id.c b/level_0/f_thread/tests/unit/c/test-thread-clock_get_id.c index 8005476..aa3c6d8 100644 --- a/level_0/f_thread/tests/unit/c/test-thread-clock_get_id.c +++ b/level_0/f_thread/tests/unit/c/test-thread-clock_get_id.c @@ -19,7 +19,7 @@ void test__f_thread_clock_get_id__fails(void **state) { }; f_status_t statuss[] = { - F_supported_not, + F_support_not, F_found_not, F_failure, }; diff --git a/level_0/f_thread/tests/unit/c/test-thread-join.c b/level_0/f_thread/tests/unit/c/test-thread-join.c index da95ae5..9ef0203 100644 --- a/level_0/f_thread/tests/unit/c/test-thread-join.c +++ b/level_0/f_thread/tests/unit/c/test-thread-join.c @@ -20,7 +20,7 @@ void test__f_thread_join__fails(void **state) { f_status_t statuss[] = { F_deadlock, F_parameter, - F_supported_not, + F_support_not, F_found_not, F_failure, }; diff --git a/level_0/f_thread/tests/unit/c/test-thread-join_timed.c b/level_0/f_thread/tests/unit/c/test-thread-join_timed.c index 91c23a9..9872125 100644 --- a/level_0/f_thread/tests/unit/c/test-thread-join_timed.c +++ b/level_0/f_thread/tests/unit/c/test-thread-join_timed.c @@ -26,7 +26,7 @@ void test__f_thread_join_timed__fails(void **state) { F_busy, F_status_set_error(F_deadlock), F_status_set_error(F_parameter), - F_status_set_error(F_supported_not), + F_status_set_error(F_support_not), F_status_set_error(F_found_not), F_time, F_status_set_error(F_failure), diff --git a/level_0/f_thread/tests/unit/c/test-thread-join_try.c b/level_0/f_thread/tests/unit/c/test-thread-join_try.c index 9c3a381..b948a58 100644 --- a/level_0/f_thread/tests/unit/c/test-thread-join_try.c +++ b/level_0/f_thread/tests/unit/c/test-thread-join_try.c @@ -22,7 +22,7 @@ void test__f_thread_join_try__fails(void **state) { F_busy, F_status_set_error(F_deadlock), F_status_set_error(F_parameter), - F_status_set_error(F_supported_not), + F_status_set_error(F_support_not), F_status_set_error(F_found_not), F_status_set_error(F_failure), }; diff --git a/level_0/f_thread/tests/unit/c/test-thread-scheduler_parameter_get.c b/level_0/f_thread/tests/unit/c/test-thread-scheduler_parameter_get.c index c8011f8..8fb622f 100644 --- a/level_0/f_thread/tests/unit/c/test-thread-scheduler_parameter_get.c +++ b/level_0/f_thread/tests/unit/c/test-thread-scheduler_parameter_get.c @@ -19,7 +19,7 @@ void test__f_thread_scheduler_parameter_get__fails(void **state) { }; f_status_t statuss[] = { - F_supported_not, + F_support_not, F_failure, }; diff --git a/level_0/f_thread/tests/unit/c/test-thread-semaphore_create.c b/level_0/f_thread/tests/unit/c/test-thread-semaphore_create.c index a3223fb..1cff3f2 100644 --- a/level_0/f_thread/tests/unit/c/test-thread-semaphore_create.c +++ b/level_0/f_thread/tests/unit/c/test-thread-semaphore_create.c @@ -19,7 +19,7 @@ void test__f_thread_semaphore_create__fails(void **state) { f_status_t statuss[] = { F_parameter, - F_supported_not, + F_support_not, F_failure, }; diff --git a/level_0/f_thread/tests/unit/c/test-thread-signal_queue.c b/level_0/f_thread/tests/unit/c/test-thread-signal_queue.c index 82aa967..5adbeab 100644 --- a/level_0/f_thread/tests/unit/c/test-thread-signal_queue.c +++ b/level_0/f_thread/tests/unit/c/test-thread-signal_queue.c @@ -29,7 +29,7 @@ void test__f_thread_signal_queue__fails(void **state) { f_status_t statuss[] = { F_resource_not, - F_supported_not, + F_support_not, F_parameter, F_found_not, F_failure, diff --git a/level_2/fll_status_string/tests/unit/c/test-status_string-from.c b/level_2/fll_status_string/tests/unit/c/test-status_string-from.c index d23bbd3..6607be4 100644 --- a/level_2/fll_status_string/tests/unit/c/test-status_string-from.c +++ b/level_2/fll_status_string/tests/unit/c/test-status_string-from.c @@ -370,7 +370,7 @@ void test__fll_status_string_from__works(void **state) { F_success, F_success_not, F_supported, - F_supported_not, + F_support_not, F_syntax, F_syntax_not, F_terminate, -- 1.8.3.1