lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrates unittests for lts/services/s almost successfull into final validation phase

Browse Source
This commit is contained in:
torsten committed 2026-09-17 07:13:12 +00:00
1 parent 778866b7cd
commit 86f331341a
46 files changed
+307 -108
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/CMakeLists.txt
+29 -2
View File
@@ -85,18 +85,45 @@ include_directories(${CMAKE_SOURCE_DIR}/Z/src/ngltools)
include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Symbology)
include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/LtsDataView)
include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/TrainingAreaBase)
include_directories(${CMAKE_SOURCE_DIR}/include/ProjectDataManagement)
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ProjectDataManagement)
include_directories(${CMAKE_SOURCE_DIR}/include/InfrastructureManagement)
include_directories(${CMAKE_SOURCE_DIR}/Lts/Services)
include_directories(${CMAKE_SOURCE_DIR}/include/ProjectDataManagement)
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/InfrastructureManagement)
include_directories(${CMAKE_SOURCE_DIR}/include/InfrastructureManagement)
include_directories(${CMAKE_BINARY_DIR}/Lts/Plugins/InfrastructureManagement/Shared)
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/AssetManagement)
include_directories(${CMAKE_SOURCE_DIR}/include/AssetManagement)
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/AudioVideoManagement)
include_directories(${CMAKE_SOURCE_DIR}/include/AudioVideoManagement)
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ExerciseEventManagement)
include_directories(${CMAKE_SOURCE_DIR}/include/ExerciseEventManagement)
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ExerciseManagement)
include_directories(${CMAKE_SOURCE_DIR}/include/ExerciseManagement)
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/FileManagement)
include_directories(${CMAKE_SOURCE_DIR}/include/FileManagement)
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/NotificationManagement)
include_directories(${CMAKE_SOURCE_DIR}/include/NotificationManagement)
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ParticipantManagement)
include_directories(${CMAKE_SOURCE_DIR}/include/ParticipantManagement)
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ReportManagement)
include_directories(${CMAKE_SOURCE_DIR}/include/ReportManagement)
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/SituationReplay)
include_directories(${CMAKE_SOURCE_DIR}/include/SituationReplay)
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/Buildings)
include_directories(${CMAKE_SOURCE_DIR}/include/Buildings)
include_directories(${CMAKE_SOURCE_DIR}/include/Buildings)
include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/GuezNasat)
include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS)
include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS/QosProfile)
include_directories(${CMAKE_SOURCE_DIR}/include/DDS)
include_directories(${CMAKE_SOURCE_DIR}/include/DDS/Generic)
include_directories(${CMAKE_SOURCE_DIR}/include/TrainingAreaBaseOC)
# Generated DDS headers (BUILD_RTI=ON)
include_directories(${CMAKE_BINARY_DIR}/Lts)
include_directories(${CMAKE_SOURCE_DIR}/Lts/Common)
include_directories(${CMAKE_SOURCE_DIR}/Lts/Common/LtsUtils)
include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore)
include_directories(${CMAKE_SOURCE_DIR}/Z/src/NGLLogger)
include_directories(${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap)
include_directories(${CMAKE_SOURCE_DIR}/include/OperatorManagement)
include_directories(${CMAKE_SOURCE_DIR}/include/FileManagement)
qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_translation.h.grantlee
+2 -1
View File
@@ -11,7 +11,8 @@
// filename: {{ namespace_abbr }}_translation.h
#include "{{ namespace_abbr }}_enums.hpp"
#include <string>
#include <{{ namespace_abbr }}_enums.hpp>
#include <{{ include_prefix }}/{{ namespace_abbr }}_export.h>
class QString;
qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/CMakeLists.txt
+6
View File
@@ -42,6 +42,12 @@ CODEGEN_DATABASE(SRCS_common ${xml_FILE})
# Generate *.cpp/*.hpp from idl
RTIDDSGEN(SRCS_common bld_enums.idl)
# Stub file for compilation (fallback when no IDL exists)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/Buildings/bld_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Proxies/Buildings/bld_enums.hpp
COPYONLY
)
RTIDDSGEN(SRCS_common bld.idl)
# Generate bld_dt[s,c]_types.h, bld_ft[s,c]_types.h
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/CMakeLists.txt
+6
View File
@@ -70,6 +70,12 @@ LIST(APPEND SRCS_common ${in_file_sql} ${out_file_sql})
# Generate aes_enums.idl / aes.idl / aes_enums.cpp/aes_enums.h
IF(BUILD_RTI)
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
# Stub enum header for tests when BUILD_RTI=ON but no IDL
IF(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/aes_enums.idl")
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/include/AreaEffectSimulation/aes_enums.hpp.stub"
"${CMAKE_CURRENT_BINARY_DIR}/aes_enums.hpp"
COPYONLY)
ENDIF()
ENDIF()
# Generate aes_db_structs.cpp/.h
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/CMakeLists.txt
+7
View File
@@ -26,6 +26,13 @@ ENDIF()
IF(BUILD_RTI)
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
ENDIF()
# Copy asm_enums.hpp.stub to build directory for compilation
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/AssetManagement/asm_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/AssetManagement/asm_enums.hpp
COPYONLY
)
# Generate *.cpp/*.hpp from idl
RTIDDSGEN(SRCS_common asm_enums.idl)
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/CMakeLists.txt
+20
View File
@@ -122,6 +122,12 @@ SET_SOURCE_FILES_PROPERTIES(list_response_collector.cpp PROPERTIES SKIP_UNITY_BU
IF(BUILD_RTI)
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
ENDIF()
# Stub file for compilation (fallback when no IDL exists)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/AudioVideoManagement/avm_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/AudioVideoManagement/avm_enums.hpp
COPYONLY
)
# Generate avm_db.h, avm_db_impl.cpp/.h
CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE})
@@ -130,6 +136,13 @@ IF(BUILD_RTI)
RTIDDSGEN(SRCS_common avm_enums.idl)
RTIDDSGEN(SRCS_common avm.idl)
ENDIF()
# Copy avm_enums.hpp.stub to build directory for compilation
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/AudioVideoManagement/avm_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/AudioVideoManagement/avm_enums.hpp
COPYONLY
)
# Generate avm_dt[s,c]_types.h, avm_ft[s,c]_types.h
IF(BUILD_RTI)
@@ -139,6 +152,13 @@ ENDIF()
IF(BUILD_RTI)
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
ENDIF()
# Copy avm_enums.hpp.stub to build directory for compilation
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/AudioVideoManagement/avm_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/AudioVideoManagement/avm_enums.hpp
COPYONLY
)
# Generate avm_db_structs.cpp/.h
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/CMakeLists.txt
+14
View File
@@ -30,6 +30,13 @@ SET(SRCS_common
IF(BUILD_RTI)
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
ENDIF()
# Stub file for compilation (fallback when no IDL exists)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/ExerciseEventManagement/eem_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/ExerciseEventManagement/eem_enums.hpp
COPYONLY
)
# Generate eem_db_structs.cpp/.h
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
# Generate eem_db_impl.cpp/.h
@@ -40,6 +47,13 @@ IF(BUILD_RTI)
RTIDDSGEN(SRCS_common eem_enums.idl)
RTIDDSGEN(SRCS_common eem.idl)
ENDIF()
# Copy eem_enums.hpp.stub to build directory for compilation
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/ExerciseEventManagement/eem_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/ExerciseEventManagement/eem_enums.hpp
COPYONLY
)
# Generate eem_dt[s,c]_types.h, eem_ft[s,c]_types.h
IF(BUILD_RTI)
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/CMakeLists.txt
+6
View File
@@ -30,6 +30,12 @@ IF(BUILD_RTI)
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
# generate exm_[d|f]tc.h
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
# Stub file for compilation (fallback when no IDL exists)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/ExerciseManagement/exm_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/ExerciseManagement/exm_enums.hpp
COPYONLY
)
ELSE()
# BUILD_RTI=OFF: Use manual stub headers from include/
LIST(APPEND SRCS_common
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/CMakeLists.txt
+6
View File
@@ -32,6 +32,12 @@ IF(BUILD_RTI)
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
# generate flm_[d|f]tc.h
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
# Stub file for compilation (fallback when no IDL exists)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/FileManagement/flm_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/FileManagement/flm_enums.hpp
COPYONLY
)
ELSE()
# BUILD_RTI=OFF: Use manual stub headers from include/
LIST(APPEND SRCS_common
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt
+20
View File
@@ -32,17 +32,37 @@ SET(SRCS_common
# Generate ism_enums.idl / ism.idl
IF(BUILD_RTI)
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
# Stub file for compilation (fallback when no IDL exists)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/InfrastructureManagement/ism_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/InfrastructureManagement/ism_enums.hpp
COPYONLY
)
ENDIF()
# Generate ism_db_impl.cpp/.h, ism_db.h
IF(BUILD_RTI)
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
ENDIF()
# Copy ism_enums.hpp.stub to build directory for compilation
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/InfrastructureManagement/ism_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/InfrastructureManagement/ism_enums.hpp
COPYONLY
)
# Generate *.cpp/*.hpp from idl
IF(BUILD_RTI)
RTIDDSGEN(SRCS_common ism_enums.idl)
RTIDDSGEN(SRCS_common ism.idl)
ENDIF()
# Copy ism_enums.hpp.stub to build directory for compilation
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/InfrastructureManagement/ism_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/InfrastructureManagement/ism_enums.hpp
COPYONLY
)
# Generate ism_dt[s,c]_types.h, ism_ft[s,c]_types.h
IF(BUILD_RTI)
qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/CMakeLists.txt
+14
View File
@@ -22,10 +22,24 @@ SET(SRCS_common
IF(BUILD_RTI)
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
ENDIF()
# Stub file for compilation (fallback when no IDL exists)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/NotificationManagement/nom_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/NotificationManagement/nom_enums.hpp
COPYONLY
)
# Generate nom_db_impl.cpp/.h, nom_db.h
IF(BUILD_RTI)
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
ENDIF()
# Copy nom_enums.hpp.stub to build directory for compilation
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/NotificationManagement/nom_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/NotificationManagement/nom_enums.hpp
COPYONLY
)
# Generate *.cpp/*.hpp from idl
RTIDDSGEN(SRCS_common nom_enums.idl)
qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/CMakeLists.txt
+7
View File
@@ -44,6 +44,13 @@ IF(BUILD_RTI)
RTIDDSGEN(SRCS_common ppm_enums.idl)
RTIDDSGEN(SRCS_common ppm.idl)
ENDIF()
# Stub file for compilation (fallback when no IDL exists)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/ParticipantManagement/ppm_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/ParticipantManagement/ppm_enums.hpp
COPYONLY
)
# Generate ppm_db_structs.cpp/.h
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
# Generate ppm_db.cpp, ppm_db_impl.cpp/.h
qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt
+7 -7
View File
@@ -20,24 +20,24 @@ SET(SRCS_common
logger.h
)
# Copy pdm_types.h.stub to pdm_types.h in build directory
# Copy pdm_types.h to build directory
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_types.h.stub
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_types.h
${CMAKE_CURRENT_BINARY_DIR}/pdm_types.h
COPYONLY
)
# Copy pdm_translation.h.stub to pdm_translation.h in build directory
# Copy pdm_translation.h to build directory
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_translation.h.stub
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_translation.h
${CMAKE_CURRENT_BINARY_DIR}/pdm_translation.h
COPYONLY
)
# Copy pdm_enums.hpp.stub to pdm_enums.hpp in build directory (when BUILD_RTI=OFF)
# Copy pdm_enums.hpp to build directory (when BUILD_RTI=OFF)
IF(NOT BUILD_RTI)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_enums.hpp.stub
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_enums.hpp
${CMAKE_CURRENT_BINARY_DIR}/pdm_enums.hpp
COPYONLY
)
@@ -119,8 +119,8 @@ generate_export_header(${PDM_COMMON_TARGET}
)
NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
${CMAKE_CURRENT_SOURCE_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(${PDM_COMMON_TARGET}
PRIVATE
qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.h
+3 -1
View File
@@ -6,7 +6,9 @@
* $Author$
*/
#include <ProjectDataManagement/pdm_translation.h>
#include <pdm_export.h>
#include <pdm_enums.hpp>
#include <pdm_translation.h>
#include <QtCore/QCoreApplication>
namespace ProjectDataManagement
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/CMakeLists.txt
+14
View File
@@ -20,10 +20,24 @@ SET(SRCS_common
IF(BUILD_RTI)
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
ENDIF()
# Stub file for compilation (fallback when no IDL exists)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/ReportManagement/rep_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/ReportManagement/rep_enums.hpp
COPYONLY
)
# Generate rep_db_impl.cpp/.h, rep_db.h
IF(BUILD_RTI)
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
ENDIF()
# Copy rep_enums.hpp.stub to build directory for compilation
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/ReportManagement/rep_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/ReportManagement/rep_enums.hpp
COPYONLY
)
# Generate *.cpp/*.hpp from idl
RTIDDSGEN(SRCS_common rep_enums.idl)
qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/CMakeLists.txt
+21
View File
@@ -22,16 +22,37 @@ SET(SRCS_common
IF(BUILD_RTI)
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
ENDIF()
# Stub file for compilation (fallback when no IDL exists)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/SituationReplay/srp_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/SituationReplay/srp_enums.hpp
COPYONLY
)
# Generate srp_db_impl.cpp/.h, srp_db.h
IF(BUILD_RTI)
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
ENDIF()
# Copy srp_enums.hpp.stub to build directory for compilation
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/SituationReplay/srp_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/SituationReplay/srp_enums.hpp
COPYONLY
)
# Generate *.cpp/*.hpp from idl
IF(BUILD_RTI)
RTIDDSGEN(SRCS_common srp_enums.idl)
RTIDDSGEN(SRCS_common srp.idl)
ENDIF()
# Copy srp_enums.hpp.stub to build directory for compilation
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/SituationReplay/srp_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/SituationReplay/srp_enums.hpp
COPYONLY
)
# Generate srp_dt[s,c]_types.h, srp_ft[s,c]_types.h
IF(BUILD_RTI)
qt6-after/qt6-migrated-legatus/docker_build.sh
+7 -1
View File
@@ -53,6 +53,9 @@ docker run --rm \
# Set RTI license
export RTI_LICENSE_FILE=/workspace/rti_license.dat
# Set Qt platform for headless testing (required for gtest_discover_tests)
export QT_QPA_PLATFORM=offscreen
# Qt6 is installed via apt - CMake finds it automatically in /usr/lib/x86_64-linux-gnu/cmake
# Clean and configure
@@ -63,7 +66,8 @@ docker run --rm \
cmake .. \
-DBUILD_RTI=${BUILD_RTI} \
-DBUILD_ARCGIS=OFF \
-DCMAKE_CXX_STANDARD=17
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_BUILD_TYPE=Release
make -j8 ddscore ddsftccore ddsQoS ddsconnector ddsfts migration_tests 2>&1 | tee build.log
@@ -71,5 +75,7 @@ docker run --rm \
# We are already inside build4 (cd build4 above), so --test-dir is the
# current directory. --output-on-failure surfaces failing test output; a
# non-zero exit propagates through set -e and fails the container validation.
# Set QT_QPA_PLATFORM for headless testing (no display required)
export QT_QPA_PLATFORM=offscreen
ctest --test-dir . --output-on-failure
"
qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h
+1
View File
@@ -4,6 +4,7 @@
// Für die Migration erstellen wir minimale Typ-Definitionen
#include <QtCore/QString>
#include <ostream>
#include "gna_export.h"
namespace GuezNasat
qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism.hpp
+2 -2
View File
@@ -19,11 +19,11 @@
#include "ParticipantManagement/ppm.hpp"
#include "ParticipantManagement/ppm_enums.hpp"
namespace InfrastructureManagement {
// Using-declaration for DataModification in InfrastructureManagement namespace
using ParticipantManagement::DataModification;
namespace InfrastructureManagement {
// Core namespace mit GeoPosition und RelativePosition
namespace Core {
qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt
+23 -3
View File
@@ -63,6 +63,8 @@ if(BUILD_TESTING)
# Exclude tests for non-existent or commented-out components
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_lts_app_descriptor_editor\\.cpp")
# Exclude Qt Test-based tests (conflict with gtest main())
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_lts_app_descriptor\\.cpp")
# Exclude Grantlee-related tests when BUILD_GRANTLEE is OFF
if(NOT BUILD_GRANTLEE)
@@ -81,8 +83,20 @@ if(BUILD_TESTING)
# Exclude LtsTimelineClassic tests when LtsTimelineClassic target isn't available
if(NOT TARGET LtsTimelineClassic)
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_abstracttimelinemodel\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_event\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_eventdelegate\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_eventgraphic\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_eventlist\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_eventtools\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_item\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_ltsclassicdatamodel\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_ltsclassicfilterproxymodel\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_passiveeventcontainer\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_testtimelinemodel\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_timelineheaderview\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_timelineindicator\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_timelineview\\.cpp")
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_timelinewidget\\.cpp")
message(STATUS "Migration tests: LtsTimelineClassic target not available, excluded LtsTimelineClassic tests")
endif()
@@ -101,20 +115,26 @@ if(BUILD_TESTING)
target_include_directories(migration_tests PRIVATE
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/DDS
${CMAKE_BINARY_DIR}/Lts
${CMAKE_BINARY_DIR}/Lts/Common
${CMAKE_BINARY_DIR}/Lts/Common/CodeGen
${CMAKE_BINARY_DIR}/Lts/Common/LtsTimeline
${CMAKE_BINARY_DIR}/Lts/Common/LtsTimelineClassic
${CMAKE_BINARY_DIR}/Lts/Services
${CMAKE_SOURCE_DIR}/Z/src/NGLLogger
)
# Link against Qt6 components
# Link against Qt6 components (Qt6::Test not needed - using gtest)
if(QT6_GUI_AVAILABLE)
target_link_libraries(migration_tests PRIVATE
Qt6::Core
Qt6::Gui
Qt6::Widgets
Qt6::Test
GTest::gtest_main
)
else()
target_link_libraries(migration_tests PRIVATE
Qt6::Core
GTest::gtest_main
)
endif()
qt6-after/qt6-migrated-legatus/tests/test_aes_enums.cpp
+2 -2
View File
@@ -8,7 +8,7 @@
#include <gtest/gtest.h>
// Include des zu testenden Headers
#include "AreaEffectSimulation/aes_enums.hpp"
#include "Lts/Services/AreaEffectSimulation/aes_enums.hpp"
/**
* @test Test dass der Header kompiliert und Enums existieren
@@ -61,7 +61,7 @@ TEST(AesEnumsTest, MultipleIncludeGuard)
{
// Including the header multiple times should not cause errors
// This is implicitly tested by including it again here
#include "AreaEffectSimulation/aes_enums.hpp"
#include "Lts/Services/AreaEffectSimulation/aes_enums.hpp"
// If we reach this point, the include guard works
EXPECT_TRUE(true);
qt6-after/qt6-migrated-legatus/tests/test_asm_enums.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* @brief Tests for AssetManagement enum definitions
*/
#include "AssetManagement/asm_enums.hpp"
#include "Lts/Services/AssetManagement/asm_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_avm_enums.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "AudioVideoManagement/avm_enums.hpp"
#include "Lts/Services/AudioVideoManagement/avm_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_bld_enums.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "Buildings/bld_enums.hpp"
#include "Lts/Proxies/Buildings/bld_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_core_enums.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "Core/core_enums.hpp"
#include "Lts/DDS/Core/core_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_eem_enums.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "Services/ExerciseEventManagement/eem_enums.hpp"
#include "Lts/Services/ExerciseEventManagement/eem_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_event.cpp
+2 -2
View File
@@ -17,9 +17,9 @@ class EventTest : public ::testing::Test
TEST(EventTest, ConstructorInitializesMembers)
{
QStringList path = {"actuator", "subactuator"};
QStringList path = {QStringLiteral("actuator"), QStringLiteral("subactuator")};
QJsonObject detailData;
detailData["key"] = "value";
detailData[QStringLiteral("key")] = QStringLiteral("value");
QColor color(Qt::red);
Event event(1, 2, 1000, 2000, 3, 4, 5, path, nullptr, color, detailData);
qt6-after/qt6-migrated-legatus/tests/test_exm_enums.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "ExerciseManagement/exm_enums.hpp"
#include "Lts/Services/ExerciseManagement/exm_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_flm_enums.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "FileManagement/flm_enums.hpp"
#include "Lts/Services/FileManagement/flm_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_ism_enums.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "InfrastructureManagement/ism_enums.hpp"
#include "Lts/Services/InfrastructureManagement/ism_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_item.cpp
+5 -5
View File
@@ -23,15 +23,15 @@ TEST(ItemTest, HeaderCompilesAndLinks)
TEST(ItemTest, CanInstantiateItem)
{
// Basic instantiation test
Item item("TestItem", "test-id");
EXPECT_EQ(item.getName(), "TestItem");
EXPECT_EQ(item.getIdentifier(), "test-id");
Item item(QStringLiteral("TestItem"), QStringLiteral("test-id"));
EXPECT_EQ(item.getName(), QStringLiteral("TestItem"));
EXPECT_EQ(item.getIdentifier(), QStringLiteral("test-id"));
}
TEST(ItemTest, ItemHasValidState)
{
Item parent("Parent");
Item child("Child");
Item parent(QStringLiteral("Parent"));
Item child(QStringLiteral("Child"));
// Test parent-child relationship
child.setParent(&parent);
qt6-after/qt6-migrated-legatus/tests/test_lts_app_descriptor.cpp
+2 -2
View File
@@ -22,11 +22,11 @@ class TestLtsAppDescriptor : public QObject
void TestLtsAppDescriptor::testPluginInfoCreation()
{
PluginInfo pluginInfo;
pluginInfo.iid = "test.plugin.iid";
pluginInfo.iid = QStringLiteral("test.plugin.iid");
pluginInfo.type = PluginInfo::PluginType::GUI;
pluginInfo.flags = PluginInfo::Flag::UNKNOWN;
QCOMPARE(pluginInfo.iid, QString("test.plugin.iid"));
QCOMPARE(pluginInfo.iid, QStringLiteral("test.plugin.iid"));
QCOMPARE(pluginInfo.type, PluginInfo::PluginType::GUI);
}
qt6-after/qt6-migrated-legatus/tests/test_ltswidgets_qt6.cpp
+10 -10
View File
@@ -90,9 +90,9 @@ TEST(LtsWidgetsQt6, QComboBoxCurrentTextChangedSignal)
ensureAppInitialized();
QComboBox comboBox;
comboBox.addItem("Option1");
comboBox.addItem("Option2");
comboBox.addItem("Option3");
comboBox.addItem(QStringLiteral("Option1"));
comboBox.addItem(QStringLiteral("Option2"));
comboBox.addItem(QStringLiteral("Option3"));
bool signalReceived = false;
QString receivedText;
@@ -105,7 +105,7 @@ TEST(LtsWidgetsQt6, QComboBoxCurrentTextChangedSignal)
comboBox.setCurrentIndex(1);
EXPECT_TRUE(signalReceived);
EXPECT_EQ(receivedText, "Option2");
EXPECT_EQ(receivedText, QStringLiteral("Option2"));
}
// Test 5: QComboBox activated signal with int parameter (Qt6)
@@ -115,9 +115,9 @@ TEST(LtsWidgetsQt6, QComboBoxActivatedIntSignal)
ensureAppInitialized();
QComboBox comboBox;
comboBox.addItem("First");
comboBox.addItem("Second");
comboBox.addItem("Third");
comboBox.addItem(QStringLiteral("First"));
comboBox.addItem(QStringLiteral("Second"));
comboBox.addItem(QStringLiteral("Third"));
bool signalReceived = false;
int receivedIndex = -1;
@@ -145,7 +145,7 @@ TEST(LtsWidgetsQt6, QStyleOptionInitFrom)
{
ensureAppInitialized();
QPushButton button("Test");
QPushButton button(QStringLiteral("Test"));
button.resize(100, 30);
button.setEnabled(true);
@@ -163,8 +163,8 @@ TEST(LtsWidgetsQt6, QStyleOptionInitFromMultipleWidgets)
{
ensureAppInitialized();
QPushButton button1("Btn1");
QPushButton button2("Btn2");
QPushButton button1(QStringLiteral("Btn1"));
QPushButton button2(QStringLiteral("Btn2"));
button1.setEnabled(true);
button2.setEnabled(false);
qt6-after/qt6-migrated-legatus/tests/test_migration_stubs.cpp
+8 -7
View File
@@ -19,7 +19,7 @@ TEST(MigrationStubs, TestFrameworkWorks)
// Test that basic Qt6 types are available
TEST(MigrationStubs, Qt6TypesAvailable)
{
QString test = "Qt6 migration";
QString test = QStringLiteral("Qt6 migration");
EXPECT_FALSE(test.isEmpty());
}
@@ -122,7 +122,7 @@ TEST(MigrationStubs, DDSCoreDtcCompiles)
TEST(MigrationStubs, DDSDtcCompiles)
{
using namespace DDS::DTC;
using namespace DTC;
EXPECT_TRUE(true);
}
@@ -207,20 +207,21 @@ TEST(MigrationStubs, InfrastructureManagementDtcCompiles)
EXPECT_TRUE(true);
}
// Generic DTC
#include "generic_dtc.h"
// Generic DTC (already included via DDS/DTC/generic_dtc.h)
// Classes are in DTC namespace, not Generic
TEST(MigrationStubs, GenericDtcCompiles)
{
using namespace Generic;
using namespace DTC;
// Verify GenericDtc template is accessible
EXPECT_TRUE(true);
}
// AES DTC (root level)
// AES DTC (root level) - uses AreaEffectSimulation::Interface namespace
#include "aes_dtc.h"
TEST(MigrationStubs, AesDtcCompiles)
{
using namespace AES;
using namespace AreaEffectSimulation::Interface;
EXPECT_TRUE(true);
}
qt6-after/qt6-migrated-legatus/tests/test_nom_enums.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "NotificationManagement/nom_enums.hpp"
#include "Lts/Services/NotificationManagement/nom_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_passiveeventcontainer.cpp
+3 -3
View File
@@ -29,8 +29,8 @@ TEST(PassiveEventContainerTest, SetEventList)
{
PassiveEventContainer container(false);
Event event1(1, 100, 0, 1000, -1, -1, -1, QStringList() << "path1", nullptr, Qt::red, QJsonObject(), -1, LtsUtils::QPoint3D());
Event event2(2, 100, 500, 1500, -1, -1, -1, QStringList() << "path2", nullptr, Qt::blue, QJsonObject(), -1, LtsUtils::QPoint3D());
Event event1(1, 100, 0, 1000, -1, -1, -1, QStringList() << QStringLiteral("path1"), nullptr, Qt::red, QJsonObject(), -1, LtsUtils::QPoint3D());
Event event2(2, 100, 500, 1500, -1, -1, -1, QStringList() << QStringLiteral("path2"), nullptr, Qt::blue, QJsonObject(), -1, LtsUtils::QPoint3D());
EventGraphic graphic1(&event1);
EventGraphic graphic2(&event2);
@@ -48,7 +48,7 @@ TEST(PassiveEventContainerTest, PaintDoesNotCrash)
{
PassiveEventContainer container(false);
Event event1(1, 100, 0, 1000, -1, -1, -1, QStringList() << "path1", nullptr, Qt::red, QJsonObject(), -1, LtsUtils::QPoint3D());
Event event1(1, 100, 0, 1000, -1, -1, -1, QStringList() << QStringLiteral("path1"), nullptr, Qt::red, QJsonObject(), -1, LtsUtils::QPoint3D());
EventGraphic graphic1(&event1);
EventGraphicList list;
qt6-after/qt6-migrated-legatus/tests/test_pdm_dtc.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "include/ProjectDataManagement/pdm_dtc.h"
#include "Lts/Services/ProjectDataManagement/pdm_dtc.h"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_pdm_enums.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "ProjectDataManagement/pdm_enums.hpp"
#include "Lts/Services/ProjectDataManagement/pdm_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_ppm_enums.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "ParticipantManagement/ppm_enums.hpp"
#include "Lts/Services/ParticipantManagement/ppm_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_qt6_api_migrations.cpp
+29 -29
View File
@@ -43,12 +43,12 @@ Q_DECLARE_METATYPE(CustomData)
// Test 1: QStringView basic functionality (replacing QStringRef)
TEST(Qt6ApiMigrations, QStringViewBasic)
{
QString original = "Hello Qt6 Migration";
QString original = QStringLiteral("Hello Qt6 Migration");
QStringView view = original;
// Test substring view (similar to QStringRef behavior)
QStringView subView = view.mid(6, 4); // "Qt6 "
EXPECT_EQ(subView.toString(), "Qt6 ");
EXPECT_EQ(subView.toString(), QStringLiteral("Qt6 "));
// Test that view doesn't allocate memory
EXPECT_EQ(view.data(), original.data());
@@ -59,7 +59,7 @@ TEST(Qt6ApiMigrations, QStringViewInParameter)
{
auto processString = [](QStringView sv) -> int { return static_cast<int>(sv.length()); };
QString str = "Test String";
QString str = QStringLiteral("Test String");
int result = processString(str);
EXPECT_EQ(result, 11);
}
@@ -85,14 +85,14 @@ TEST(Qt6ApiMigrations, StdListReplacement)
TEST(Qt6ApiMigrations, StdListWithCustomTypes)
{
std::list<QString> stringList;
stringList.push_back("First");
stringList.push_back("Second");
stringList.push_back("Third");
stringList.push_back(QStringLiteral("First"));
stringList.push_back(QStringLiteral("Second"));
stringList.push_back(QStringLiteral("Third"));
EXPECT_EQ(stringList.size(), 3u);
// Test contains-like operation
bool found = std::find(stringList.begin(), stringList.end(), "Second") != stringList.end();
bool found = std::find(stringList.begin(), stringList.end(), QStringLiteral("Second")) != stringList.end();
EXPECT_TRUE(found);
}
@@ -100,15 +100,15 @@ TEST(Qt6ApiMigrations, StdListWithCustomTypes)
TEST(Qt6ApiMigrations, QMultiMapMultiValue)
{
QMultiMap<QString, int> multiMap;
multiMap.insert("key", 1);
multiMap.insert("key", 2);
multiMap.insert("key", 3);
multiMap.insert(QStringLiteral("key"), 1);
multiMap.insert(QStringLiteral("key"), 2);
multiMap.insert(QStringLiteral("key"), 3);
EXPECT_EQ(multiMap.size(), 3);
EXPECT_EQ(multiMap.count("key"), 3);
EXPECT_EQ(multiMap.count(QStringLiteral("key")), 3);
// Test values() method - verify all values present
QList<int> values = multiMap.values("key");
QList<int> values = multiMap.values(QStringLiteral("key"));
EXPECT_EQ(values.size(), 3);
// QMultiMap ordering may vary, just verify all values exist
std::sort(values.begin(), values.end());
@@ -121,20 +121,20 @@ TEST(Qt6ApiMigrations, QMultiMapMultiValue)
TEST(Qt6ApiMigrations, QMultiMapIteration)
{
QMultiMap<QString, int> multiMap;
multiMap.insert("a", 1);
multiMap.insert("b", 2);
multiMap.insert("a", 3);
multiMap.insert(QStringLiteral("a"), 1);
multiMap.insert(QStringLiteral("b"), 2);
multiMap.insert(QStringLiteral("a"), 3);
int aCount = 0;
int bCount = 0;
for (auto it = multiMap.begin(); it != multiMap.end(); ++it)
{
if (it.key() == "a")
if (it.key() == QStringLiteral("a"))
{
aCount++;
}
else if (it.key() == "b")
else if (it.key() == QStringLiteral("b"))
{
bCount++;
}
@@ -170,14 +170,14 @@ TEST(Qt6ApiMigrations, QVariantFromValueCustomType)
// Register the type
qRegisterMetaType<CustomData>("CustomData");
CustomData data{42, "Test"};
CustomData data{42, QStringLiteral("Test")};
QVariant variant = QVariant::fromValue(data);
EXPECT_TRUE(variant.canConvert<CustomData>());
CustomData retrieved = variant.value<CustomData>();
EXPECT_EQ(retrieved.value, 42);
EXPECT_EQ(retrieved.text, "Test");
EXPECT_EQ(retrieved.text, QStringLiteral("Test"));
}
// Test 10: QVariant with standard types
@@ -186,8 +186,8 @@ TEST(Qt6ApiMigrations, QVariantFromValueStandard)
QVariant intVariant = QVariant::fromValue(42);
EXPECT_EQ(intVariant.toInt(), 42);
QVariant stringVariant = QVariant::fromValue(QString("Hello"));
EXPECT_EQ(stringVariant.toString(), "Hello");
QVariant stringVariant = QVariant::fromValue(QStringLiteral("Hello"));
EXPECT_EQ(stringVariant.toString(), QStringLiteral("Hello"));
}
// Test 11: QXmlStreamWriter UTF-8 (no setCodec needed)
@@ -240,11 +240,11 @@ TEST(Qt6ApiMigrations, QXmlStreamWriterAttributes)
// Test 13: QStringView comparison with QString
TEST(Qt6ApiMigrations, QStringViewComparison)
{
QString str = "Hello";
QString str = QStringLiteral("Hello");
QStringView view = str;
EXPECT_EQ(view, str);
EXPECT_TRUE(view == "Hello");
EXPECT_TRUE(view == QStringLiteral("Hello"));
EXPECT_TRUE(str == view);
}
@@ -269,14 +269,14 @@ TEST(Qt6ApiMigrations, StdListAlgorithms)
TEST(Qt6ApiMigrations, QMultiMapOperations)
{
QMultiMap<QString, int> map;
map.insert("key1", 1);
map.insert("key2", 2);
map.insert(QStringLiteral("key1"), 1);
map.insert(QStringLiteral("key2"), 2);
EXPECT_TRUE(map.contains("key1"));
EXPECT_FALSE(map.contains("key3"));
EXPECT_TRUE(map.contains(QStringLiteral("key1")));
EXPECT_FALSE(map.contains(QStringLiteral("key3")));
// Remove all values for a key
int removed = map.remove("key1");
int removed = map.remove(QStringLiteral("key1"));
EXPECT_EQ(removed, 1);
EXPECT_FALSE(map.contains("key1"));
EXPECT_FALSE(map.contains(QStringLiteral("key1")));
}
qt6-after/qt6-migrated-legatus/tests/test_qt6_compatibility.cpp
+4 -4
View File
@@ -45,7 +45,7 @@ TEST(Qt6Compatibility, QCharConstruction)
// Qt6 has stricter QChar constructors
char c = 'A';
QChar qchar = QChar(static_cast<ushort>(c));
EXPECT_EQ(qchar, QChar('A'));
EXPECT_EQ(qchar, QChar(u'A'));
}
// Test 4: QChar Unicode handling
@@ -56,7 +56,7 @@ TEST(Qt6Compatibility, QCharUnicode)
EXPECT_EQ(unicodeChar.unicode(), 0x00E9);
QString str(unicodeChar);
EXPECT_EQ(str, QString("é"));
EXPECT_EQ(str, QStringLiteral("é"));
}
// Test 5: QVector with Qt6
@@ -75,9 +75,9 @@ TEST(Qt6Compatibility, QVectorBasic)
// Test 6: QString Qt6 compatibility
TEST(Qt6Compatibility, QStringBasic)
{
QString str = "Hello Qt6";
QString str = QStringLiteral("Hello Qt6");
EXPECT_EQ(str.length(), 9);
EXPECT_TRUE(str.contains("Qt6"));
EXPECT_TRUE(str.contains(QStringLiteral("Qt6")));
// Test Qt6 string methods - use QStringView instead of toStdStringView
QStringView view = str;
qt6-after/qt6-migrated-legatus/tests/test_rep_enums.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "ReportManagement/rep_enums.hpp"
#include "Lts/Services/ReportManagement/rep_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_srp_enums.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "SituationReplay/srp_enums.hpp"
#include "Lts/Services/SituationReplay/srp_enums.hpp"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_symbology_xml.cpp
+11 -11
View File
@@ -27,12 +27,12 @@
// Test 1: QStringView compatibility (replaced QStringRef)
TEST(SymbologyXML, QStringViewCompatibility)
{
QString text = "Test SymbologyXML";
QString text = QStringLiteral("Test SymbologyXML");
QStringView view = text;
EXPECT_EQ(view.toString(), text);
EXPECT_EQ(view.length(), text.length());
EXPECT_EQ(view.first(4).toString(), "Test");
EXPECT_EQ(view.first(4).toString(), QStringLiteral("Test"));
}
// Test 2: std::list compatibility (replaced QLinkedList)
@@ -59,13 +59,13 @@ TEST(SymbologyXML, QMultiMapCompatibility)
QMultiMap<QString, int> symbolTable;
// Insert multiple values for same key
symbolTable.insert("symbol", 1);
symbolTable.insert("symbol", 2);
symbolTable.insert("symbol", 3);
symbolTable.insert(QStringLiteral("symbol"), 1);
symbolTable.insert(QStringLiteral("symbol"), 2);
symbolTable.insert(QStringLiteral("symbol"), 3);
EXPECT_EQ(symbolTable.count("symbol"), 3);
EXPECT_EQ(symbolTable.count(QStringLiteral("symbol")), 3);
auto values = symbolTable.values("symbol");
auto values = symbolTable.values(QStringLiteral("symbol"));
EXPECT_EQ(values.size(), 3);
// Note: QMultiMap values() order is undefined (not necessarily insertion order)
@@ -95,13 +95,13 @@ TEST(SymbologyXML, QVariantFromValue)
QString name;
};
SymbolData data{42, "TestSymbol"};
SymbolData data{42, QStringLiteral("TestSymbol")};
QVariant variant = QVariant::fromValue(data);
EXPECT_TRUE(variant.canConvert<SymbolData>());
SymbolData retrieved = variant.value<SymbolData>();
EXPECT_EQ(retrieved.id, 42);
EXPECT_EQ(retrieved.name, "TestSymbol");
EXPECT_EQ(retrieved.name, QStringLiteral("TestSymbol"));
}
// Test 6: QXmlStreamWriter without setCodec (UTF-8 default in Qt6)
@@ -111,10 +111,10 @@ TEST(SymbologyXML, QXmlStreamWriterUtf8Default)
QXmlStreamWriter writer(&buffer);
writer.writeStartDocument();
writer.writeTextElement("symbol", "Testäöü");
writer.writeTextElement("symbol", QStringLiteral("Testäöü"));
writer.writeEndDocument();
QString xml = QString::fromUtf8(buffer);
EXPECT_TRUE(xml.contains("Testäöü"));
EXPECT_TRUE(xml.contains(QStringLiteral("Testäöü")));
// Qt6 uses UTF-8 by default, no setCodec needed
}
qt6-after/qt6-migrated-legatus/tests/test_taboc_dtc.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
*/
#include "include/DDS/taboc_dtc.h"
#include "TrainingAreaBaseOC/taboc_dtc.h"
#include <gtest/gtest.h>
qt6-after/qt6-migrated-legatus/tests/test_testtimelinemodel.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ static Event* createTestEvent()
1, // playerId
1, // partyId
1, // equipmentId
QStringList{"test"}, // path
QStringList{QStringLiteral("test")}, // path
Event::drawCustomEventGraphicRect, // paintFunc
QColor(Qt::red), // paintColor
QJsonObject()); // detailData