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

Updates flm module tests for generated rtiddsgen API

Browse Source
This commit is contained in:
berrux-dev committed 2026-09-18 17:47:34 +02:00
1 parent b96dec41e4
commit bd3cccbc15
2 files changed
+121 -121
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp
+116 -116
View File
@@ -25,9 +25,9 @@
#include <LtsUtilsCore/pgarray.h>
#include <LtsUtilsCore/dds_vector.h>
#include <Lts/Services/FileManagement/flm_ftc.h>
#include <include/FileManagement/flm_dtc.h>
#include <Lts/Services/FileManagement/settings.h>
#include <FileManagement/flm_ftc.h>
#include <FileManagement/flm_dtc.h>
#include <FileManagement/settings.h>
/* ----------------------------------------------------------------------------------
* HOW TO RUN THE TESTS (for example)
@@ -217,9 +217,9 @@ void FlmTests::tryModifyFolder()
const FileManagement::Folder &fld = m_dtc->folder(m_folderId);
FileManagement::FolderModifyRequest data;
DEBUG_LOG(m_logger) << "fld.id() = " << fld.id();
DEBUG_LOG(m_logger) << "fld.id() = " << fld.id;
if (fld.id() == 0)
if (fld.id == 0)
{
ERROR_LOG(m_logger) << "Cannot find Folder Id = " << m_folderId;
failExit();
@@ -227,16 +227,16 @@ void FlmTests::tryModifyFolder()
else
{
m_folderId = 0;
data.id(fld.id());
data.name(fld.name());
data.path(fld.path());
data.isEditable(fld.isEditable());
data.isHidden(fld.isHidden());
data.parentId(fld.parentId());
data.operatorId(m_operatorId);
data.id = fld.id;
data.name = fld.name;
data.path = fld.path;
data.isEditable = fld.isEditable;
data.isHidden = fld.isHidden;
data.parentId = fld.parentId;
data.operatorId = m_operatorId;
// changing only name
data.name("Folder-Updated");
data.name = "Folder-Updated";
if (!m_ftc->folderModifyRequest(FolderModifyRequest(data), this))
{
@@ -266,15 +266,15 @@ void FlmTests::tryRemoveFolder()
int FlmTests::createFolder(int parentFolderId, const QString &folderName, bool isHidden)
{
FileManagement::Folder parentFolder = m_dtc->folder(parentFolderId);
const std::vector<int32_t> &parentPath = parentFolder.path();
const std::vector<int32_t> &parentPath = parentFolder.path;
FileManagement::FolderModifyRequest req;
req.name(folderName.toStdString());
req.path(parentPath);
req.isEditable(false);
req.isHidden(isHidden);
req.parentId(parentFolderId);
req.operatorId(m_operatorId);
req.name = folderName.toStdString();
req.path = parentPath;
req.isEditable = false;
req.isHidden = isHidden;
req.parentId = parentFolderId;
req.operatorId = m_operatorId;
if (!m_ftc->folderModifyRequest(req, this))
{
@@ -295,20 +295,20 @@ void FlmTests::tryCreateFileContent()
FileContentModifyRequest data;
data.name("Test Document");
data.isTemplate(false);
data.isUsedBy(false);
data.usedBy(0);
data.folderId(m_folderId);
data.fileStatus(FileManagement::FileStatus::Valid);
data.fileCategory(FileManagement::FileCategory::User); // user docs
data.fileType(FileManagement::FileType::MSOfficeDocument); // doc
data.operatorId(m_operatorId);
data.lastModified(QDateTime::currentMSecsSinceEpoch());
data.name = "Test Document";
data.isTemplate = false;
data.isUsedBy = false;
data.usedBy = 0;
data.folderId = m_folderId;
data.fileStatus = FileManagement::FileStatus::Valid;
data.fileCategory = FileManagement::FileCategory::User; // user docs
data.fileType = FileManagement::FileType::MSOfficeDocument; // doc
data.operatorId = m_operatorId;
data.lastModified = QDateTime::currentMSecsSinceEpoch();
QByteArray vmTest;
vmTest += "bla-bla-bla";
data.content(LtsUtils::convert<std::vector<uint8_t>>(vmTest));
data.content = LtsUtils::convert<std::vector<uint8_t>>(vmTest);
m_fileContentId = 0;
if (!m_ftc->fileContentModifyRequest(data, this))
@@ -318,17 +318,17 @@ void FlmTests::tryCreateFileContent()
}
QTRY_VERIFY(m_fileContentId > 0);
data.name("Test PDF");
data.isTemplate(false);
data.folderId(m_folderId);
data.fileStatus(FileManagement::FileStatus::Valid);
data.fileCategory(FileManagement::FileCategory::User); // user docs
data.fileType(FileManagement::FileType::Pdf); // pdf
data.operatorId(m_operatorId);
data.lastModified(QDateTime::currentMSecsSinceEpoch());
data.name = "Test PDF";
data.isTemplate = false;
data.folderId = m_folderId;
data.fileStatus = FileManagement::FileStatus::Valid;
data.fileCategory = FileManagement::FileCategory::User; // user docs
data.fileType = FileManagement::FileType::Pdf; // pdf
data.operatorId = m_operatorId;
data.lastModified = QDateTime::currentMSecsSinceEpoch();
vmTest += "\npdf-pdf-pdf";
data.content(LtsUtils::convert<std::vector<uint8_t>>(vmTest));
data.content = LtsUtils::convert<std::vector<uint8_t>>(vmTest);
m_fileContentId = 0;
if (!m_ftc->fileContentModifyRequest(data, this))
@@ -338,14 +338,14 @@ void FlmTests::tryCreateFileContent()
}
QTRY_VERIFY(m_fileContentId > 0);
data.name("Test JPG");
data.isTemplate(false);
data.folderId(m_folderId);
data.fileStatus(FileManagement::FileStatus::Valid);
data.fileCategory(FileManagement::FileCategory::User); // user docs
data.fileType(FileManagement::FileType::Jpg);
data.operatorId(m_operatorId);
data.lastModified(QDateTime::currentMSecsSinceEpoch());
data.name = "Test JPG";
data.isTemplate = false;
data.folderId = m_folderId;
data.fileStatus = FileManagement::FileStatus::Valid;
data.fileCategory = FileManagement::FileCategory::User; // user docs
data.fileType = FileManagement::FileType::Jpg;
data.operatorId = m_operatorId;
data.lastModified = QDateTime::currentMSecsSinceEpoch();
QString fileName = QLatin1String("/titel_logo_RDE.jpg");
QFile file;
@@ -359,7 +359,7 @@ void FlmTests::tryCreateFileContent()
DEBUG_LOG(m_logger) << "Read file " << fileName;
file.close();
data.content(LtsUtils::convert<std::vector<uint8_t>>(rawImage));
data.content = LtsUtils::convert<std::vector<uint8_t>>(rawImage);
m_fileContentId = 0;
if (!m_ftc->fileContentModifyRequest(data, this))
@@ -369,14 +369,14 @@ void FlmTests::tryCreateFileContent()
}
QTRY_VERIFY(m_fileContentId > 0);
data.name("Test big JPG");
data.isTemplate(false);
data.folderId(m_folderId);
data.fileStatus(FileManagement::FileStatus::Valid);
data.fileCategory(FileManagement::FileCategory::User); // user docs
data.fileType(FileManagement::FileType::Jpg);
data.operatorId(m_operatorId);
data.lastModified(QDateTime::currentMSecsSinceEpoch());
data.name = "Test big JPG";
data.isTemplate = false;
data.folderId = m_folderId;
data.fileStatus = FileManagement::FileStatus::Valid;
data.fileCategory = FileManagement::FileCategory::User; // user docs
data.fileType = FileManagement::FileType::Jpg;
data.operatorId = m_operatorId;
data.lastModified = QDateTime::currentMSecsSinceEpoch();
fileName = QLatin1String("/logo_Project.jpg");
file.setFileName(QCoreApplication::applicationDirPath()+fileName);
@@ -389,7 +389,7 @@ void FlmTests::tryCreateFileContent()
DEBUG_LOG(m_logger) << "Read file " << fileName;
file.close();
data.content(LtsUtils::convert<std::vector<uint8_t>>(rawImage));
data.content = LtsUtils::convert<std::vector<uint8_t>>(rawImage);
m_fileContentId = 0;
if (!m_ftc->fileContentModifyRequest(data, this))
@@ -411,9 +411,9 @@ void FlmTests::tryModifyFileContent()
const FileManagement::FileContent &flc = m_dtc->fileContent(m_fileContentId);
FileManagement::FileContentModifyRequest data;
DEBUG_LOG(m_logger) << "flc.id() = " << flc.id();
DEBUG_LOG(m_logger) << "flc.id() = " << flc.id;
if (flc.id() == 0)
if (flc.id == 0)
{
ERROR_LOG(m_logger) << "Cannot find File Content Id = " << m_fileContentId;
failExit();
@@ -428,29 +428,29 @@ void FlmTests::tryModifyFileContent()
DEBUG_LOG(m_logger) << "Content size = " << m_content.size();
data.id(flc.id());
data.name(flc.name());
if (flc.exerciseId().is_set())
data.id = flc.id;
data.name = flc.name;
if (flc.exerciseId.is_set())
{
data.exerciseId(flc.exerciseId().get());
if (flc.phaseId().is_set())
data.phaseId(flc.phaseId().get());
data.exerciseId = flc.exerciseId.get();
if (flc.phaseId.is_set())
data.phaseId = flc.phaseId.get();
}
data.fileCategory(flc.fileCategory());
data.fileStatus(flc.fileStatus());
data.fileType(flc.fileType());
data.folderId(flc.folderId());
data.isTemplate(flc.isTemplate());
data.isUsedBy(flc.isUsedBy());
data.usedBy(flc.usedBy());
data.operatorId(flc.operatorId());
data.properties(flc.properties());
data.content(m_content);
data.fileCategory = flc.fileCategory;
data.fileStatus = flc.fileStatus;
data.fileType = flc.fileType;
data.folderId = flc.folderId;
data.isTemplate = flc.isTemplate;
data.isUsedBy = flc.isUsedBy;
data.usedBy = flc.usedBy;
data.operatorId = flc.operatorId;
data.properties = flc.properties;
data.content = m_content;
// changing only name, template, last modified
data.name("Test File Content Updated");
data.isTemplate(true);
data.lastModified(QDateTime::currentMSecsSinceEpoch());
data.name = "Test File Content Updated";
data.isTemplate = true;
data.lastModified = QDateTime::currentMSecsSinceEpoch();
if (!m_ftc->fileContentModifyRequest(FileContentModifyRequest(data), this))
{
@@ -466,7 +466,7 @@ void FlmTests::tryModifyFileContent()
bool FlmTests::checkContentSize(int fileId)
{
GetFileContentDataRequest request;
request.fileContentId(fileId);
request.fileContentId = fileId;
m_content.clear();
if (!m_ftc->getFileContentDataRequest(request, this))
@@ -490,9 +490,9 @@ void FlmTests::tryUpdateStatus()
m_dtc->waitForHistoricalDataFileContent();
const FileManagement::FileContent &flc = m_dtc->fileContent(m_fileContentId);
DEBUG_LOG(m_logger) << "flc.id() = " << flc.id();
DEBUG_LOG(m_logger) << "flc.id() = " << flc.id;
if (flc.id() == 0)
if (flc.id == 0)
{
ERROR_LOG(m_logger) << "Cannot find File Content Id = " << m_fileContentId;
failExit();
@@ -559,18 +559,18 @@ void FlmTests::tryCreatePlan()
FileContentModifyRequest data;
data.name("Test Plan");
data.isTemplate(false);
data.folderId(m_folderId);
data.fileStatus(FileManagement::FileStatus::Valid);
data.fileCategory(FileManagement::FileCategory::Global); // global
data.fileType(FileManagement::FileType::TacticalPlan); // plan
data.operatorId(m_operatorId);
data.lastModified(QDateTime::currentMSecsSinceEpoch());
data.name = "Test Plan";
data.isTemplate = false;
data.folderId = m_folderId;
data.fileStatus = FileManagement::FileStatus::Valid;
data.fileCategory = FileManagement::FileCategory::Global; // global
data.fileType = FileManagement::FileType::TacticalPlan; // plan
data.operatorId = m_operatorId;
data.lastModified = QDateTime::currentMSecsSinceEpoch();
QByteArray vmTest;
vmTest += "bla-bla-bla";
data.content(LtsUtils::convert<std::vector<uint8_t>>(vmTest));
data.content = LtsUtils::convert<std::vector<uint8_t>>(vmTest);
m_fileContentId = 0;
if (!m_ftc->fileContentModifyRequest(data, this))
@@ -588,18 +588,18 @@ void FlmTests::tryCreateFav()
FileContentModifyRequest data;
data.name("Test Fav");
data.isTemplate(false);
data.folderId(m_folderId);
data.fileStatus(FileManagement::FileStatus::Valid);
data.fileCategory(FileManagement::FileCategory::User); // user
data.fileType(FileManagement::FileType::OperatorFavourite); // fav
data.operatorId(m_operatorId);
data.lastModified(QDateTime::currentMSecsSinceEpoch());
data.name = "Test Fav";
data.isTemplate = false;
data.folderId = m_folderId;
data.fileStatus = FileManagement::FileStatus::Valid;
data.fileCategory = FileManagement::FileCategory::User; // user
data.fileType = FileManagement::FileType::OperatorFavourite; // fav
data.operatorId = m_operatorId;
data.lastModified = QDateTime::currentMSecsSinceEpoch();
QByteArray vmTest;
vmTest += "bla-bla-bla";
data.content(LtsUtils::convert<std::vector<uint8_t>>(vmTest));
data.content = LtsUtils::convert<std::vector<uint8_t>>(vmTest);
m_fileContentId = 0;
if (!m_ftc->fileContentModifyRequest(data, this))
@@ -617,18 +617,18 @@ void FlmTests::tryCreateSymbol()
FileContentModifyRequest data;
data.name("Test Symbol");
data.isTemplate(false);
data.folderId(m_folderId);
data.fileStatus(FileManagement::FileStatus::Valid);
data.fileCategory(FileManagement::FileCategory::Global); // global
data.fileType(FileManagement::FileType::OperatorDefinedSymbol);
data.operatorId(m_operatorId);
data.lastModified(QDateTime::currentMSecsSinceEpoch());
data.name = "Test Symbol";
data.isTemplate = false;
data.folderId = m_folderId;
data.fileStatus = FileManagement::FileStatus::Valid;
data.fileCategory = FileManagement::FileCategory::Global; // global
data.fileType = FileManagement::FileType::OperatorDefinedSymbol;
data.operatorId = m_operatorId;
data.lastModified = QDateTime::currentMSecsSinceEpoch();
QByteArray vmTest;
vmTest += "bla-bla-bla";
data.content(LtsUtils::convert<std::vector<uint8_t>>(vmTest));
data.content = LtsUtils::convert<std::vector<uint8_t>>(vmTest);
m_fileContentId = 0;
if (!m_ftc->fileContentModifyRequest(data, this))
@@ -644,7 +644,7 @@ void FlmTests::tryGetContent()
{
GetFileContentDataRequest request;
request.fileContentId(m_fileContentId);
request.fileContentId = m_fileContentId;
INFO_LOG(m_logger) << "trying to send content request for file Id = " << m_fileContentId;
if (!m_ftc->getFileContentDataRequest(request, this))
@@ -659,16 +659,16 @@ void FlmTests::tryGetContent()
// ------------------------------------------------------------------------------
void FlmTests::onGetFileContentDataReply(const GetFileContentDataReply &replyObject)
{
if (replyObject.errorString().size() > 0)
if (replyObject.errorString.size() > 0)
{
ERROR_LOG(m_logger) << "Got onGetFileContentDataReply error: " << replyObject.errorString();
ERROR_LOG(m_logger) << "Got onGetFileContentDataReply error: " << replyObject.errorString;
failExit();
}
INFO_LOG(m_logger) << "Got reply with id " << replyObject.id()
<< " and errorString " << replyObject.errorString();
INFO_LOG(m_logger) << "Got reply with id " << replyObject.id
<< " and errorString " << replyObject.errorString;
m_content = replyObject.content();
m_content = replyObject.content;
DEBUG_LOG(m_logger) << "Content size: " << m_content.size();
@@ -691,7 +691,7 @@ void FlmTests::tryGetAllTemplates()
DEBUG_LOG(m_logger) << "Found " << allTemplates.size() << " templates";
for (const FileContent &fc : qAsConst(allTemplates))
DEBUG_LOG(m_logger) << "Found template (id, name) = (" << fc.id() << ", " << fc.name() << ")";
DEBUG_LOG(m_logger) << "Found template (id, name) = (" << fc.id << ", " << fc.name << ")";
QTest::qWait(1000);
}
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.h
+5 -5
View File
@@ -12,15 +12,15 @@
#pragma once
#include <Lts/Services/FileManagement/flm_ftc.h>
#include <include/FileManagement/flm_dtc.h>
#include <Lts/Services/FileManagement/flm_db.h>
#include <Lts/Services/FileManagement/flm_db_impl_custom.h>
#include <FileManagement/flm_ftc.h>
#include <FileManagement/flm_dtc.h>
#include <FileManagement/flm_db.h>
#include <FileManagement/flm_db_impl_custom.h>
#include <FileManagement/flm_ftc_types.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <Lts/Services/FileManagement/logger.h>
#include <FileManagement/logger.h>
#include <QtGui/QPixmap>
#include <ngldb/db_service_handler.h>