Azure · AndreRicardo-Zoetis · Jan 8, 2025 · Jan 9, 2025
diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh
@@ -53,7 +53,8 @@ install_azure_storage_sdk=false
 # ADUC Test Deps
 
 install_catch2=false
-default_catch2_ref=v2.x
+#default_catch2_ref=v2.x
+default_catch2_ref=v3.8.0
 catch2_ref=$default_catch2_ref
 install_swupdate=false
 default_swupdate_ref=2021.11

diff --git a/src/diagnostics_component/utils/config_utils/tests/CMakeLists.txt b/src/diagnostics_component/utils/config_utils/tests/CMakeLists.txt
@@ -15,7 +15,7 @@ add_executable (${PROJECT_NAME} ${sources})
 target_compile_definitions (${PROJECT_NAME} PRIVATE ADUC_LOG_FOLDER="${ADUC_LOG_FOLDER}")
 
 target_link_libraries (${PROJECT_NAME} PRIVATE diagnostic_utils::diagnostics_config_utils
-                                               Catch2::Catch2 Parson::parson)
+                                               Catch2::Catch2WithMain Parson::parson)
 
 target_link_aziotsharedutil (${PROJECT_NAME} PRIVATE)
 

diff --git a/src/diagnostics_component/utils/config_utils/tests/diagnostics_config_utils_ut.cpp b/src/diagnostics_component/utils/config_utils/tests/diagnostics_config_utils_ut.cpp
@@ -10,7 +10,7 @@
 
 #include <azure_c_shared_utility/strings.h>
 #include <azure_c_shared_utility/vector.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <iostream>
 #include <parson.h>
 #include <sstream>

diff --git a/src/diagnostics_component/utils/config_utils/tests/main.cpp b/src/diagnostics_component/utils/config_utils/tests/main.cpp
@@ -6,4 +6,4 @@
  * Licensed under the MIT License.
  */
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
diff --git a/src/diagnostics_component/utils/file_info_utils/tests/CMakeLists.txt b/src/diagnostics_component/utils/file_info_utils/tests/CMakeLists.txt
@@ -22,7 +22,7 @@ endif ()
 
 target_link_libraries (
     ${PROJECT_NAME} PRIVATE aduc::jws_utils aduc::crypto_utils aduc::string_utils
-                            diagnostic_utils::file_info_utils Catch2::Catch2)
+                            diagnostic_utils::file_info_utils Catch2::Catch2WithMain)
 
 include (CTest)
 include (Catch)

diff --git a/src/diagnostics_component/utils/file_info_utils/tests/file_info_utils_ut.cpp b/src/diagnostics_component/utils/file_info_utils/tests/file_info_utils_ut.cpp
@@ -9,7 +9,7 @@
 
 #include <aduc/c_utils.h>
 #include <aduc/calloc_wrapper.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <ctime>
 #include <time.h>
 #include <umock_c/umock_c.h>

diff --git a/src/diagnostics_component/utils/file_info_utils/tests/main.cpp b/src/diagnostics_component/utils/file_info_utils/tests/main.cpp
@@ -6,4 +6,4 @@
  * Licensed under the MIT License.
  */
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
diff --git a/...dlers/plugin_examples/microsoft_delta_download_handler/handler/utils/tests/CMakeLists.txt b/...dlers/plugin_examples/microsoft_delta_download_handler/handler/utils/tests/CMakeLists.txt
@@ -9,15 +9,15 @@ find_package (Catch2 REQUIRED)
 
 add_executable (${PROJECT_NAME} "")
 
-target_sources (${PROJECT_NAME} PRIVATE main.cpp microsoft_delta_download_handler_utils_ut.cpp)
+target_sources (${PROJECT_NAME} PRIVATE microsoft_delta_download_handler_utils_ut.cpp)
 
 target_link_libraries (
     ${PROJECT_NAME}
     PRIVATE aduc::adu_types
             aduc::microsoft_delta_download_handler_utils
             aduc::parser_utils
             aduc::workflow_utils
-            Catch2::Catch2)
+            Catch2::Catch2WithMain)
 
 include (CTest)
 include (Catch)

