feat: add tests for Strutils::getCNPJNumbers

fix: update regex in Strutils::getCNPJNumbers to keep letters and digits
chore: update CMakeLists.txt to handle test options more flexibly
chore: update CI/CD scripts to use new test option
chore: update security analysis workflow to use new test option

Author: Fabio3rs

.github/workflows/codeql.yml

@@ -52,7 +52,7 @@ jobs:
         cmake .. -G Ninja \
           -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_CXX_FLAGS="-Wall -Wextra -fstack-protector-strong -D_FORTIFY_SOURCE=3" \
-          -DCompileTestsApiFramework=OFF
+          -Dcppapiframework_BUILD_TESTS=OFF
 
     - name: Build Project
       run: |

.github/workflows/security-analysis.yml

@@ -50,7 +50,7 @@ jobs:
           -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_CXX_FLAGS="-Wall -Wextra -fstack-protector-strong -D_FORTIFY_SOURCE=3 -fPIE -Wformat -Wformat-security" \
           -DCMAKE_EXE_LINKER_FLAGS="-pie -Wl,-z,relro,-z,now -Wl,-z,noexecstack" \
-          -DCompileTestsApiFramework=OFF
+          -Dcppapiframework_BUILD_TESTS=OFF
 
     - name: Build Project
       run: |

CMakeLists.txt

@@ -3,6 +3,32 @@ set(projectname cppapiframework)
 cmake_minimum_required(VERSION 3.6.0)
 project(${projectname} VERSION 0.1.0)
 
+if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+    message(STATUS "Configuring ${projectname} as a standalone project")
+    # Quando usado como projeto standalone, ativar testes por padrão
+    set(_DEFAULT_PROJECT_BUILD_TESTS ON)
+else()
+    set(_DEFAULT_PROJECT_BUILD_TESTS OFF)
+endif()
+
+# --- Test options: nova e legada (retrocompatibilidade) --------------------
+# opção legada para compatibilidade com projetos que ainda usam o nome antigo
+option(CompileTestsApiFramework "Legacy: build tests for ${projectname} (deprecated)" OFF)
+
+# opção nomeada pelo projeto, recomendada para controle a partir do CMake superior
+# o valor padrão depende se estamos no topo (standalone) ou como subprojeto
+option(${projectname}_BUILD_TESTS "Build tests for ${projectname}" ${_DEFAULT_PROJECT_BUILD_TESTS})
+
+# Somente inclua CTest se ainda não estiver definido e se alguma opção de teste for requerida
+if(NOT DEFINED BUILD_TESTING)
+    if(CompileTestsApiFramework OR ${${projectname}_BUILD_TESTS})
+        include(CTest)
+    endif()
+else()
+    # BUILD_TESTING já foi definido pelo projeto superior; nada a fazer
+endif()
+
+
 if (NOT DEFINED CPPAPIFRAMEWORK_APPLY_FLAGS)
     message("Applying flags")
     set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -13,14 +39,12 @@ if (NOT DEFINED CPPAPIFRAMEWORK_APPLY_FLAGS)
     set(CMAKE_C_EXTENSIONS ON)
 endif()
 
-option(CompileTestsApiFramework "CompileTestsApiFramework" ON)
-
 set(CPACK_PROJECT_NAME ${PROJECT_NAME})
 set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 if(NOT DEFINED DISABLE_MANUAL_FIND_PACKAGES)
-    if ("${CompileTestsApiFramework}" STREQUAL "ON")
+    if (BUILD_TESTING AND cppapiframework_BUILD_TESTS)
         find_package(GTest REQUIRED)
         include(GoogleTest)
     endif()
@@ -138,7 +162,8 @@ endif()
 
 target_link_libraries(${projectname} ${MYSQLCPPCONN_LIBRARY})
 
-if ("${CompileTestsApiFramework}" STREQUAL "ON")
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests)
+if (BUILD_TESTING AND cppapiframework_BUILD_TESTS)
+    message("-- Compilando testes para ${projectname}")
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests)
 endif()
 

security-scan.sh

@@ -43,7 +43,7 @@ cmake .. -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_CXX_FLAGS="-Wall -Wextra -fstack-protector-strong -D_FORTIFY_SOURCE=3 -fPIE" \
     -DCMAKE_EXE_LINKER_FLAGS="-pie -Wl,-z,relro,-z,now" \
-    -DCompileTestsApiFramework=OFF > ../security-reports/build-config.log 2>&1
+    -Dcppapiframework_BUILD_TESTS=OFF > ../security-reports/build-config.log 2>&1
 
 cmake --build . --config Release --target cppapiframework -j $(nproc) > ../security-reports/build.log 2>&1
 

src/utils/Strutils.hpp

@@ -60,8 +60,7 @@ class Strutils {
     }
 
     static inline auto getCNPJNumbers(const std::string &cnpj) -> std::string {
-        return std::regex_replace(cnpj, std::regex("[^0-9]*"),
-                                  std::string("$1"));
+        return std::regex_replace(cnpj, std::regex("[^A-Za-z0-9]*"), "");
     }
 
     static inline auto join(const std::span<const std::string> &vec,

tests/test_strutils_cnpj.cpp

@@ -0,0 +1,26 @@
+#include "utils/Strutils.hpp"
+#include <gtest/gtest.h>
+
+TEST(StrutilsCNPJ, RemovesPunctuationAndKeepsDigits) {
+    const std::string input = "12.345.678/0001-95";
+    const std::string out = Strutils::getCNPJNumbers(input);
+    EXPECT_EQ(out, "12345678000195");
+}
+
+TEST(StrutilsCNPJ, KeepsLettersAndDigitsForFutureFormat) {
+    const std::string input = "AB12.CD34/EF56-78";
+    const std::string out = Strutils::getCNPJNumbers(input);
+    EXPECT_EQ(out, "AB12CD34EF5678");
+}
+
+TEST(StrutilsCNPJ, RemovesSpacesAndSymbols) {
+    const std::string input = " A B . 1 2 - 3 4 ";
+    const std::string out = Strutils::getCNPJNumbers(input);
+    EXPECT_EQ(out, "AB1234");
+}
+
+TEST(StrutilsCNPJ, EmptyStringReturnsEmpty) {
+    const std::string input;
+    const std::string out = Strutils::getCNPJNumbers(input);
+    EXPECT_EQ(out, "");
+}