From 8608cb89f3d769af2ec5e0c3cec3d3177157420e Mon Sep 17 00:00:00 2001
From: Chris McFarlen <cmcfarlen@apple.com>
Date: Tue, 29 Aug 2023 14:38:46 -0500
Subject: [PATCH 1/3] Add proxy/http tests

---
 proxy/http/CMakeLists.txt | 13 +++++++++++++
 src/tests/CMakeLists.txt  |  6 ++++++
 2 files changed, 19 insertions(+)

diff --git a/proxy/http/CMakeLists.txt b/proxy/http/CMakeLists.txt
index 756edc99956..cf619aca73f 100644
--- a/proxy/http/CMakeLists.txt
+++ b/proxy/http/CMakeLists.txt
@@ -76,3 +76,16 @@ if(BUILD_TESTING)
 endif()
 
 add_subdirectory(remap)
+
+add_executable(test_proxy_http
+  unit_tests/unit_test_main.cc
+  unit_tests/test_ForwardedConfig.cc
+  unit_tests/test_error_page_selection.cc
+  unit_tests/test_PreWarm.cc
+  ForwardedConfig.cc
+  HttpBodyFactory.cc
+)
+target_include_directories(test_proxy_http PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(test_proxy_http PRIVATE catch2::catch2 hdrs tscore inkevent proxy logging)
+add_test(NAME test_proxy_http COMMAND test_proxy_http)
+
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 6ba08015e3a..b4a458c8994 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -120,6 +120,12 @@ target_link_libraries(test_net
 
 add_stubbed_test(EventSystem ${CMAKE_SOURCE_DIR}/iocore/eventsystem/unit_tests/test_EventSystem.cc)
 add_stubbed_test(IOBuffer ${CMAKE_SOURCE_DIR}/iocore/eventsystem/unit_tests/test_IOBuffer.cc)
+
+add_stubbed_test(HttpTransact
+  ${CMAKE_SOURCE_DIR}/proxy/http/unit_tests/main.cc
+  ${CMAKE_SOURCE_DIR}/proxy/http/unit_tests/test_HttpTransact.cc
+)
+
 # maybe move this one back to iocore/eventsystem/CMakeLists.txt
 #add_stubbed_test(MIOBufferWriter ${CMAKE_SOURCE_DIR}/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc)
 #add_stubbed_test(ProxyAllocator ${CMAKE_SOURCE_DIR}/iocore/eventsystem/unit_tests/benchmark_ProxyAllocator.cc)

From 59232db1196f0a03c47601e326207e181885d16c Mon Sep 17 00:00:00 2001
From: Chris McFarlen <cmcfarlen@apple.com>
Date: Tue, 29 Aug 2023 15:14:31 -0500
Subject: [PATCH 2/3] Add proxy/http2 tests

---
 proxy/http2/CMakeLists.txt | 47 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/proxy/http2/CMakeLists.txt b/proxy/http2/CMakeLists.txt
index 6a4ce0aeb2e..d6774a83b9f 100644
--- a/proxy/http2/CMakeLists.txt
+++ b/proxy/http2/CMakeLists.txt
@@ -45,3 +45,50 @@ target_link_libraries(http2
     PRIVATE
         ts::inkutils
 )
+
+add_executable(test_http2
+  HTTP2.cc
+  Http2Frame.cc
+  HPACK.cc
+  unit_tests/main.cc
+  unit_tests/test_HTTP2.cc
+  unit_tests/test_Http2Frame.cc
+  unit_tests/test_HpackIndexingTable.cc
+)
+target_include_directories(test_http2 PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${PROXY_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/iocore/utils
+)
+target_link_libraries(test_http2 PRIVATE catch2::catch2 records tscore hdrs inkevent)
+add_test(NAME test_http2 COMMAND test_http2)
+
+add_executable(test_Http2DependencyTree
+  unit_tests/test_Http2DependencyTree.cc
+)
+target_link_libraries(test_Http2DependencyTree PRIVATE catch2::catch2 tscore)
+target_include_directories(test_Http2DependencyTree PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/proxy/hdrs
+)
+add_test(NAME test_Http2DependencyTree COMMAND test_Http2DependencyTree)
+
+add_executable(test_Http2FrequencyCounter
+  Http2FrequencyCounter.cc
+  unit_tests/test_Http2FrequencyCounter.cc
+)
+target_link_libraries(test_Http2FrequencyCounter PRIVATE catch2::catch2 tscore inkevent)
+target_include_directories(test_Http2FrequencyCounter PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/proxy/hdrs
+)
+add_test(NAME test_Http2FrequencyCounter COMMAND test_Http2FrequencyCounter)
+
+add_executable(test_HPACK
+  test_HPACK.cc
+  HPACK.cc
+)
+target_link_libraries(test_HPACK PRIVATE tscore hdrs inkevent)
+add_test(NAME test_HPACK
+  COMMAND test_HPACK -i ${CMAKE_CURRENT_SOURCE_DIR}/hpack-tests -o ./results
+)

From d0b6e5d13d533becf98c24c46741fc591fad64aa Mon Sep 17 00:00:00 2001
From: Chris McFarlen <chris@mcfarlen.us>
Date: Tue, 29 Aug 2023 16:39:45 -0500
Subject: [PATCH 3/3] link libswoc

---
 proxy/http2/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxy/http2/CMakeLists.txt b/proxy/http2/CMakeLists.txt
index d6774a83b9f..453e15fa670 100644
--- a/proxy/http2/CMakeLists.txt
+++ b/proxy/http2/CMakeLists.txt
@@ -66,7 +66,7 @@ add_test(NAME test_http2 COMMAND test_http2)
 add_executable(test_Http2DependencyTree
   unit_tests/test_Http2DependencyTree.cc
 )
-target_link_libraries(test_Http2DependencyTree PRIVATE catch2::catch2 tscore)
+target_link_libraries(test_Http2DependencyTree PRIVATE catch2::catch2 tscore libswoc)
 target_include_directories(test_Http2DependencyTree PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/proxy/hdrs
@@ -77,7 +77,7 @@ add_executable(test_Http2FrequencyCounter
   Http2FrequencyCounter.cc
   unit_tests/test_Http2FrequencyCounter.cc
 )
-target_link_libraries(test_Http2FrequencyCounter PRIVATE catch2::catch2 tscore inkevent)
+target_link_libraries(test_Http2FrequencyCounter PRIVATE catch2::catch2 tscore inkevent libswoc)
 target_include_directories(test_Http2FrequencyCounter PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/proxy/hdrs