diff --git a/...ad_handlers/plugin_examples/microsoft_delta_download_handler/handler/utils/tests/main.cpp b/...ad_handlers/plugin_examples/microsoft_delta_download_handler/handler/utils/tests/main.cpp
diff --git a/..._delta_download_handler/handler/utils/tests/microsoft_delta_download_handler_utils_ut.cpp b/..._delta_download_handler/handler/utils/tests/microsoft_delta_download_handler_utils_ut.cpp
@@ -7,7 +7,7 @@
  * Licensed under the MIT License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 using Catch::Matchers::Equals;
 
 #include "aduc/microsoft_delta_download_handler_utils.h"

diff --git a/...plugin_examples/microsoft_delta_download_handler/source_update_cache/tests/CMakeLists.txt b/...plugin_examples/microsoft_delta_download_handler/source_update_cache/tests/CMakeLists.txt
@@ -12,7 +12,7 @@ add_executable (${PROJECT_NAME} "")
 
 target_include_directories (${PROJECT_NAME} PRIVATE inc ${ADUC_EXPORT_INCLUDES})
 
-target_sources (${PROJECT_NAME} PRIVATE main.cpp source_update_cache_utils_ut.cpp)
+target_sources (${PROJECT_NAME} PRIVATE source_update_cache_utils_ut.cpp)
 
 target_link_libraries (
     ${PROJECT_NAME}
@@ -21,7 +21,7 @@ target_link_libraries (
             aduc::test_utils
             aduc::system_utils
             aduc::workflow_utils
-            Catch2::Catch2
+            Catch2::Catch2WithMain
             Parson::parson)
 
 target_link_libraries (${PROJECT_NAME} PRIVATE libaducpal)

diff --git a/...dlers/plugin_examples/microsoft_delta_download_handler/source_update_cache/tests/main.cpp b/...dlers/plugin_examples/microsoft_delta_download_handler/source_update_cache/tests/main.cpp
diff --git a/...crosoft_delta_download_handler/source_update_cache/tests/source_update_cache_utils_ut.cpp b/...crosoft_delta_download_handler/source_update_cache/tests/source_update_cache_utils_ut.cpp
@@ -8,7 +8,7 @@
 
 #include "aduc/source_update_cache_utils.h"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 using Catch::Matchers::Equals;
 #include <aduc/aduc_inode.h> // ADUC_INODE_SENTINEL_VALUE
 #include <aduc/auto_dir.hpp> // aduc::AutoDir

diff --git a/src/extensions/extension_manager/tests/CMakeLists.txt b/src/extensions/extension_manager/tests/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package (Parson REQUIRED)
 
 add_executable (${target_name})
 
-target_sources (${target_name} PRIVATE src/main.cpp src/extension_manager_ut.cpp
+target_sources (${target_name} PRIVATE src/extension_manager_ut.cpp
                                        src/extension_manager_download_test_case.cpp)
 
 target_include_directories (${target_name} PUBLIC inc ${ADUC_EXPORT_INCLUDES}
@@ -24,7 +24,7 @@ target_link_libraries (
             aduc::system_utils
             aduc::test_utils
             aduc::workflow_utils
-            Catch2::Catch2
+            Catch2::Catch2WithMain
             Parson::parson)
 
 # Windows needs all EXEs to have links to all potential libraries so this is included here

diff --git a/src/extensions/extension_manager/tests/src/extension_manager_download_test_case.cpp b/src/extensions/extension_manager/tests/src/extension_manager_download_test_case.cpp
@@ -18,7 +18,7 @@
 #include <aduc/workflow_utils.h>
 #include <aducpal/stdio.h> // remove
 #include <aducpal/unistd.h> // UNREFERENCED_PARAMETER
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <fstream>
 #include <memory>
 #include <parson.h>

diff --git a/src/extensions/extension_manager/tests/src/extension_manager_ut.cpp b/src/extensions/extension_manager/tests/src/extension_manager_ut.cpp
@@ -6,7 +6,7 @@
  * Licensed under the MIT License.
  */
 #include <aduc/result.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <extension_manager_download_test_case.hpp>
 
 bool operator==(ADUC_Result a, ADUC_Result b)

diff --git a/src/extensions/extension_manager/tests/src/main.cpp b/src/extensions/extension_manager/tests/src/main.cpp
diff --git a/src/extensions/step_handlers/apt_handler/tests/CMakeLists.txt b/src/extensions/step_handlers/apt_handler/tests/CMakeLists.txt
@@ -11,7 +11,7 @@ include (agentRules)
 compileasc99 ()
 disablertti ()
 
-set (sources main.cpp apt_parser_ut.cpp ../src/apt_handler.cpp ../src/apt_parser.cpp)
+set (sources apt_parser_ut.cpp ../src/apt_handler.cpp ../src/apt_parser.cpp)
 
 find_package (Catch2 REQUIRED)
 
@@ -41,7 +41,7 @@ target_link_libraries (
             aduc::system_utils
             aduc::workflow_data_utils
             aduc::workflow_utils
-            Catch2::Catch2)
+            Catch2::Catch2WithMain)
 
 target_link_libraries (${PROJECT_NAME} PRIVATE libaducpal)
 

diff --git a/src/extensions/step_handlers/apt_handler/tests/apt_parser_ut.cpp b/src/extensions/step_handlers/apt_handler/tests/apt_parser_ut.cpp
@@ -8,7 +8,7 @@
 
 #include "aduc/apt_parser.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 using Catch::Matchers::Equals;
 
 #include <sstream>

diff --git a/src/extensions/step_handlers/apt_handler/tests/main.cpp b/src/extensions/step_handlers/apt_handler/tests/main.cpp
@@ -7,4 +7,4 @@
  */
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
diff --git a/src/extensions/step_handlers/script_handler/tests/CMakeLists.txt b/src/extensions/step_handlers/script_handler/tests/CMakeLists.txt
@@ -7,7 +7,7 @@ include (agentRules)
 compileasc99 ()
 disablertti ()
 
-set (sources main.cpp script_handler_ut.cpp ../src/script_handler.cpp
+set (sources script_handler_ut.cpp ../src/script_handler.cpp
              ../../../update_manifest_handlers/steps_handler/src/steps_handler.cpp)
 
 add_executable (${PROJECT_NAME} ${sources})
@@ -45,7 +45,7 @@ target_link_libraries (
             aduc::system_utils
             aduc::workflow_data_utils
             aduc::workflow_utils
-            Catch2::Catch2)
+            Catch2::Catch2WithMain)
 
 target_link_libraries (${PROJECT_NAME} PRIVATE libaducpal)
 

diff --git a/src/extensions/step_handlers/script_handler/tests/main.cpp b/src/extensions/step_handlers/script_handler/tests/main.cpp
diff --git a/src/extensions/step_handlers/script_handler/tests/script_handler_ut.cpp b/src/extensions/step_handlers/script_handler/tests/script_handler_ut.cpp
@@ -14,7 +14,7 @@
 #include "aduc/workflow_utils.h"
 #include "aducpal/stdlib.h" // setenv
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 using Catch::Matchers::Equals;
 
 #include <sstream>

diff --git a/src/extensions/step_handlers/simulator_handler/tests/CMakeLists.txt b/src/extensions/step_handlers/simulator_handler/tests/CMakeLists.txt
@@ -7,7 +7,7 @@ include (agentRules)
 compileasc99 ()
 disablertti ()
 
-set (sources main.cpp simulator_handler_unit_tests.cpp ../src/simulator_handler.cpp)
+set (sources simulator_handler_unit_tests.cpp ../src/simulator_handler.cpp)
 
 find_package (Catch2 REQUIRED)
 find_package (IotHubClient REQUIRED)
@@ -33,7 +33,8 @@ target_link_libraries (
             aduc::system_utils
             aduc::workflow_data_utils
             aduc::workflow_utils
-            Parson::parson)
+            Parson::parson
+            Catch2::Catch2WithMain)
 
 # Windows needs all EXEs to have links to all potential libraries so this is included here
 if (WIN32)

diff --git a/src/extensions/step_handlers/simulator_handler/tests/main.cpp b/src/extensions/step_handlers/simulator_handler/tests/main.cpp
diff --git a/src/extensions/step_handlers/simulator_handler/tests/simulator_handler_unit_tests.cpp b/src/extensions/step_handlers/simulator_handler/tests/simulator_handler_unit_tests.cpp
@@ -9,7 +9,7 @@
 #include "aduc/simulator_handler.hpp"
 #include "aduc/workflow_utils.h"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 using Catch::Matchers::Equals;
 
 #include <fstream>

diff --git a/src/extensions/step_handlers/swupdate_handler_v2/tests/CMakeLists.txt b/src/extensions/step_handlers/swupdate_handler_v2/tests/CMakeLists.txt
@@ -8,7 +8,7 @@ compileasc99 ()
 disablertti ()
 
 set (sources
-     main.cpp swupdate_handler_v2_ut.cpp ../src/handler_create.cpp ../src/swupdate_handler_v2.cpp
+     swupdate_handler_v2_ut.cpp ../src/handler_create.cpp ../src/swupdate_handler_v2.cpp
      ../../../update_manifest_handlers/steps_handler/src/steps_handler.cpp)
 
 find_package (Catch2 REQUIRED)
@@ -43,7 +43,7 @@ target_link_libraries (
             aduc::system_utils
             aduc::workflow_data_utils
             aduc::workflow_utils
-            Catch2::Catch2)
+            Catch2::Catch2WithMain)
 
 target_link_libraries (${PROJECT_NAME} PRIVATE libaducpal)
 

