Dev

.github/copilot-instructions.md

@@ -138,7 +138,7 @@ cd build && ctest --output-on-failure --parallel 4
 
 **Protocol Implementation**:
 - `inc/DoIPMessage.h` - Message parsing/generation (4000+ lines)
-- `inc/DoIPIdentifiers.h` - Protocol constants and types
+- `inc/Vin.h` - Protocol constants and types
 - `inc/DoIP*.h` - Individual message type implementations
 
 **Testing Infrastructure**:

.github/workflows/ci.yml

@@ -89,6 +89,7 @@ jobs:
           -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} \
           -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
           -DWITH_UNIT_TEST=ON \
+          -DWITH_INTEGRATION_TEST=OFF \
           -DWARNINGS_AS_ERRORS=ON
 
     - name: Configure CMake (Windows)
@@ -97,7 +98,7 @@ jobs:
         cmake -B build -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -DWITH_UNIT_TEST=ON -DWARNINGS_AS_ERRORS=OFF
 
     - name: Build
-      run: cmake --build build --config ${{ matrix.config.build_type }} --parallel 4
+      run: cmake --build build --config ${{ matrix.config.build_type }} --parallel 6
 
     - name: Run tests
       working-directory: build
@@ -172,6 +173,7 @@ jobs:
           -DCMAKE_CXX_COMPILER=g++-11 \
           -DCMAKE_BUILD_TYPE=Debug \
           -DWITH_UNIT_TEST=ON \
+          -DWITH_INTEGRATION_TEST=OFF \
           -DENABLE_SANITIZERS=ON \
           -DWARNINGS_AS_ERRORS=ON
 
@@ -260,6 +262,7 @@ jobs:
           -DCMAKE_CXX_COMPILER=g++-11 \
           -DCMAKE_BUILD_TYPE=Debug \
           -DWITH_UNIT_TEST=ON \
+          -DWITH_INTEGRATION_TEST=ON \
           -DCMAKE_CXX_FLAGS="--coverage" \
           -DCMAKE_C_FLAGS="--coverage" \
           -DWARNINGS_AS_ERRORS=OFF
@@ -285,4 +288,5 @@ jobs:
         file: ./coverage.info
         flags: unittests
         name: codecov-umbrella
-        fail_ci_if_error: false
+        fail_ci_if_error: false
+        token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -55,3 +55,6 @@ docs/
 inc/gen/DoIPConfig.h
 *.log
 test/reports/*
+.cache/*
+CMakeCache.txt
+CMakeFiles/cmake.check_cache

CMakeLists.txt

@@ -12,8 +12,8 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # Build options
-option(WITH_UNIT_TEST "Build unit tests" ON)
-option(WITH_INTEGRATION_TEST "Enable integration tests" ON)
+option(WITH_UNIT_TEST "Enable unit tests" ON)
+option(WITH_INTEGRATION_TEST  "Enable integration tests" ON)
 # Enable test coverage reporting
 option(WITH_TEST_COV "Enable test coverage reporting " OFF)
 option(WITH_EXAMPLES "Build examples" ON)
@@ -43,6 +43,11 @@ endif()
 
 include(cmake/projectSettings.cmake)
 
+# Include python virtual environment setup for integration tests
+# if (WITH_INTEGRATION_TEST)
+#     include(cmake/python-venv.cmake)
+# endif()
+
 # Find required packages
 find_package(Threads REQUIRED)
 
@@ -99,6 +104,36 @@ foreach(VAR DOIP_ALIVE_CHECK_RETRIES DOIP_MAXIMUM_MTU)
     endif()
 endforeach()
 
+if (WITH_UNIT_TEST)
+    # Enable testing
+    enable_testing()
+
+    # Find or download doctest
+    find_package(doctest QUIET)
+    if(NOT doctest_FOUND)
+        include(FetchContent)
+        FetchContent_Declare(
+            doctest
+            GIT_REPOSITORY https://github.com/doctest/doctest.git
+            GIT_TAG        v2.4.11
+        )
+        FetchContent_MakeAvailable(doctest)
+    endif()
+
+    # Include doctest CMake module for test discovery
+    include(cmake/doctest.cmake)
+endif()
+
+# Set output directories
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+
+
+# Include libs subdirectory
+add_subdirectory(libs)
+
+
 # Configure configuration header
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/inc/gen/DoIPConfig.h.in
@@ -108,25 +143,18 @@ configure_file(
 
 set(DOIP_SERVER_LIB_NAME doip-server CACHE STRING "DoIP library name")
 
-
 set(SOURCES
-    src/cli/ServerConfigCLI.cpp
     src/DoIPClient.cpp
     src/DoIPConnection.cpp
     src/DoIPDefaultConnection.cpp
     src/DoIPServer.cpp
-    src/Logger.cpp
-    src/MacAddress.cpp
-    src/tp/TcpServerTransport.cpp
-    src/tp/TcpConnectionTransport.cpp
-    src/tp/MockServerTransport.cpp
+    src/cli/ServerConfigCLI.cpp
     src/tp/MockConnectionTransport.cpp
-    src/uds/UdsMock.cpp
-    src/uds/services/UdsSecurityAccess.cpp
-    src/util/Daemonize.cpp
+    src/tp/MockServerTransport.cpp
+    src/tp/TcpConnectionTransport.cpp
+    src/tp/TcpServerTransport.cpp
 )
 
-
 # Create the library
 add_library(${DOIP_SERVER_LIB_NAME}
     ${SOURCES}
@@ -152,6 +180,8 @@ target_include_directories(${DOIP_SERVER_LIB_NAME}
 # Link dependencies
 target_link_libraries(${DOIP_SERVER_LIB_NAME}
     PUBLIC
+        doip::util
+        doip::uds
         spdlog::spdlog_header_only
         CLI11::CLI11
     PRIVATE
@@ -198,10 +228,6 @@ if (WITH_UNIT_TEST)
     add_subdirectory(test)
 endif()
 
-# Set output directories
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 # Install libraries
 install(TARGETS ${DOIP_SERVER_LIB_NAME}