apache · cmcfarlen · Aug 30, 2023 · Aug 25, 2023 · Aug 25, 2023 · Aug 29, 2023
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -302,9 +302,6 @@ if(ENABLE_DOCS)
   find_program(PipEnv pipenv REQUIRED)
 endif()
 
-# Catch2 for tests
-set(CATCH_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/lib/catch2)
-
 include(CTest)
 set(TS_HAS_TESTS ${BUILD_REGRESSION_TESTING})
 

diff --git a/proxy/hdrs/CMakeLists.txt b/proxy/hdrs/CMakeLists.txt
@@ -46,3 +46,26 @@ target_link_libraries(hdrs
     PRIVATE
         ts::inkevent
 )
+
+add_executable(test_proxy_hdrs
+    unit_tests/test_HdrHeap.cc
+    unit_tests/test_Hdrs.cc
+    unit_tests/test_HdrUtils.cc
+    unit_tests/test_HdrHeap.cc
+    unit_tests/test_HeaderValidator.cc
+    unit_tests/test_Huffmancode.cc
+    unit_tests/test_mime.cc
+    unit_tests/test_URL.cc
+    unit_tests/unit_test_main.cc
+)
+target_link_libraries(test_proxy_hdrs PRIVATE ts::hdrs ts::tscore ts::inkevent catch2::catch2)
+add_test(NAME test_proxy_hdrs COMMAND test_proxy_hdrs)
+
+add_executable(test_proxy_hdrs_xpack
+    XPACK.cc
+    HuffmanCodec.cc
+    unit_tests/test_XPACK.cc
+)
+target_include_directories(test_proxy_hdrs_xpack PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(test_proxy_hdrs_xpack PRIVATE ts::tscore libswoc catch2::catch2)
+add_test(NAME test_proxy_hdrs_xpack COMMAND test_proxy_hdrs_xpack)
diff --git a/proxy/hdrs/Makefile.am b/proxy/hdrs/Makefile.am
@@ -69,7 +69,6 @@ load_http_hdr_LDADD =
 check_PROGRAMS = \
 	test_proxy_hdrs \
 	test_hdr_heap \
-	test_Huffmancode \
 	test_XPACK
 
 TESTS = $(check_PROGRAMS)
@@ -83,6 +82,7 @@ test_proxy_hdrs_SOURCES = \
 	unit_tests/test_HdrUtils.cc \
 	unit_tests/test_URL.cc \
 	unit_tests/test_mime.cc \
+	unit_tests/test_Huffmancode.cc \
 	unit_tests/test_HeaderValidator.cc
 
 test_proxy_hdrs_LDFLAGS = @AM_LDFLAGS@ @SWOC_LDFLAGS@ @YAMLCPP_LDFLAGS@ @OPENSSL_LDFLAGS@
@@ -112,15 +112,6 @@ test_hdr_heap_LDADD = \
 	@SWOC_LIBS@ @HWLOC_LIBS@ \
 	@LIBPCRE@ @OPENSSL_LIBS@ @LIBCAP@
 
-test_Huffmancode_LDADD = \
-	$(top_builddir)/src/tscore/libtscore.a \
-	$(top_builddir)/src/tscpp/util/libtscpputil.la
-
-test_Huffmancode_SOURCES = \
-	test_Huffmancode.cc \
-	HuffmanCodec.cc \
-	HuffmanCodec.h
-
 test_XPACK_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(abs_top_srcdir)/lib/catch2

diff --git a/proxy/hdrs/test_Huffmancode.cc → proxy/hdrs/unit_tests/test_Huffmancode.cc b/proxy/hdrs/test_Huffmancode.cc → proxy/hdrs/unit_tests/test_Huffmancode.cc
@@ -26,6 +26,7 @@
 #include <iostream>
 #include <cassert>
 #include <cstring>
+#include "catch.hpp"
 
 using namespace std;
 
@@ -88,13 +89,20 @@ random_test()
   free(dst_start);
 }
 
+TEST_CASE("Huffmancode Random", "[proxy][huffman]")
+{
+  // This doesn't check anything ...
+  for (int i = 0; i < 100; i++) {
+    random_test();
+  }
+}
+
 union Value {
   uint32_t x;
   uint8_t y[4];
 };
 
-void
-values_test()
+TEST_CASE("values_test", "[proxy][huffman]")
 {
   char dst_start[4];
   int size = sizeof(test_values) / 4;
@@ -139,11 +147,11 @@ values_test()
 
     // EOS is treated as invalid so check for an error
     if (value == 0x3fffffff) {
-      assert(bytes == -1);
+      REQUIRE(bytes == -1);
       continue;
     }
-    assert(dst_start[0] == ascii_value);
-    assert(bytes == 1);
+    REQUIRE(dst_start[0] == ascii_value);
+    REQUIRE(bytes == 1);
   }
 }
 
@@ -164,22 +172,20 @@ const static struct {
    17                                                                                                                                   }
 };
 
