Feature/naming service tests

.github/workflows/cmake-multi-platform.yml

@@ -104,6 +104,12 @@ jobs:
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
       run: ctest --build-config ${{ matrix.build_type }}
 
+    - uses: actions/upload-artifact@v4
+      if: (success() || failure()) && matrix.os == 'ubuntu-22.04'
+      with:
+        name: test-results
+        path: "${{ steps.strings.outputs.build-output-dir }}/**/reports/junit-*.xml"
+
     - name: Package
       run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} --target package
 

.github/workflows/test-report.yml

@@ -0,0 +1,20 @@
+name: "Test Report"
+on:
+  workflow_run:
+    workflows: ["CMake on multiple platforms"]
+    types:
+      - completed
+permissions:
+  contents: read
+  actions: read
+  checks: write
+jobs:
+  report:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dorny/test-reporter@v1
+        with:
+          artifact: test-results
+          name: GTests
+          path: '**/*.xml'
+          reporter: java-junit

.gitignore

@@ -160,11 +160,11 @@ snowballs/build/*
 ryzom/build/*
 build/*
 build-2010/*
-build/*
 install/*
 build_*
 install_*
 nel/tools/build_gamedata/configuration/buildsite.py
+cmake-build-*
 
 # Linux nel compile
 nel/build/nel-config

CMakeLists.txt

@@ -323,6 +323,17 @@ ENDIF()
 IF(WITH_NEL)
   IF(WITH_NEL_TESTS)
     FIND_PACKAGE(CppTest)
+
+    ENABLE_TESTING()
+    INCLUDE(FetchContent)
+    FetchContent_Declare(
+            googletest
+            URL https://github.com/google/googletest/archive/a7f443b80b105f940225332ed3c31f2790092f47.zip
+            EXCLUDE_FROM_ALL
+    )
+    SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+    FetchContent_MakeAvailable(googletest)
+    INCLUDE(GoogleTest)
   ENDIF()
 
   IF(HUNTER_ENABLED)

nel/src/net/service.cpp

@@ -375,6 +375,9 @@ IService::IService() :
 
 IService::~IService()
 {
+	// Singleton
+	_Instance = nullptr;
+
 	// unregister the singleton
 	INelContext::getInstance().releaseSingletonPointer("IService", this);
 }

nelns/naming_service/CMakeLists.txt

@@ -1,13 +1,31 @@
-FILE(GLOB SRC *.cpp *.h)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_EXECUTABLE(naming_service WIN32 ${SRC})
+add_library(nelns_naming_service STATIC
+        nelns/naming_service/functions.cpp
+        nelns/naming_service/naming_service.cpp
+        nelns/naming_service/service_instance_manager.cpp
+        nelns/naming_service/variables.cpp
+)
+add_library(nelns::ns ALIAS nelns_naming_service)
+target_link_libraries(nelns_naming_service
+        nelmisc
+        nelnet
+)
+
+ADD_EXECUTABLE(naming_service WIN32
+        naming_service.cpp
+)
 
 TARGET_LINK_LIBRARIES(naming_service
-						nelmisc
-						nelnet)
+        nelns::ns
+)
 
 NL_DEFAULT_PROPS(naming_service "NeLNS, Services: Naming Service")
 NL_ADD_RUNTIME_FLAGS(naming_service)
 
 INSTALL(TARGETS naming_service RUNTIME DESTINATION sbin COMPONENT ns)
 INSTALL(FILES naming_service.cfg common.cfg DESTINATION ${NL_ETC_PREFIX}/nelns COMPONENT ns)
+
+IF (WITH_NEL_TESTS)
+    ADD_SUBDIRECTORY(tests)
+ENDIF ()