From 954920e488f18b4d184f89628f84abc01f4bba97 Mon Sep 17 00:00:00 2001
From: fmarasco <fmarasco+odspmdb@microsoft.com>
Date: Thu, 22 May 2025 17:30:10 -0400
Subject: [PATCH] updated unitest proj for new sanitizer, updated cmakefile

---
 lib/CMakeLists.txt                |  4 ++++
 lib/modules                       |  2 +-
 tests/functests/CMakeLists.txt    |  6 ++++++
 tests/unittests/CMakeLists.txt    | 12 ++++++++++++
 tests/unittests/UnitTests.vcxproj |  3 ++-
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e9ed262c0..6a8c1e32f 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -112,6 +112,10 @@ endif()
 
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/sanitizer/ AND BUILD_SANITIZER)
   list(APPEND SRCS
+    modules/sanitizer/detectors/EmailAddressDetector.cpp
+    modules/sanitizer/detectors/JwtDetector.cpp
+    modules/sanitizer/detectors/SPOPassword.cpp
+    modules/sanitizer/detectors/UrlDetector.cpp
     modules/sanitizer/Sanitizer.cpp
     modules/sanitizer/SanitizerProvider.cpp
     modules/sanitizer/SanitizerStringUtils.cpp
diff --git a/lib/modules b/lib/modules
index 0daf05cb6..eac5fe38a 160000
--- a/lib/modules
+++ b/lib/modules
@@ -1 +1 @@
-Subproject commit 0daf05cb6d30f6426439b9442371ec355993f603
+Subproject commit eac5fe38a9bd3e54a1b609dc4ffc9b6f3e9336ea
diff --git a/tests/functests/CMakeLists.txt b/tests/functests/CMakeLists.txt
index 2551230c1..656f8f866 100644
--- a/tests/functests/CMakeLists.txt
+++ b/tests/functests/CMakeLists.txt
@@ -15,6 +15,12 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/privacyguard/ AND BUILD_PRIVACYGUA
   )
 endif()
 
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/sanitizer/ AND BUILD_SANITIZER)
+  list(APPEND SRCS
+    SanitizerFuncTests.cpp
+  )
+endif()
+
 if(EXISTS ${CMAKE_SOURCE_DIR}/lib/modules/dataviewer/)
   list(APPEND SRCS
      ${CMAKE_SOURCE_DIR}/lib/modules/dataviewer/tests/functests/DefaultDataViewerFuncTests.cpp
diff --git a/tests/unittests/CMakeLists.txt b/tests/unittests/CMakeLists.txt
index df6e6a0e6..7ec5ccc45 100644
--- a/tests/unittests/CMakeLists.txt
+++ b/tests/unittests/CMakeLists.txt
@@ -78,6 +78,18 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/privacyguard/ AND BUILD_PRIVACYGUA
   )
 endif()
 
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/sanitizer/ AND BUILD_SANITIZER)
+  list(APPEND SRCS
+  ${CMAKE_SOURCE_DIR}/lib/modules/sanitizer/tests/unittests/SanitizerJwtTests.cpp
+  ${CMAKE_SOURCE_DIR}/lib/modules/sanitizer/tests/unittests/SanitizerProviderTests.cpp
+  ${CMAKE_SOURCE_DIR}/lib/modules/sanitizer/tests/unittests/SanitizerSitePathTests.cpp
+  ${CMAKE_SOURCE_DIR}/lib/modules/sanitizer/tests/unittests/SanitizerStringUtilsTests.cpp
+  ${CMAKE_SOURCE_DIR}/lib/modules/sanitizer/tests/unittests/SanitizerUrlTests.cpp
+  ${CMAKE_SOURCE_DIR}/lib/modules/sanitizer/tests/unittests/SanitizerTrieTests.cpp
+  ${CMAKE_SOURCE_DIR}/lib/modules/sanitizer/tests/unittests/SPOPasswordTests.cpp
+  )
+endif()
+
 if(EXISTS ${CMAKE_SOURCE_DIR}/lib/modules/dataviewer/)
   list(APPEND SRCS
      ${CMAKE_SOURCE_DIR}/lib/modules/dataviewer/tests/unittests/DefaultDataViewerTests.cpp
diff --git a/tests/unittests/UnitTests.vcxproj b/tests/unittests/UnitTests.vcxproj
index 76426e9b5..579c52a83 100644
--- a/tests/unittests/UnitTests.vcxproj
+++ b/tests/unittests/UnitTests.vcxproj
@@ -496,9 +496,10 @@
   </ItemGroup>
   <ItemGroup Condition="exists('$(ProjectDir)..\..\lib\modules\sanitizer')">
     <ClInclude Include="$(ProjectDir)..\..\lib\modules\sanitizer\tests\unittests\SanitizerBaseTests.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\lib\modules\sanitizer\tests\unittests\SanitizerEmailTests.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\lib\modules\sanitizer\tests\unittests\SanitizerJwtTests.cpp" />
     <ClCompile Include="$(ProjectDir)..\..\lib\modules\sanitizer\tests\unittests\SanitizerSitePathTests.cpp" />
     <ClCompile Include="$(ProjectDir)..\..\lib\modules\sanitizer\tests\unittests\SanitizerUrlTests.cpp" />
-    <ClCompile Include="$(ProjectDir)..\..\lib\modules\sanitizer\tests\unittests\SanitizerEmailTests.cpp" />
     <ClCompile Include="$(ProjectDir)..\..\lib\modules\sanitizer\tests\unittests\SanitizerProviderTests.cpp" />
     <ClCompile Include="$(ProjectDir)..\..\lib\modules\sanitizer\tests\unittests\SanitizerStringUtilsTests.cpp" />
     <ClCompile Include="$(ProjectDir)..\..\lib\modules\sanitizer\tests\unittests\SanitizerTrieTests.cpp" />