-void
-encode_test()
+TEST_CASE("encode_test", "[proxy][huffman]")
 {
   for (const auto &i : huffman_encode_test_data) {
     uint8_t *dst        = static_cast<uint8_t *>(malloc(i.expect_len));
     int64_t encoded_len = huffman_encode(dst, i.src, i.src_len);
 
-    assert(encoded_len == i.expect_len);
-    assert(memcmp(i.expect, dst, encoded_len) == 0);
+    REQUIRE(encoded_len == i.expect_len);
+    REQUIRE(memcmp(i.expect, dst, encoded_len) == 0);
 
     free(dst);
   }
 }
 
-void
-decode_errors_test()
+TEST_CASE("decode_errors", "[proxy][huffman]")
 {
   const static struct {
     char *input;
@@ -196,24 +202,7 @@ decode_errors_test()
     int dst_len = 2 * test_cases[i].input_len;
     char *dst   = (char *)malloc(dst_len);
     int len     = huffman_decode(dst, (uint8_t *)test_cases[i].input, test_cases[i].input_len);
-    assert(len == -1);
+    REQUIRE(len == -1);
     free(dst);
   }
 }
-
-int
-main()
-{
-  hpack_huffman_init();
-
-  for (int i = 0; i < 100; i++) {
-    random_test();
-  }
-  values_test();
-  decode_errors_test();
-
-  hpack_huffman_fin();
-
-  encode_test();
-  return 0;
-}
diff --git a/proxy/hdrs/unit_tests/unit_test_main.cc b/proxy/hdrs/unit_tests/unit_test_main.cc
@@ -22,6 +22,7 @@
  */
 
 #include "HTTP.h"
+#include "HuffmanCodec.h"
 
 #define CATCH_CONFIG_RUNNER
 #include "catch.hpp"
@@ -35,10 +36,12 @@ main(int argc, char *argv[])
   cmd_disable_pfreelist = true;
   // Get all of the HTTP WKS items populated.
   http_init();
+  hpack_huffman_init();
 
   int result = Catch::Session().run(argc, argv);
 
   // global clean-up...
+  hpack_huffman_fin();
 
   return result;
 }
diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
@@ -30,7 +30,7 @@ add_executable(test_Metrics
         test_Metrics.cc
         )
 
-target_link_libraries(test_Metrics PRIVATE tsapi tscore)
-target_include_directories(test_Metrics PRIVATE ${CMAKE_SOURCE_DIR}/include ${CATCH_INCLUDE_DIR})
+target_link_libraries(test_Metrics PRIVATE tsapi tscore catch2::catch2)
+target_include_directories(test_Metrics PRIVATE ${CMAKE_SOURCE_DIR}/include)
 
 add_test(NAME test_Metrics COMMAND $<TARGET_FILE:test_Metrics>)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -20,7 +20,6 @@
 include_directories(
         ${IOCORE_INCLUDE_DIRS}
         ${PROXY_INCLUDE_DIRS}
-        ${CATCH_INCLUDE_DIR}
 )
 
 link_libraries(
@@ -55,6 +54,7 @@ link_libraries(
         inkevent
         yaml-cpp
         libswoc
+        catch2::catch2
 )
 if (TS_USE_LINUX_IO_URING)
     link_libraries(inkuring uring)

diff --git a/src/tscore/CMakeLists.txt b/src/tscore/CMakeLists.txt
@@ -124,6 +124,9 @@ target_link_libraries(tscore
 if(TS_USE_POSIX_CAP)
     target_link_libraries(tscore PUBLIC cap::cap)
 endif()
+if(TS_USE_HWLOC)
+    target_link_libraries(tscore PUBLIC hwloc::hwloc)
+endif()
 
 add_dependencies(tscore ParseRules)
 target_include_directories(tscore PRIVATE
@@ -171,10 +174,11 @@ target_link_libraries(test_tscore
         ts::tscpputil
         OpenSSL::Crypto
         OpenSSL::SSL
+        catch2::catch2
 )
 if(TS_USE_HWLOC)
     target_link_libraries(test_tscore PRIVATE hwloc::hwloc)
 endif()
-target_include_directories(test_tscore PRIVATE ${CMAKE_SOURCE_DIR}/include ${CATCH_INCLUDE_DIR})
+target_include_directories(test_tscore PRIVATE ${CMAKE_SOURCE_DIR}/include)
 
 add_test(NAME test_tscore COMMAND $<TARGET_FILE:test_tscore>)
diff --git a/src/tscpp/util/CMakeLists.txt b/src/tscpp/util/CMakeLists.txt
@@ -39,7 +39,7 @@ add_executable(test_tscpputil
         unit_tests/test_time_parser.cc
         unit_tests/unit_test_main.cc
 )
-target_link_libraries(test_tscpputil PRIVATE tscpputil libswoc)
-target_include_directories(test_tscpputil PRIVATE ${CMAKE_SOURCE_DIR}/include ${CATCH_INCLUDE_DIR})
+target_link_libraries(test_tscpputil PRIVATE tscpputil libswoc catch2::catch2)
+target_include_directories(test_tscpputil PRIVATE ${CMAKE_SOURCE_DIR}/include)
 
 add_test(NAME test_tscpputil COMMAND $<TARGET_FILE:test_tscpputil>)