[acquire/CMakeLists.txt] Add arch to all source files on Windows ; [acquire/tests/{CMakeLists.txt,test_curl_helpers{.h,.c}}] Add new test suite for libcurl wrapper

Author: SamuelMarks

acquire/CMakeLists.txt

@@ -352,6 +352,12 @@ else ()
             message(STATUS "Nothing special with ${src}")
             set_source_files_properties(${src} PROPERTIES COMPILE_DEFINITIONS "")
         endif ()
+        if (WIN32)
+            set_source_files_properties(
+                    "${src}"
+                    PROPERTIES COMPILE_DEFINITIONS "_${TARGET_ARCH}_"
+            )
+        endif (WIN32)
     endforeach (src IN LISTS gen_source_files)
 
     if (WIN32)

acquire/acquire_libcurl.h

@@ -18,6 +18,12 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#ifdef ACQUIRE_TESTING
+#define ACQUIRE_STATIC
+#else
+#define ACQUIRE_STATIC static
+#endif /* ACQUIRE_TESTING */
+
 #include <errno.h>
 #include <memory.h>
 #include <stdint.h>
@@ -61,7 +67,7 @@ struct dnld_params_t {
   uint64_t dnld_file_sz;
 };
 
-static int get_oname_from_cd(char const *const cd, char *oname) {
+ACQUIRE_STATIC int get_oname_from_cd(char const *const cd, char *oname) {
   char const *const cdtag = "Content-disposition:";
   char const *const key = "filename=";
   char *val = NULL;
@@ -89,7 +95,7 @@ static int get_oname_from_cd(char const *const cd, char *oname) {
   return EXIT_SUCCESS;
 }
 
-static int get_oname_from_url(char const *url, char *oname) {
+ACQUIRE_STATIC int get_oname_from_url(char const *url, char *oname) {
   char const *u = url;
 
   /* Remove "http(s)://" */

acquire/tests/CMakeLists.txt

@@ -152,6 +152,29 @@ foreach (EXEC_NAME ${_targets})
     test_wrapper()
 endforeach (EXEC_NAME ${_targets})
 
+if (LIBACQUIRE_USE_LIBCURL)
+    set(EXEC_NAME "test_curl_helpers")
+
+    add_executable("${EXEC_NAME}")
+
+    target_sources(
+            "${EXEC_NAME}"
+            PRIVATE
+            "test_curl_helpers.c"
+            "${CMAKE_BINARY_DIR}/gen/gen_acquire_libcurl.c"
+            "${CMAKE_BINARY_DIR}/gen/gen_acquire_string_extras.c"
+    )
+
+    target_compile_definitions(${EXEC_NAME} PRIVATE ACQUIRE_TESTING=1)
+
+    target_link_libraries("${EXEC_NAME}" PRIVATE CURL::libcurl)
+    if (HAS_LIBBSD)
+        target_link_libraries("${EXEC_NAME}" PRIVATE LibBSD::LibBSD)
+    endif (HAS_LIBBSD)
+
+    test_wrapper()
+endif (LIBACQUIRE_USE_LIBCURL)
+
 # Extraction archive tests
 if (NOT (EXTRACT_LIB STREQUAL "WINCOMPRESSAPI"))
     foreach (ARCHIVE_LIB ${_archives})

acquire/tests/test_curl_helpers.c

@@ -0,0 +1,11 @@
+#include <greatest.h>
+
+#include "test_curl_helpers.h"
+
+GREATEST_MAIN_DEFS();
+
+int main(int argc, char **argv) {
+  GREATEST_MAIN_BEGIN();
+  RUN_SUITE(curl_helpers_suite);
+  GREATEST_MAIN_END();
+}

acquire/tests/test_curl_helpers.h

@@ -0,0 +1,92 @@
+#ifndef TEST_CURL_HELPERS_H
+#define TEST_CURL_HELPERS_H
+
+#include "acquire_common_defs.h"
+#include <greatest.h>
+
+int get_oname_from_cd(char const *const cd, char *oname);
+int get_oname_from_url(char const *url, char *oname);
+
+TEST test_get_oname_from_url_simple(void) {
+  char oname[MAX_FILENAME];
+  int result = get_oname_from_url("http://example.com/somefile.txt", oname);
+  ASSERT_EQ(EXIT_SUCCESS, result);
+  ASSERT_STR_EQ("somefile.txt", oname);
+  PASS();
+}
+
+TEST test_get_oname_from_url_with_query(void) {
+  char oname[MAX_FILENAME];
+  /* This implementation is simple and doesn't handle query strings. */
+  int result =
+      get_oname_from_url("https://site.com/archive.zip?version=1.2", oname);
+  ASSERT_EQ(EXIT_SUCCESS, result);
+  ASSERT_STR_EQ("archive.zip?version=1.2", oname);
+  PASS();
+}
+
+TEST test_get_oname_from_url_no_path(void) {
+  char oname[MAX_FILENAME];
+  int result = get_oname_from_url("http://example.com", oname);
+  ASSERT_EQ(EXIT_SUCCESS, result);
+  ASSERT_STR_EQ("http://example.com", oname);
+  PASS();
+}
+
+TEST test_get_oname_from_url_trailing_slash(void) {
+  char oname[MAX_FILENAME];
+  int result = get_oname_from_url("http://example.com/some/path/", oname);
+  ASSERT_EQ(EXIT_SUCCESS, result);
+  ASSERT_STR_EQ("", oname);
+  PASS();
+}
+
+TEST test_get_oname_from_cd_simple(void) {
+  char oname[MAX_FILENAME];
+  const char *cd = "attachment; filename=simple.dat";
+  int result = get_oname_from_cd(cd, oname);
+  ASSERT_EQ(EXIT_SUCCESS, result);
+  ASSERT_STR_EQ("simple.dat", oname);
+  PASS();
+}
+
+TEST test_get_oname_from_cd_case_insensitive(void) {
+  char oname[MAX_FILENAME];
+  const char *cd = "attachment; FILENAME=case.txt";
+  int result = get_oname_from_cd(cd, oname);
+  ASSERT_EQ(EXIT_SUCCESS, result);
+  ASSERT_STR_EQ("case.txt", oname);
+  PASS();
+}
+
+TEST test_get_oname_from_cd_with_other_params(void) {
+  char oname[MAX_FILENAME];
+  const char *cd = "attachment; filename=ext.zip; charset=UTF-8";
+  int result = get_oname_from_cd(cd, oname);
+  ASSERT_EQ(EXIT_SUCCESS, result);
+  ASSERT_STR_EQ("ext.zip", oname);
+  PASS();
+}
+
+TEST test_get_oname_from_cd_no_filename(void) {
+  char oname[MAX_FILENAME] = "initial";
+  const char *cd = "attachment; something=else";
+  int result = get_oname_from_cd(cd, oname);
+  ASSERT_EQ(EXIT_FAILURE, result);
+  ASSERT_STR_EQ("initial", oname); /* Should not be modified */
+  PASS();
+}
+
+SUITE(curl_helpers_suite) {
+  RUN_TEST(test_get_oname_from_url_simple);
+  RUN_TEST(test_get_oname_from_url_with_query);
+  RUN_TEST(test_get_oname_from_url_no_path);
+  RUN_TEST(test_get_oname_from_url_trailing_slash);
+
+  RUN_TEST(test_get_oname_from_cd_simple);
+  RUN_TEST(test_get_oname_from_cd_case_insensitive);
+  RUN_TEST(test_get_oname_from_cd_with_other_params);
+  RUN_TEST(test_get_oname_from_cd_no_filename);
+}
+
+#endif /* !TEST_CURL_HELPERS_H */