diff --git a/src/extensions/step_handlers/swupdate_handler_v2/tests/main.cpp b/src/extensions/step_handlers/swupdate_handler_v2/tests/main.cpp
@@ -7,4 +7,4 @@
  */
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
diff --git a/src/extensions/step_handlers/swupdate_handler_v2/tests/swupdate_handler_v2_ut.cpp b/src/extensions/step_handlers/swupdate_handler_v2/tests/swupdate_handler_v2_ut.cpp
@@ -13,7 +13,7 @@
 #include "aduc/system_utils.h"
 #include "aduc/workflow_utils.h"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 using Catch::Matchers::Equals;
 
 #include <sstream>
@@ -418,7 +418,7 @@ TEST_CASE("SWUpdate sample script --action-download")
     ADUC_ConfigInfo_ReleaseInstance(config);
 }
 
-TEST_CASE("SWUpdate sample script --action-install", "[!hide][functional_test]")
+TEST_CASE("SWUpdate sample script --action-install", "[.][functional_test]")
 {
     set_test_config_folder();
     const ADUC_ConfigInfo* config = ADUC_ConfigInfo_GetInstance();

diff --git a/src/platform_layers/linux_platform_layer/tests/CMakeLists.txt b/src/platform_layers/linux_platform_layer/tests/CMakeLists.txt
@@ -7,7 +7,7 @@ include (agentRules)
 compileasc99 ()
 disablertti ()
 
-set (sources main.cpp download_ut.cpp mock_do_download.cpp)
+set (sources download_ut.cpp mock_do_download.cpp)
 
 add_executable (${PROJECT_NAME} ${sources})
 
@@ -33,7 +33,7 @@ target_link_libraries (
             aduc::exception_utils
             aduc::c_utils
             atomic
-            Catch2::Catch2
+            Catch2::Catch2WithMain
             libaducpal)
 
 include (CTest)

diff --git a/src/platform_layers/linux_platform_layer/tests/download_ut.cpp b/src/platform_layers/linux_platform_layer/tests/download_ut.cpp
@@ -5,7 +5,7 @@
  * @copyright Copyright (c) Microsoft Corporation.
  * Licensed under the MIT License.
  */
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <cstring>
 #include <pthread.h>
 

diff --git a/src/platform_layers/linux_platform_layer/tests/main.cpp b/src/platform_layers/linux_platform_layer/tests/main.cpp
diff --git a/src/rootkey_workflow/tests/CMakeLists.txt b/src/rootkey_workflow/tests/CMakeLists.txt
@@ -7,11 +7,11 @@ disablertti ()
 find_package (Catch2 REQUIRED)
 
 add_executable (${target_name})
-target_sources (${target_name} PRIVATE main.cpp rootkey_workflow_ut.cpp)
+target_sources (${target_name} PRIVATE rootkey_workflow_ut.cpp)
 
 target_link_libraries (
     ${target_name}
-    PRIVATE Catch2::Catch2
+    PRIVATE Catch2::Catch2WithMain
             aduc::c_utils
             aduc::rootkey_workflow
             aduc::root_key_utils)

diff --git a/src/rootkey_workflow/tests/rootkey_workflow_ut.cpp b/src/rootkey_workflow/tests/rootkey_workflow_ut.cpp
@@ -9,7 +9,7 @@
 #include "aduc/rootkey_workflow.h" // RootKeyWorkflow_UpdateRootKeys
 #include <aduc/c_utils.h>
 #include <aduc/result.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <root_key_util.h> // RootKeyUtility_GetReportingErc
 
 using Catch::Matchers::Equals;