Cleanup API tests

Signed-off-by: Alan Jowett <[email protected]>

Author: Alan-Jowett

tests/api_test/api_test.cpp

@@ -1598,87 +1598,73 @@ TEST_CASE("Test program order", "[native_tests]")
 // Test eBPF string and type conversion APIs
 TEST_CASE("ebpf_string_apis", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     // Test ebpf_free_string - can be called with NULL safely
     ebpf_free_string(nullptr);
 
     // Test program type name lookup
-    ebpf_program_type_t sample_program_type = {
-        0x608c517c, 0x6c52, 0x4a26, {0xb6, 0x77, 0xbb, 0x1c, 0x34, 0x42, 0x5a, 0xdf}};
+    ebpf_program_type_t sample_program_type = EBPF_PROGRAM_TYPE_BIND_GUID;
     const char* type_name = ebpf_get_program_type_name(&sample_program_type);
-    // Should return a valid name or NULL for unknown types
-    if (type_name != nullptr) {
-        REQUIRE(strlen(type_name) > 0);
-    }
+    REQUIRE(type_name != nullptr);
+    REQUIRE(strlen(type_name) > 0);
 
     // Test attach type name lookup
-    ebpf_attach_type_t bind_attach_type = {
-        0xb9707e04, 0x8127, 0x4c72, {0x83, 0x3e, 0x05, 0xb1, 0xfb, 0x43, 0x94, 0x96}};
+    ebpf_attach_type_t bind_attach_type = EBPF_ATTACH_TYPE_BIND_GUID;
     const char* attach_name = ebpf_get_attach_type_name(&bind_attach_type);
-    if (attach_name != nullptr) {
-        REQUIRE(strlen(attach_name) > 0);
-    }
+    REQUIRE(attach_name != nullptr);
+    REQUIRE(strlen(attach_name) > 0);
 }
 
 // Test eBPF program and attach type conversion APIs
 TEST_CASE("ebpf_type_conversion_apis", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     // Test BPF to eBPF program type conversion
     const ebpf_program_type_t* ebpf_type = ebpf_get_ebpf_program_type(BPF_PROG_TYPE_SAMPLE);
-    if (ebpf_type != nullptr) {
-        // Test reverse conversion
-        bpf_prog_type_t bpf_type = ebpf_get_bpf_program_type(ebpf_type);
-        REQUIRE(bpf_type == BPF_PROG_TYPE_SAMPLE);
-    }
+    REQUIRE(ebpf_type != nullptr);
+
+    // Test reverse conversion
+    bpf_prog_type_t bpf_type = ebpf_get_bpf_program_type(ebpf_type);
+    REQUIRE(bpf_type == BPF_PROG_TYPE_SAMPLE);
 
     // Test BPF to eBPF attach type conversion
     ebpf_attach_type_t ebpf_attach_type;
     ebpf_result_t result = ebpf_get_ebpf_attach_type(BPF_ATTACH_TYPE_BIND, &ebpf_attach_type);
-    if (result == EBPF_SUCCESS) {
-        // Test reverse conversion
-        bpf_attach_type_t bpf_attach_type = ebpf_get_bpf_attach_type(&ebpf_attach_type);
-        REQUIRE(bpf_attach_type == BPF_ATTACH_TYPE_BIND);
-    }
+    REQUIRE(result == EBPF_SUCCESS);
+
+    // Test reverse conversion
+    bpf_attach_type_t bpf_attach_type = ebpf_get_bpf_attach_type(&ebpf_attach_type);
+    REQUIRE(bpf_attach_type == BPF_ATTACH_TYPE_BIND);
 
     // Test program type lookup by name
     ebpf_program_type_t program_type;
     ebpf_attach_type_t expected_attach_type;
     result = ebpf_get_program_type_by_name("bind", &program_type, &expected_attach_type);
-    if (result == EBPF_SUCCESS) {
-        // Verify the lookup worked by converting back to name
-        const char* retrieved_name = ebpf_get_program_type_name(&program_type);
-        if (retrieved_name != nullptr) {
-            // Name might not match exactly due to internal naming conventions
-            REQUIRE(strlen(retrieved_name) > 0);
-        }
-    }
+    REQUIRE(result == EBPF_SUCCESS);
+
+    // Verify the lookup worked by converting back to name
+    const char* retrieved_name = ebpf_get_program_type_name(&program_type);
+    REQUIRE(retrieved_name != nullptr);
+    REQUIRE(strlen(retrieved_name) > 0);
 }
 
 // Test path canonicalization API
 TEST_CASE("ebpf_canonicalize_pin_path", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     char output[MAX_PATH];
 
     // Test with a simple path
     ebpf_result_t result = ebpf_canonicalize_pin_path(output, sizeof(output), "/some/test/path");
-    // The function should either succeed or fail gracefully
-    REQUIRE((result == EBPF_SUCCESS || result != EBPF_SUCCESS));
+    REQUIRE(result == EBPF_SUCCESS);
+    REQUIRE(std::string(output) == "BPF:\\some\\test\\path");
 
     // Test with empty path
     result = ebpf_canonicalize_pin_path(output, sizeof(output), "");
-    REQUIRE((result == EBPF_SUCCESS || result != EBPF_SUCCESS));
+    REQUIRE(result == EBPF_SUCCESS);
+    REQUIRE(std::string(output) == "BPF:\\");
 }
 
 // Test enumerate programs API
 TEST_CASE("ebpf_enumerate_programs", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     // Test with a known test file path - using sample programs from the project
     const char* test_files[] = {"test_sample_ebpf.o", "bindmonitor.o"};
 
@@ -1719,8 +1705,6 @@ TEST_CASE("ebpf_enumerate_programs", "[ebpf_api]")
 // Test eBPF verification APIs
 TEST_CASE("ebpf_verification_apis", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     // Test file verification APIs with known test files
     const char* test_files[] = {"test_sample_ebpf.o", "bindmonitor.o"};
 
@@ -1740,9 +1724,8 @@ TEST_CASE("ebpf_verification_apis", "[ebpf_api]")
             &error_message,
             &stats);
 
-        // Result should be 0 (success) or 1 (verification failed) for valid files
-        // For non-existent files, this might be different
-        REQUIRE((result == 0 || result == 1 || result != 0));
+        // Result should be 0 (success)
+        REQUIRE(result == 0);
 
         // Clean up strings
         if (report != nullptr) {
@@ -1784,8 +1767,6 @@ TEST_CASE("ebpf_verification_apis", "[ebpf_api]")
 // Test eBPF object management APIs
 TEST_CASE("ebpf_object_apis", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     // Test object_unpin with invalid path - should fail gracefully
     ebpf_result_t result = ebpf_object_unpin("/invalid/path/that/does/not/exist");
     REQUIRE(result != EBPF_SUCCESS);
@@ -1816,8 +1797,6 @@ TEST_CASE("ebpf_object_apis", "[ebpf_api]")
 // Test eBPF pinned object path APIs
 TEST_CASE("ebpf_pinned_path_apis", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     char next_path[EBPF_MAX_PIN_PATH_LENGTH];
     ebpf_object_type_t object_type = EBPF_OBJECT_UNKNOWN;
 
@@ -1844,8 +1823,6 @@ TEST_CASE("ebpf_pinned_path_apis", "[ebpf_api]")
 // Test eBPF program synchronization API
 TEST_CASE("ebpf_program_synchronize", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     // Test program synchronization - should succeed even if no programs are running
     ebpf_result_t result = ebpf_program_synchronize();
     REQUIRE(result == EBPF_SUCCESS);
@@ -1854,8 +1831,6 @@ TEST_CASE("ebpf_program_synchronize", "[ebpf_api]")
 // Test eBPF object execution type APIs
 TEST_CASE("ebpf_object_execution_type_apis", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     // Load a test object to test execution type APIs
     struct bpf_object* object = bpf_object__open("test_sample_ebpf.o");
     if (object != nullptr) {
@@ -1887,8 +1862,6 @@ TEST_CASE("ebpf_object_execution_type_apis", "[ebpf_api]")
 // Test eBPF perf event array API
 TEST_CASE("ebpf_perf_event_array_api", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     // Create a perf event array map for testing
     fd_t map_fd = bpf_map_create(BPF_MAP_TYPE_PERF_EVENT_ARRAY, "test_perf", 0, 0, 4, nullptr);
     if (map_fd > 0) {
@@ -1899,7 +1872,7 @@ TEST_CASE("ebpf_perf_event_array_api", "[ebpf_api]")
         // Should either succeed or fail gracefully (e.g., if no consumers are attached)
         REQUIRE((result == EBPF_SUCCESS || result != EBPF_SUCCESS));
 
-        ebpf_close_fd(map_fd);
+        (void)ebpf_close_fd(map_fd);
     }
 }
 
@@ -1926,7 +1899,7 @@ TEST_CASE("ebpf_object_info_api", "[ebpf_api]")
         REQUIRE(info.id != 0);
         REQUIRE(std::string(info.name) == "test_map");
 
-        ebpf_close_fd(map_fd);
+        (void)ebpf_close_fd(map_fd);
     }
 
     // Test with invalid fd
@@ -1973,8 +1946,6 @@ TEST_CASE("ebpf_program_attach_apis_basic", "[ebpf_api]")
 // Test eBPF native object loading API
 TEST_CASE("ebpf_object_load_native_api", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     // Test loading native object with invalid file
     size_t map_count = 1;
     size_t program_count = 1;
@@ -1996,8 +1967,6 @@ TEST_CASE("ebpf_object_load_native_api", "[ebpf_api]")
 // Test eBPF program info from verifier API
 TEST_CASE("ebpf_program_info_from_verifier_api", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     const ebpf_program_info_t* program_info = nullptr;
     const char* error_message = nullptr;
     const char* report = nullptr;
@@ -2026,8 +1995,6 @@ TEST_CASE("ebpf_program_info_from_verifier_api", "[ebpf_api]")
 // Test deprecated eBPF section enumeration API for backward compatibility
 TEST_CASE("ebpf_enumerate_sections_deprecated", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     // Test the deprecated ebpf_enumerate_sections API
     const char* test_file = "test_sample_ebpf.o";
     ebpf_section_info_t* section_infos = nullptr;
@@ -2059,8 +2026,6 @@ TEST_CASE("ebpf_enumerate_sections_deprecated", "[ebpf_api]")
 // Test deprecated ebpf_get_next_pinned_program_path API
 TEST_CASE("ebpf_get_next_pinned_program_path_deprecated", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     char next_path[EBPF_MAX_PIN_PATH_LENGTH];
 
 #pragma warning(push)
@@ -2077,40 +2042,9 @@ TEST_CASE("ebpf_get_next_pinned_program_path_deprecated", "[ebpf_api]")
     }
 }
 
-// Test eBPF store APIs (these are internal/advanced APIs)
-TEST_CASE("ebpf_store_apis", "[ebpf_api]")
-{
-    _disable_crt_report_hook disable_hook;
-
-    // These APIs are typically used by system components to manage the eBPF store
-    // We'll test basic error handling with invalid inputs
-
-    // Test store update with null data - should fail gracefully
-    ebpf_result_t result = ebpf_store_update_program_information_array(nullptr, 0);
-    REQUIRE(result != EBPF_SUCCESS);
-
-    // Test store update section with null data - should fail gracefully
-    result = ebpf_store_update_section_information(nullptr, 0);
-    REQUIRE(result != EBPF_SUCCESS);
-
-    // Test store delete with null data - should fail gracefully
-    result = ebpf_store_delete_program_information(nullptr);
-    REQUIRE(result != EBPF_SUCCESS);
-
-    // Test store delete section with null data - should fail gracefully
-    result = ebpf_store_delete_section_information(nullptr);
-    REQUIRE(result != EBPF_SUCCESS);
-
-    // Note: These APIs modify system state and require careful handling
-    // Full testing would require setting up valid program/section information
-    // which is beyond the scope of basic API coverage testing
-}
-
 // Test eBPF memory-based verification APIs
 TEST_CASE("ebpf_verification_memory_apis", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     // Test memory-based verification with minimal data
     const char* test_data = "minimal_test_data";
     const char* report = nullptr;
@@ -2157,8 +2091,6 @@ TEST_CASE("ebpf_verification_memory_apis", "[ebpf_api]")
 // Test remaining deprecated eBPF verification APIs for completeness
 TEST_CASE("ebpf_deprecated_verification_apis", "[ebpf_api]")
 {
-    _disable_crt_report_hook disable_hook;
-
     const char* test_file = "test_sample_ebpf.o";
     const char* disassembly = nullptr;
     const char* error_message = nullptr;