From 6831e7e6fb2ed907a6770508a83c4a066fff4d7a Mon Sep 17 00:00:00 2001 From: TapTap Date: Mon, 20 Jul 2026 19:36:09 +0200 Subject: [PATCH] Revert "Merge pull request 'Add unit test coverage (#71, #63, #62, #56, #55)' (#83) from fix/test-coverage into main" This reverts commit 12ca4b13c89cdb151e75c4c3e54cc55254ac799e, reversing changes made to 28d076fc2817d67c20c3c84e7db18abef8f97c30. --- tests/runner.c | 12 -- tests/test_file_sendfile.c | 264 -------------------------------- tests/test_file_sendfile.h | 6 - tests/test_log.c | 108 ------------- tests/test_log.h | 6 - tests/test_multiprocessing.c | 101 ------------- tests/test_multiprocessing.h | 6 - tests/test_scanner.c | 285 ----------------------------------- tests/test_transport_ssh.c | 51 ------- tests/test_transport_ssh.h | 6 - tests/test_transport_tcp.c | 90 ----------- tests/test_transport_tcp.h | 6 - tests/test_transport_tls.c | 81 ---------- tests/test_transport_tls.h | 6 - 14 files changed, 1028 deletions(-) delete mode 100644 tests/test_file_sendfile.c delete mode 100644 tests/test_file_sendfile.h delete mode 100644 tests/test_log.c delete mode 100644 tests/test_log.h delete mode 100644 tests/test_multiprocessing.c delete mode 100644 tests/test_multiprocessing.h delete mode 100644 tests/test_transport_ssh.c delete mode 100644 tests/test_transport_ssh.h delete mode 100644 tests/test_transport_tcp.c delete mode 100644 tests/test_transport_tcp.h delete mode 100644 tests/test_transport_tls.c delete mode 100644 tests/test_transport_tls.h diff --git a/tests/runner.c b/tests/runner.c index 6757b8d..6ae6c12 100644 --- a/tests/runner.c +++ b/tests/runner.c @@ -5,11 +5,8 @@ #include "test_data.h" #include "test_delta.h" #include "test_file.h" -#include "test_file_sendfile.h" #include "test_glob.h" -#include "test_log.h" #include "test_metadata.h" -#include "test_multiprocessing.h" #include "test_property.h" #include "test_protocol.h" #include "test_queue.h" @@ -17,9 +14,6 @@ #include "test_scanner.h" #include "test_shared_utils.h" #include "test_stress.h" -#include "test_transport_tcp.h" -#include "test_transport_ssh.h" -#include "test_transport_tls.h" #include "test_utils.h" #include @@ -44,12 +38,6 @@ int main() { RUN_TEST(test_metadata); RUN_TEST(test_glob); RUN_TEST(test_file); - RUN_TEST(test_file_sendfile); - RUN_TEST(test_multiprocessing); - RUN_TEST(test_log); - RUN_TEST(test_transport_tcp); - RUN_TEST(test_transport_ssh); - RUN_TEST(test_transport_tls); RUN_TEST(test_robustness); RUN_TEST(test_stress); RUN_TEST(test_property); diff --git a/tests/test_file_sendfile.c b/tests/test_file_sendfile.c deleted file mode 100644 index 871fc73..0000000 --- a/tests/test_file_sendfile.c +++ /dev/null @@ -1,264 +0,0 @@ -#include "test_file_sendfile.h" -#include "file.h" -#include "config.h" -#include "protocol.h" -#include "utils.h" -#include "test_utils.h" -#include -#include -#include -#include -#include - -/* Test basic sendfile transfer: create a file, send it via file_send_sendfile, - * receive via file_receive, and verify contents. */ -static void test_sendfile_basic() { - const char* content = "Hello from sendfile test!"; - size_t len = strlen(content); - EXPECT_TRUE(to_disk("test_sendfile_basic.txt", content, len)); - - File* file = file_create("test_sendfile_basic.txt"); - EXPECT_NOT_NULL(file); - /* Set the size so file_send_sendfile can report it */ - file->data->size = len; - - Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/tmp"), str_dup("/tmp"), - false, false, false, false, false, 0, false, 0); - EXPECT_NOT_NULL(cfg); - - int p[2]; - EXPECT_EQ_INT(pipe(p), 0); - io_set_fds(p[0], p[1]); - io_set_bwlimit(0); - - pid_t pid = fork(); - if (pid == 0) { - /* Child: receive */ - close(p[1]); - File* received = file_receive(cfg, p[0]); - close(p[0]); - - bool ok = true; - if (!received) - ok = false; - else { - if (!received->path || strcmp(received->path, "test_sendfile_basic.txt") != 0) - ok = false; - if (!received->data || received->data->size != len) - ok = false; - else if (memcmp(received->data->data, content, len) != 0) - ok = false; - } - file_destroy(received); - config_delete(cfg); - _exit(ok ? 0 : 1); - } else { - /* Parent: send via sendfile */ - close(p[0]); - bool sent = file_send_sendfile(file, p[1], false, 0, true); - close(p[1]); - - int status; - waitpid(pid, &status, 0); - - file_destroy(file); - config_delete(cfg); - unlink("test_sendfile_basic.txt"); - - EXPECT_TRUE(sent); - EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0); - } -} - -/* Test sendfile with an empty file */ -static void test_sendfile_empty_file() { - const char* content = ""; - size_t len = 0; - EXPECT_TRUE(to_disk("test_sendfile_empty.txt", content, len)); - - File* file = file_create("test_sendfile_empty.txt"); - EXPECT_NOT_NULL(file); - file->data->size = 0; - - Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/tmp"), str_dup("/tmp"), - false, false, false, false, false, 0, false, 0); - EXPECT_NOT_NULL(cfg); - - int p[2]; - EXPECT_EQ_INT(pipe(p), 0); - io_set_fds(p[0], p[1]); - io_set_bwlimit(0); - - pid_t pid = fork(); - if (pid == 0) { - close(p[1]); - File* received = file_receive(cfg, p[0]); - close(p[0]); - - bool ok = true; - if (!received) - ok = false; - else { - if (strcmp(received->path, "test_sendfile_empty.txt") != 0) - ok = false; - if (received->data->size != 0) - ok = false; - } - file_destroy(received); - config_delete(cfg); - _exit(ok ? 0 : 1); - } else { - close(p[0]); - bool sent = file_send_sendfile(file, p[1], false, 0, true); - close(p[1]); - - int status; - waitpid(pid, &status, 0); - - file_destroy(file); - config_delete(cfg); - unlink("test_sendfile_empty.txt"); - - EXPECT_TRUE(sent); - EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0); - } -} - -/* Test error path: file does not exist on disk */ -static void test_sendfile_missing_file() { - File* file = file_create("nonexistent_sendfile_test_file.txt"); - EXPECT_NOT_NULL(file); - file->data->size = 100; /* fake size */ - - /* Use a pipe that we can write to but sendfile should fail */ - int p[2]; - EXPECT_EQ_INT(pipe(p), 0); - io_set_fds(p[0], p[1]); - io_set_bwlimit(0); - - /* file_send_sendfile will try to open the nonexistent file -> should return false */ - bool sent = file_send_sendfile(file, p[1], false, 0, true); - - close(p[0]); - close(p[1]); - file_destroy(file); - - EXPECT_FALSE(sent); -} - -/* Test compression level > 0 falls back to file_send_single_calls */ -static void test_sendfile_compression_fallback() { - const char* content = "Compression fallback content"; - size_t len = strlen(content); - EXPECT_TRUE(to_disk("test_sendfile_comp.txt", content, len)); - - struct stat st; - EXPECT_EQ_INT(stat("test_sendfile_comp.txt", &st), 0); - - File* file = file_create("test_sendfile_comp.txt"); - EXPECT_NOT_NULL(file); - /* Load the file data into memory (required by file_send_single_calls fallback) */ - file->data->size = (size_t)st.st_size; - EXPECT_TRUE(file_load_data(file)); - - Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/tmp"), str_dup("/tmp"), - false, false, false, true, false, 3, false, 0); - EXPECT_NOT_NULL(cfg); - - int p[2]; - EXPECT_EQ_INT(pipe(p), 0); - io_set_fds(p[0], p[1]); - io_set_bwlimit(0); - - pid_t pid = fork(); - if (pid == 0) { - close(p[1]); - File* received = file_receive(cfg, p[0]); - close(p[0]); - - bool ok = true; - if (!received) - ok = false; - else { - if (received->data->size != len) - ok = false; - else if (memcmp(received->data->data, content, len) != 0) - ok = false; - } - file_destroy(received); - config_delete(cfg); - _exit(ok ? 0 : 1); - } else { - close(p[0]); - /* compression_level = 3 triggers fallback to file_send_single_calls */ - bool sent = file_send_sendfile(file, p[1], false, 3, true); - close(p[1]); - - int status; - waitpid(pid, &status, 0); - - file_destroy(file); - config_delete(cfg); - unlink("test_sendfile_comp.txt"); - - EXPECT_TRUE(sent); - EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0); - } -} - -/* Test sendfile without path (send_path = false) */ -static void test_sendfile_no_path() { - const char* content = "No path sendfile test"; - size_t len = strlen(content); - EXPECT_TRUE(to_disk("test_sendfile_nopath.txt", content, len)); - - File* file = file_create("test_sendfile_nopath.txt"); - EXPECT_NOT_NULL(file); - file->data->size = len; - - int p[2]; - EXPECT_EQ_INT(pipe(p), 0); - io_set_fds(p[0], p[1]); - io_set_bwlimit(0); - - pid_t pid = fork(); - if (pid == 0) { - close(p[1]); - /* When send_path is false, the sender sends raw data (size + bytes) only. - * We need to receive just the Data, not a File. */ - Data* received = receive_data(p[0]); - close(p[0]); - - bool ok = true; - if (!received) - ok = false; - else if (received->size != len) - ok = false; - else if (memcmp(received->data, content, len) != 0) - ok = false; - - data_destroy(received); - _exit(ok ? 0 : 1); - } else { - close(p[0]); - bool sent = file_send_sendfile(file, p[1], false, 0, false); - close(p[1]); - - int status; - waitpid(pid, &status, 0); - - file_destroy(file); - unlink("test_sendfile_nopath.txt"); - - EXPECT_TRUE(sent); - EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0); - } -} - -void test_file_sendfile() { - test_sendfile_basic(); - test_sendfile_empty_file(); - test_sendfile_missing_file(); - test_sendfile_compression_fallback(); - test_sendfile_no_path(); -} diff --git a/tests/test_file_sendfile.h b/tests/test_file_sendfile.h deleted file mode 100644 index 60c1d5e..0000000 --- a/tests/test_file_sendfile.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TEST_FILE_SENDFILE_H -#define TEST_FILE_SENDFILE_H - -void test_file_sendfile(); - -#endif diff --git a/tests/test_log.c b/tests/test_log.c deleted file mode 100644 index 4fc4798..0000000 --- a/tests/test_log.c +++ /dev/null @@ -1,108 +0,0 @@ -#include "test_log.h" -#include "log.h" -#include "test_utils.h" - -/* Test default log level: WARNING and ERROR should print, DEBUG and INFO should not. - * We can't easily capture stderr in unit tests, so we verify the functions don't crash - * and that set_log_level changes behavior. */ - -static void test_log_message_debug() { - /* Default level is WARNING, so DEBUG should be filtered out */ - log_message(LOG_LEVEL_DEBUG, "debug message: %d", 42); - /* No assertion needed - if we reach here without crash, success */ - EXPECT_TRUE(true); -} - -static void test_log_message_info() { - /* Default level is WARNING, so INFO should be filtered out */ - log_message(LOG_LEVEL_INFO, "info message: %s", "test"); - EXPECT_TRUE(true); -} - -static void test_log_message_warning() { - /* Default level is WARNING, so WARNING should be shown */ - log_message(LOG_LEVEL_WARNING, "warning message: %d %s", 1, "test"); - EXPECT_TRUE(true); -} - -static void test_log_message_error() { - /* Default level is WARNING, so ERROR should be shown */ - log_message(LOG_LEVEL_ERROR, "error message: %s", "critical"); - EXPECT_TRUE(true); -} - -static void test_log_set_level_debug() { - set_log_level(LOG_LEVEL_DEBUG); - - /* After setting to DEBUG, all levels should be shown */ - log_message(LOG_LEVEL_DEBUG, "debug after set"); - log_message(LOG_LEVEL_INFO, "info after set"); - log_message(LOG_LEVEL_WARNING, "warning after set"); - log_message(LOG_LEVEL_ERROR, "error after set"); - - EXPECT_TRUE(true); -} - -static void test_log_set_level_info() { - set_log_level(LOG_LEVEL_INFO); - - /* INFO level should show INFO, WARNING, ERROR but not DEBUG */ - log_message(LOG_LEVEL_DEBUG, "debug should be filtered"); /* filtered */ - log_message(LOG_LEVEL_INFO, "info should show"); - log_message(LOG_LEVEL_WARNING, "warning should show"); - log_message(LOG_LEVEL_ERROR, "error should show"); - - EXPECT_TRUE(true); -} - -static void test_log_set_level_error() { - set_log_level(LOG_LEVEL_ERROR); - - /* ERROR level: only ERROR should show */ - log_message(LOG_LEVEL_DEBUG, "debug filtered"); - log_message(LOG_LEVEL_INFO, "info filtered"); - log_message(LOG_LEVEL_WARNING, "warning filtered"); - log_message(LOG_LEVEL_ERROR, "error should show"); - - EXPECT_TRUE(true); -} - -/* Test that set_log_level with default WARNING filters correctly */ -static void test_log_filtering() { - /* Reset to default */ - set_log_level(LOG_LEVEL_WARNING); - - /* These should be filtered */ - log_message(LOG_LEVEL_DEBUG, "filtered debug"); - log_message(LOG_LEVEL_INFO, "filtered info"); - - /* These should be shown */ - log_message(LOG_LEVEL_WARNING, "visible warning"); - log_message(LOG_LEVEL_ERROR, "visible error"); - - EXPECT_TRUE(true); -} - -/* Test that log_message handles various format strings */ -static void test_log_message_formats() { - set_log_level(LOG_LEVEL_DEBUG); - - log_message(LOG_LEVEL_DEBUG, "simple string"); - log_message(LOG_LEVEL_INFO, "integer: %d", -1); - log_message(LOG_LEVEL_WARNING, "string: %s", "hello"); - log_message(LOG_LEVEL_ERROR, "multiple: %d %s %d", 1, "two", 3); - - EXPECT_TRUE(true); -} - -void test_log() { - test_log_message_debug(); - test_log_message_info(); - test_log_message_warning(); - test_log_message_error(); - test_log_set_level_debug(); - test_log_set_level_info(); - test_log_set_level_error(); - test_log_filtering(); - test_log_message_formats(); -} diff --git a/tests/test_log.h b/tests/test_log.h deleted file mode 100644 index 2287c3d..0000000 --- a/tests/test_log.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TEST_LOG_H -#define TEST_LOG_H - -void test_log(); - -#endif diff --git a/tests/test_multiprocessing.c b/tests/test_multiprocessing.c deleted file mode 100644 index 95bc3ad..0000000 --- a/tests/test_multiprocessing.c +++ /dev/null @@ -1,101 +0,0 @@ -#include "test_multiprocessing.h" -#include "multiprocessing.h" -#include "config.h" -#include "queue.h" -#include "utils.h" -#include "test_utils.h" -#include - -/* Test pipeline_context_sender_create/destroy with valid arguments */ -static void test_sender_create_destroy() { - Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("/dst"), - false, false, false, false, false, 0, false, 0); - EXPECT_NOT_NULL(cfg); - - Queue* q_scanner = queue_create(5, NULL); - EXPECT_NOT_NULL(q_scanner); - - Queue* q_loader = queue_create(10, NULL); - EXPECT_NOT_NULL(q_loader); - - PipelineContextSender* ctx = pipeline_context_sender_create(cfg, q_scanner, q_loader); - EXPECT_NOT_NULL(ctx); - EXPECT_EQ_STR(ctx->config->version, "1.0"); - EXPECT_EQ_INT(ctx->queue_scanner->capacity, 5); - EXPECT_EQ_INT(ctx->queue_loader->capacity, 10); - EXPECT_FALSE(ctx->scanner_done); - EXPECT_FALSE(ctx->loader_done); - EXPECT_NULL(ctx->manifest); - - pipeline_context_sender_destroy(ctx); -} - -/* Test pipeline_context_receiver_create/destroy with valid arguments */ -static void test_receiver_create_destroy() { - Config* cfg = config_create(str_dup("2.0"), str_dup("/src"), str_dup("/dst"), - true, true, false, false, false, 0, false, 0); - EXPECT_NOT_NULL(cfg); - - Queue* q = queue_create(20, NULL); - EXPECT_NOT_NULL(q); - - PipelineContextReceiver* ctx = pipeline_context_receiver_create(cfg, q, 42); - EXPECT_NOT_NULL(ctx); - EXPECT_EQ_STR(ctx->config->version, "2.0"); - EXPECT_EQ_INT(ctx->queue->capacity, 20); - EXPECT_EQ_INT(ctx->file_descriptor, 42); - EXPECT_FALSE(ctx->receiver_done); - - pipeline_context_receiver_destroy(ctx); -} - -/* Test that create handles various queue capacities */ -static void test_sender_queue_capacities() { - Config* cfg = config_create(str_dup("3.0"), str_dup("/src"), str_dup("/dst"), - false, false, false, false, false, 0, false, 0); - EXPECT_NOT_NULL(cfg); - - /* Single-element queues */ - Queue* q1 = queue_create(1, NULL); - Queue* q2 = queue_create(1, NULL); - PipelineContextSender* ctx = pipeline_context_sender_create(cfg, q1, q2); - EXPECT_NOT_NULL(ctx); - EXPECT_EQ_INT(ctx->queue_scanner->capacity, 1); - EXPECT_EQ_INT(ctx->queue_loader->capacity, 1); - pipeline_context_sender_destroy(ctx); -} - -/* Test that create handles zero-capacity queues */ -static void test_sender_zero_capacity() { - Config* cfg = config_create(str_dup("4.0"), str_dup("/src"), str_dup("/dst"), - false, false, false, false, false, 0, false, 0); - EXPECT_NOT_NULL(cfg); - - Queue* q1 = queue_create(0, NULL); - Queue* q2 = queue_create(0, NULL); - PipelineContextSender* ctx = pipeline_context_sender_create(cfg, q1, q2); - EXPECT_NOT_NULL(ctx); - EXPECT_EQ_INT(ctx->queue_scanner->capacity, 0); - EXPECT_EQ_INT(ctx->queue_loader->capacity, 0); - pipeline_context_sender_destroy(ctx); -} - -/* Test receiver with zero file_descriptor */ -static void test_receiver_fd_zero() { - Config* cfg = config_create(str_dup("5.0"), str_dup("/src"), str_dup("/dst"), - false, false, false, false, false, 0, false, 0); - Queue* q = queue_create(5, NULL); - PipelineContextReceiver* ctx = pipeline_context_receiver_create(cfg, q, 0); - EXPECT_NOT_NULL(ctx); - EXPECT_EQ_INT(ctx->file_descriptor, 0); - EXPECT_FALSE(ctx->receiver_done); - pipeline_context_receiver_destroy(ctx); -} - -void test_multiprocessing() { - test_sender_create_destroy(); - test_receiver_create_destroy(); - test_sender_queue_capacities(); - test_sender_zero_capacity(); - test_receiver_fd_zero(); -} diff --git a/tests/test_multiprocessing.h b/tests/test_multiprocessing.h deleted file mode 100644 index f59d282..0000000 --- a/tests/test_multiprocessing.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TEST_MULTIPROCESSING_H -#define TEST_MULTIPROCESSING_H - -void test_multiprocessing(); - -#endif diff --git a/tests/test_scanner.c b/tests/test_scanner.c index aaa8fcf..7920e0a 100644 --- a/tests/test_scanner.c +++ b/tests/test_scanner.c @@ -122,294 +122,9 @@ static void test_scanner_empty_directory() { rmdir(dir); } -/* --- Exclude/include pattern and size filter edge cases (Issue #56) --- */ - -static void test_scanner_exclude_pattern() { - const char* dir = "test_scan_excl"; - const char* f_txt = "test_scan_excl/keep.txt"; - const char* f_tmp = "test_scan_excl/remove.tmp"; - const char* content = "data"; - - mkdir(dir, 0755); - create_test_file(f_txt, content); - create_test_file(f_tmp, content); - - char* exclude[] = {"*.tmp"}; - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, exclude, 1, NULL, 0, 0, 0); - EXPECT_NOT_NULL(scanner); - - Chunk* chunk = directory_scanner_next(scanner); - EXPECT_NOT_NULL(chunk); - EXPECT_EQ_INT(chunk->element_count, 1); - EXPECT_EQ_STR(chunk->items[0]->path, f_txt); - - chunk_destroy(chunk); - EXPECT_NULL(directory_scanner_next(scanner)); - - directory_scanner_destroy(scanner); - unlink(f_txt); - unlink(f_tmp); - rmdir(dir); -} - -static void test_scanner_exclude_subdirectory() { - /* Exclude patterns match filenames only (via entry->d_name). - * Files inside subdirectories are also matched by filename. */ - const char* root = "test_scan_excl_sub"; - const char* sub = "test_scan_excl_sub/sub"; - const char* root_txt = "test_scan_excl_sub/root.txt"; - const char* sub_txt = "test_scan_excl_sub/sub/data.txt"; - const char* sub_tmp = "test_scan_excl_sub/sub/temp.tmp"; - const char* content = "data"; - - mkdir(root, 0755); - mkdir(sub, 0755); - create_test_file(root_txt, content); - create_test_file(sub_txt, content); - create_test_file(sub_tmp, content); - - /* Exclude *.tmp — should exclude sub/temp.tmp but keep root.txt and sub/data.txt */ - char* exclude[] = {"*.tmp"}; - DirectoryScanner* scanner = - directory_scanner_create((char*)root, false, 0, exclude, 1, NULL, 0, 0, 0); - EXPECT_NOT_NULL(scanner); - - int total = 0; - Chunk* chunk; - while ((chunk = directory_scanner_next(scanner)) != NULL) { - total += chunk->element_count; - for (int i = 0; i < chunk->element_count; i++) { - /* No path should end in .tmp */ - size_t len = strlen(chunk->items[i]->path); - EXPECT_TRUE(len < 4 || strcmp(chunk->items[i]->path + len - 4, ".tmp") != 0); - } - chunk_destroy(chunk); - } - EXPECT_EQ_INT(total, 2); - - directory_scanner_destroy(scanner); - unlink(root_txt); - unlink(sub_txt); - unlink(sub_tmp); - rmdir(sub); - rmdir(root); -} - -static void test_scanner_include_and_exclude() { - /* In the scanner, exclude is checked first and takes precedence. - * Include patterns act as an additional filter: if include_count > 0, - * the file must match one of the include patterns (after not being excluded). - * This test uses non-overlapping exclude and include patterns. */ - const char* dir = "test_scan_inc_exc"; - const char* f_txt = "test_scan_inc_exc/a.txt"; - const char* f_log = "test_scan_inc_exc/b.log"; - const char* f_bak = "test_scan_inc_exc/c.bak"; - const char* content = "filter"; - - mkdir(dir, 0755); - create_test_file(f_txt, content); - create_test_file(f_log, content); - create_test_file(f_bak, content); - - /* Exclude *.bak. Include *.txt and *.log. */ - char* exclude[] = {"*.bak"}; - char* include[] = {"*.txt", "*.log"}; - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 2, 0, 0); - EXPECT_NOT_NULL(scanner); - - Chunk* chunk = directory_scanner_next(scanner); - EXPECT_NOT_NULL(chunk); - EXPECT_EQ_INT(chunk->element_count, 2); - - int found_txt = 0, found_log = 0; - for (int i = 0; i < chunk->element_count; i++) { - if (strstr(chunk->items[i]->path, "a.txt")) - found_txt = 1; - if (strstr(chunk->items[i]->path, "b.log")) - found_log = 1; - } - /* a.txt included by *.txt, b.log included by *.log, c.bak excluded by *.bak */ - EXPECT_TRUE(found_txt); - EXPECT_TRUE(found_log); - - chunk_destroy(chunk); - EXPECT_NULL(directory_scanner_next(scanner)); - - directory_scanner_destroy(scanner); - unlink(f_txt); - unlink(f_log); - unlink(f_bak); - rmdir(dir); -} - -static void test_scanner_max_size() { - const char* dir = "test_scan_max"; - const char* small = "test_scan_max/small.txt"; - const char* large = "test_scan_max/large.txt"; - create_test_file(small, "tiny"); - create_test_file(large, "this_content_is_longer_than_ten_chars"); - - mkdir(dir, 0755); - create_test_file(small, "tiny"); - create_test_file(large, "this_content_is_longer_than_ten_chars"); - - /* max_size = 10 — only files <= 10 bytes */ - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 10, 0); - EXPECT_NOT_NULL(scanner); - - Chunk* chunk = directory_scanner_next(scanner); - EXPECT_NOT_NULL(chunk); - EXPECT_EQ_INT(chunk->element_count, 1); - EXPECT_EQ_STR(chunk->items[0]->path, small); - - chunk_destroy(chunk); - EXPECT_NULL(directory_scanner_next(scanner)); - - directory_scanner_destroy(scanner); - unlink(small); - unlink(large); - rmdir(dir); -} - -static void test_scanner_min_size() { - const char* dir = "test_scan_min"; - const char* empty_f = "test_scan_min/empty.txt"; - const char* data_f = "test_scan_min/data.txt"; - - mkdir(dir, 0755); - create_test_file(empty_f, ""); - create_test_file(data_f, "some content here"); - - /* min_size = 1 — only files >= 1 byte */ - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 1); - EXPECT_NOT_NULL(scanner); - - Chunk* chunk = directory_scanner_next(scanner); - EXPECT_NOT_NULL(chunk); - EXPECT_EQ_INT(chunk->element_count, 1); - EXPECT_EQ_STR(chunk->items[0]->path, data_f); - - chunk_destroy(chunk); - EXPECT_NULL(directory_scanner_next(scanner)); - - directory_scanner_destroy(scanner); - unlink(empty_f); - unlink(data_f); - rmdir(dir); -} - -static void test_scanner_size_range() { - const char* dir = "test_scan_range"; - const char* tiny = "test_scan_range/tiny.txt"; - const char* medium = "test_scan_range/med.txt"; - const char* huge = "test_scan_range/huge.txt"; - - mkdir(dir, 0755); - create_test_file(tiny, "ab"); - create_test_file(medium, "hello world"); - create_test_file(huge, "this is a much larger file for testing size filters"); - - /* Only files between 3 and 20 bytes */ - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 20, 3); - EXPECT_NOT_NULL(scanner); - - Chunk* chunk = directory_scanner_next(scanner); - EXPECT_NOT_NULL(chunk); - EXPECT_EQ_INT(chunk->element_count, 1); - EXPECT_EQ_STR(chunk->items[0]->path, medium); - - chunk_destroy(chunk); - EXPECT_NULL(directory_scanner_next(scanner)); - - directory_scanner_destroy(scanner); - unlink(tiny); - unlink(medium); - unlink(huge); - rmdir(dir); -} - -static void test_scanner_mixed_patterns() { - /* Combine exclude, include, and size filters together */ - const char* dir = "test_scan_mixed"; - const char* a_txt = "test_scan_mixed/a.txt"; /* size ~= 5 */ - const char* b_bin = "test_scan_mixed/b.bin"; /* size ~= 13 */ - const char* c_txt = "test_scan_mixed/c.txt"; /* size ~= 5 */ - const char* d_bak = "test_scan_mixed/d.bak"; /* size ~= 42 */ - - mkdir(dir, 0755); - create_test_file(a_txt, "aaaaa"); - create_test_file(b_bin, "bbbbbbbbbbbbb"); - create_test_file(c_txt, "ccccc"); - create_test_file(d_bak, "dddddddddddddddddddddddddddddddddddddddddd"); - - /* Exclude *.bak, include *.txt, min_size=3, max_size=10 */ - char* exclude[] = {"*.bak"}; - char* include[] = {"*.txt"}; - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 1, 10, 3); - EXPECT_NOT_NULL(scanner); - - Chunk* chunk = directory_scanner_next(scanner); - EXPECT_NOT_NULL(chunk); - /* Both a.txt and c.txt meet the criteria: .txt extension, size 5 <= 10 and >= 3 */ - EXPECT_EQ_INT(chunk->element_count, 2); - - chunk_destroy(chunk); - EXPECT_NULL(directory_scanner_next(scanner)); - - directory_scanner_destroy(scanner); - unlink(a_txt); - unlink(b_bin); - unlink(c_txt); - unlink(d_bak); - rmdir(dir); -} - -static void test_scanner_no_patterns() { - /* Explicit test with no exclude/include patterns and no size filters. - * This verifies that NULL/0 for all pattern parameters works correctly. */ - const char* dir = "test_scan_none"; - const char* f1 = "test_scan_none/f1.txt"; - const char* f2 = "test_scan_none/f2.txt"; - - mkdir(dir, 0755); - create_test_file(f1, "first"); - create_test_file(f2, "second"); - - DirectoryScanner* scanner = - directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0); - EXPECT_NOT_NULL(scanner); - - Chunk* chunk = directory_scanner_next(scanner); - EXPECT_NOT_NULL(chunk); - EXPECT_EQ_INT(chunk->element_count, 2); - - chunk_destroy(chunk); - EXPECT_NULL(directory_scanner_next(scanner)); - - directory_scanner_destroy(scanner); - unlink(f1); - unlink(f2); - rmdir(dir); -} - void test_scanner() { test_scanner_single_file(); test_scanner_multiple_files(); test_scanner_subdirectory(); test_scanner_empty_directory(); - /* Issue #56: scanner pattern edge cases */ - test_scanner_exclude_pattern(); - test_scanner_exclude_subdirectory(); - test_scanner_include_and_exclude(); - test_scanner_max_size(); - test_scanner_min_size(); - test_scanner_size_range(); - test_scanner_mixed_patterns(); - test_scanner_no_patterns(); } diff --git a/tests/test_transport_ssh.c b/tests/test_transport_ssh.c deleted file mode 100644 index c3df6b5..0000000 --- a/tests/test_transport_ssh.c +++ /dev/null @@ -1,51 +0,0 @@ -#include "test_transport_ssh.h" -#include "transport_ssh.h" -#include "test_utils.h" -#include -#include -#include - -/* Test client_connect_ssh with invalid destination (missing colon) */ -static void test_ssh_connect_invalid_dest() { - /* Missing colon — parse_remote_dest should fail and return NULL */ - Client* client = client_connect_ssh("invalid-destination-no-colon", 22); - EXPECT_NULL(client); -} - -/* Test client_connect_ssh with empty destination */ -static void test_ssh_connect_empty_dest() { - Client* client = client_connect_ssh("", 22); - EXPECT_NULL(client); -} - -/* Test client_connect_ssh with malformed destination (just a colon). - * parse_remote_dest succeeds, ssh is exec'd and fails, but the function - * creates a Client that must be cleaned up. */ -static void test_ssh_connect_malformed() { - Client* client = client_connect_ssh(":", 22); - /* ssh binary exists, so exec succeeds; the function returns a Client. - * We just verify it doesn't crash and clean up properly. */ - if (client != NULL) { - client_disconnect(client); - client_delete(client); - } - EXPECT_TRUE(true); -} - -/* Test client_connect_ssh with valid format but unreachable host. - * The function launches ssh which will fail to connect, returns a Client. */ -static void test_ssh_connect_unreachable() { - Client* client = client_connect_ssh("nonexistent.invalid:/remote/path", 22); - if (client != NULL) { - client_disconnect(client); - client_delete(client); - } - EXPECT_TRUE(true); -} - -void test_transport_ssh() { - test_ssh_connect_invalid_dest(); - test_ssh_connect_empty_dest(); - test_ssh_connect_malformed(); - test_ssh_connect_unreachable(); -} diff --git a/tests/test_transport_ssh.h b/tests/test_transport_ssh.h deleted file mode 100644 index 0df5a47..0000000 --- a/tests/test_transport_ssh.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TEST_TRANSPORT_SSH_H -#define TEST_TRANSPORT_SSH_H - -void test_transport_ssh(); - -#endif diff --git a/tests/test_transport_tcp.c b/tests/test_transport_tcp.c deleted file mode 100644 index 7eea888..0000000 --- a/tests/test_transport_tcp.c +++ /dev/null @@ -1,90 +0,0 @@ -#include "test_transport_tcp.h" -#include "transport_tcp.h" -#include "test_utils.h" -#include -#include - -/* Test client_create and client_delete lifecycle */ -static void test_client_create_delete() { - Client* client = client_create(); - EXPECT_NOT_NULL(client); - EXPECT_TRUE(client->file_descriptor >= 0); - EXPECT_EQ_INT(client->address.sin_family, AF_INET); - EXPECT_EQ_INT(client->ssh_child_pid, -1); - EXPECT_NULL(client->ssl); - EXPECT_NULL(client->ssl_ctx); - - /* Delete should clean up without error */ - client_delete(client); -} - -/* Test client_delete with NULL (safety) */ -static void test_client_delete_null() { - client_delete(NULL); - EXPECT_TRUE(true); -} - -/* Test server_create and server_delete lifecycle */ -static void test_server_create_delete() { - /* Use port 0 to let the OS assign a port */ - Server* server = server_create(0); - EXPECT_NOT_NULL(server); - EXPECT_TRUE(server->file_descriptor >= 0); - EXPECT_EQ_INT(server->address.sin_family, AF_INET); - EXPECT_NULL(server->ssl_ctx); - - /* Clean up */ - server_delete(&server); - EXPECT_NULL(server); -} - -/* Test server_delete with NULL pointer */ -static void test_server_delete_null_ptr() { - server_delete(NULL); - EXPECT_TRUE(true); -} - -/* Test server_delete with NULL server */ -static void test_server_delete_null_server() { - Server* s = NULL; - server_delete(&s); - EXPECT_NULL(s); -} - -/* Test client_create can be called multiple times */ -static void test_client_create_multiple() { - Client* c1 = client_create(); - Client* c2 = client_create(); - EXPECT_NOT_NULL(c1); - EXPECT_NOT_NULL(c2); - EXPECT_TRUE(c1->file_descriptor >= 0); - EXPECT_TRUE(c2->file_descriptor >= 0); - EXPECT_TRUE(c1->file_descriptor != c2->file_descriptor); - - client_delete(c1); - client_delete(c2); -} - -/* Test client_disconnect on a fresh client (should close socket) */ -static void test_client_disconnect_fresh() { - Client* client = client_create(); - EXPECT_NOT_NULL(client); - - /* Disconnect should close the file descriptor */ - client_disconnect(client); - /* The fd should now be invalid */ - /* Verify by trying to use close() on it - should fail */ - EXPECT_EQ_INT(close(client->file_descriptor), -1); - - client_delete(client); -} - -void test_transport_tcp() { - test_client_create_delete(); - test_client_delete_null(); - test_server_create_delete(); - test_server_delete_null_ptr(); - test_server_delete_null_server(); - test_client_create_multiple(); - test_client_disconnect_fresh(); -} diff --git a/tests/test_transport_tcp.h b/tests/test_transport_tcp.h deleted file mode 100644 index 720209f..0000000 --- a/tests/test_transport_tcp.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TEST_TRANSPORT_TCP_H -#define TEST_TRANSPORT_TCP_H - -void test_transport_tcp(); - -#endif diff --git a/tests/test_transport_tls.c b/tests/test_transport_tls.c deleted file mode 100644 index 6f03717..0000000 --- a/tests/test_transport_tls.c +++ /dev/null @@ -1,81 +0,0 @@ -#include "test_transport_tls.h" -#include "transport_tls.h" -#include "transport_tcp.h" -#include "test_utils.h" -#include -#include - -/* Test tls_global_init succeeds */ -static void test_tls_global_init() { - bool ok = tls_global_init(); - EXPECT_TRUE(ok); -} - -/* Test tls_global_init can be called multiple times */ -static void test_tls_global_init_twice() { - bool ok1 = tls_global_init(); - bool ok2 = tls_global_init(); - EXPECT_TRUE(ok1); - EXPECT_TRUE(ok2); -} - -/* Test client_connect_tls with bad certificate path. - * The function will create a socket, try to connect to localhost, - * fail to connect (since nothing is listening), and return false. - * We don't need a server to verify the error path. */ -static void test_tls_connect_bad_cert() { - /* First, init TLS globally */ - tls_global_init(); - - Client* client = client_create(); - EXPECT_NOT_NULL(client); - - /* Attempt to connect to a non-existent server with bad cert paths. - * client_connect_tls will try to connect first, fail, and return false. - * Note: we use an invalid host to ensure connection failure, - * which exercises the error path before cert loading. */ - bool ok = client_connect_tls(client, "192.0.2.1", 12345, "/nonexistent/cert.pem", - "/nonexistent/key.pem", "/nonexistent/ca.pem"); - EXPECT_FALSE(ok); - - client_delete(client); -} - -/* Test client_connect_tls with NULL cert paths (should still attempt connection). - * Cert/key/ca being NULL is valid — the function will attempt to create an - * SSL context without client certificates. */ -static void test_tls_connect_null_paths() { - tls_global_init(); - - Client* client = client_create(); - EXPECT_NOT_NULL(client); - - /* Connect to invalid address — will fail at connect() step */ - bool ok = client_connect_tls(client, "192.0.2.2", 12346, NULL, NULL, NULL); - EXPECT_FALSE(ok); - - client_delete(client); -} - -/* Test server_create_tls with bad cert paths. - * The function should fail gracefully. */ -static void test_tls_server_bad_cert() { - tls_global_init(); - - Server* server = server_create(0); - EXPECT_NOT_NULL(server); - - /* Load bad cert paths — should fail and return false */ - bool ok = server_create_tls(server, "/nonexistent/cert.pem", "/nonexistent/key.pem", NULL); - EXPECT_FALSE(ok); - - server_delete(&server); -} - -void test_transport_tls() { - test_tls_global_init(); - test_tls_global_init_twice(); - test_tls_connect_bad_cert(); - test_tls_connect_null_paths(); - test_tls_server_bad_cert(); -} diff --git a/tests/test_transport_tls.h b/tests/test_transport_tls.h deleted file mode 100644 index aa13a69..0000000 --- a/tests/test_transport_tls.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TEST_TRANSPORT_TLS_H -#define TEST_TRANSPORT_TLS_H - -void test_transport_tls(); - -#endif