TetraIF migration and Unittest Implementation for it

Entire-Checkpoint: 14d1fef0cf36
This commit is contained in:
berrux-dev committed 2026-09-12 13:54:34 +02:00
1 parent a86f9b5bac
commit ba212f9dce
78 files changed
+1611 -640

No files matched your search

@@ -76,3 +76,8 @@ NGL_TARGET_LINK_LIBRARIES(PrtCnv
NGL_INSTALL_TARGET(PrtCnv)
NGL_INSTALL(AAR SV FILES log4cxx_prtcnv.props DESTINATION bin)
NGL_INSTALL(AAR SV FILES PrtCnv.dat.tts DESTINATION bin)
# Unit tests (LTS_HAVE_GTEST is set by the top-level CMakeLists.txt)
if(BUILD_TESTING AND LTS_HAVE_GTEST)
add_subdirectory(unittest)
endif()
@@ -41,19 +41,19 @@ int main(int argc, char **argv)
TetraIF::usage();
}
const QString mode = args[3].toLower();
if (mode != QLatin1String("listen") &&
mode != QLatin1String("send_random") &&
mode != QLatin1String("send_file"))
if (mode != QStringLiteral("listen") &&
mode != QStringLiteral("send_random") &&
mode != QStringLiteral("send_file"))
{
ERROR_LOG(logger) << "Invalid mode " << args[3];
TetraIF::usage();
}
TetraIF t(tetra, port, issi);
if (mode == QLatin1String("listen"))
if (mode == QStringLiteral("listen"))
t.listenMode(args.mid(4));
else if (mode == QLatin1String("send_random"))
else if (mode == QStringLiteral("send_random"))
t.randomMode(args.mid(4));
else if (mode == QLatin1String("send_file"))
else if (mode == QStringLiteral("send_file"))
t.fileMode(args.mid(4));
t.start();
@@ -19,7 +19,9 @@
#include <PrtCnv/PrtCnvRadioThread.hpp>
#include <PrtCnv/PrtCnvThreadStarter.hpp>
TetraIF::TetraIF(const QHostAddress &addr, unsigned short port, unsigned short issi) : QObject()
TetraIF::TetraIF(const QHostAddress &addr, unsigned short port, unsigned short issi)
: QObject()
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
, m_addr(addr)
, m_port(port)
, m_issi(issi)
@@ -30,12 +32,11 @@ TetraIF::TetraIF(const QHostAddress &addr, unsigned short port, unsigned short i
, m_secondFragment(0)
, m_timer(nullptr)
, m_SendCounter(0)
),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
{
connect(m_socket, &QTcpSocket::connected, this, &TetraIF::onConnected);
connect(m_socket, &QTcpSocket::disconnected, this, &TetraIF::onDisconnected);
connect(m_socket, &QTcpSocket::readyRead, this, &TetraIF::onReadyRead);
connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &TetraIF::onError);
connect(m_socket, &QTcpSocket::errorOccurred, this, &TetraIF::onError);
m_outputDir = QCoreApplication::applicationDirPath();
m_outputDir += QLatin1Char('/') + QString::number(m_issi) + QLatin1Char('-');
@@ -303,7 +304,7 @@ void TetraIF::dumpData(const QByteArray &data)
const qint64 msecs = QDateTime::currentMSecsSinceEpoch();
const QString timeStr = QStringLiteral("%1.%2").arg(msecs / 1000).arg(msecs % 1000);
{
QFile f(m_outputDir + timeStr + QLatin1String(".dat"));
QFile f(m_outputDir + timeStr + QStringLiteral(".dat"));
if (!f.open(QIODevice::WriteOnly))
{
ERROR_LOG(m_logger) << "Error opening file "
@@ -406,7 +407,7 @@ QString TetraIF::getIssisAsString() const
{
QString ret;
for (unsigned short issi : std::as_const(m_issiList))
ret += QString::number(issi) + QLatin1String(", ");
ret += QString::number(issi) + QStringLiteral(", ");
return ret.left(ret.size() - 2);
}
@@ -71,7 +71,7 @@ void MainWindow::slot_analysieren()
ui->labelResult->setText(QString());
QString ISSI = ui->lineEditISSI->text();
if (ISSI.isEmpty())
ISSI = QLatin1String("1");
ISSI = QStringLiteral("1");
m_logfileList.clear();
@@ -79,8 +79,8 @@ void MainWindow::slot_analysieren()
m_files = folder.entryList();
folder.~QDir();
ui->progressBar->setValue(1);
const QString paytext = ISSI + QLatin1String("-payload");
const QString issitext = ISSI + QLatin1String("-1");
const QString paytext = ISSI + QStringLiteral("-payload");
const QString issitext = ISSI + QStringLiteral("-1");
for (int i = 0; i < m_files.count(); i++)
{
@@ -92,7 +92,7 @@ void MainWindow::slot_analysieren()
}
else
{
if (!name.contains(QLatin1String(".dat")))
if (!name.contains(QStringLiteral(".dat")))
{
m_files.removeAt(i);
i--;
@@ -119,7 +119,7 @@ void MainWindow::slot_analysieren()
readFiles();
ui->progressBar->setValue(90);
ui->progressBar->repaint();
QString ausgabetext = QLatin1String("\tANALYSIS COMPLETED - ") + QString::number(auswerten()) + QLatin1String(" missing messages");
QString ausgabetext = QStringLiteral("\tANALYSIS COMPLETED - ") + QString::number(auswerten()) + QStringLiteral(" missing messages");
ui->labelResult->setText(ausgabetext);
}
ui->progressBar->setValue(100);
@@ -181,7 +181,7 @@ void MainWindow::openLogfile(const QString &folder, int count)
{
m_logfile = folder;
m_logZeiten = folder;
m_logfile += QLatin1String("/logfile_analysis.txt");
m_logfile += QStringLiteral("/logfile_analysis.txt");
QFile file(m_logfile);
if (file.open(QIODevice::WriteOnly | QIODevice::Text))
{
@@ -189,7 +189,7 @@ void MainWindow::openLogfile(const QString &folder, int count)
file.write(msg.toUtf8());
file.close();
}
m_logZeiten += QLatin1String("/transmission_times.csv");
m_logZeiten += QStringLiteral("/transmission_times.csv");
file.setFileName(m_logZeiten);
if (file.open(QIODevice::WriteOnly))
{
@@ -206,13 +206,13 @@ void MainWindow::writeToLogfile(const QString &issi,
const QString &bytes)
{
QString text = issi;
text += QLatin1String(": ");
text += timestamp.toString(QLatin1String("dd.MM.yyyy hh:mm:ss"));
text += QLatin1String(" - ");
text += QStringLiteral(": ");
text += timestamp.toString(QStringLiteral("dd.MM.yyyy hh:mm:ss"));
text += QStringLiteral(" - ");
text += filename;
text += QLatin1String(" -> ");
text += QStringLiteral(" -> ");
text += bytes;
text += QLatin1String(" --> ");
text += QStringLiteral(" --> ");
text += QString::number(lfdNr, 10);
text += QLatin1Char('\n');
QFile file(m_logfile);
@@ -235,13 +235,13 @@ void MainWindow::writeToLogfile(const QString &issi,
uint lfdNr)
{
QString text = issi;
text += QLatin1String(": ");
text += sendeZeit.toString(QLatin1String("hh:mm:ss"));
text += QLatin1String(" --> ");
text += timestamp.toString(QLatin1String("dd.MM.yyyy hh:mm:ss"));
text += QLatin1String(" - ");
text += QStringLiteral(": ");
text += sendeZeit.toString(QStringLiteral("hh:mm:ss"));
text += QStringLiteral(" --> ");
text += timestamp.toString(QStringLiteral("dd.MM.yyyy hh:mm:ss"));
text += QStringLiteral(" - ");
text += filename;
text += QLatin1String(" --> ");
text += QStringLiteral(" --> ");
text += QString::number(lfdNr, 10);
text += QLatin1Char('\n');
QFile file(m_logfile);
@@ -416,9 +416,9 @@ void MainWindow::writeLogZeiten(const QDateTime &beginn, const QDateTime &end, c
{
QString msg = issi;
msg += QLatin1Char(';');
msg += beginn.toString(QLatin1String("hh:mm:ss"));
msg += beginn.toString(QStringLiteral("hh:mm:ss"));
msg += QLatin1Char(';');
msg += end.toString(QLatin1String("hh:mm:ss"));
msg += end.toString(QStringLiteral("hh:mm:ss"));
msg += QLatin1Char('\n');
QFile file(m_logZeiten);
file.open(QIODevice::Append | QIODevice::Text);
@@ -53,7 +53,7 @@ static std::string threadIdToString(PrtCnvApplication::E_ThreadId id)
PrtCnvApplication::PrtCnvApplication()
: m_Config(nullptr)
, m_exerciseId(0)
, m_accessMutex(QMutex::Recursive)
, m_logger(getLogger("PrtCnvApplication"))
{}
@@ -165,7 +165,7 @@ protected:
mutable QMutex m_accessMutex;
mutable QRecursiveMutex m_accessMutex;
QString m_dbDriver;
QString m_dbHostName;
@@ -173,6 +173,8 @@ protected:
QString m_dbSchemaName;
QString m_dbUserName;
QString m_dbPassword;
LOGGER_T m_logger;
};
}
@@ -12,6 +12,8 @@
#include "PrtCnvBroadcastMgr.hpp"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <utility>
#include "PrtCnvDbThread.hpp"
#include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
@@ -351,6 +351,7 @@ Q_SIGNALS:
private:
NGL::INGLLogger &m_loggerBcRequest;
NGL::INGLLogger &m_logger;
};
}
@@ -23,7 +23,7 @@
#include <CoPrtCnv/CoPrtCnvTelegramConverter.hpp>
#include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
#include <LtsUtils/dds_bitarray.h>
#include <LtsUtilsCore/dds_bitarray.h>
#include <QtCore/QTimer>
#include <QtCore/QCoreApplication>
@@ -798,7 +798,7 @@ bool PrtCnvCentralThread::handleSpecialTelegram(N_CoPrtCnv::CoPrtCnvCentralTeleg
void PrtCnvCentralThread::connectSocket()
{
const QString host = m_Config->getString(getName(), QStringLiteral("HostName"), QStringLiteral("EXCTDS01"));
if (host == QLatin1String("directConnection"))
if (host == QStringLiteral("directConnection"))
{
m_bDirectConnection = true;
connected();
@@ -43,13 +43,7 @@ PrtCnvDbThread::PrtCnvDbThread(const QString &dbDriver,
const QString &dbPassword,
PrtCnv::PrtCnvThreadStarter *a_parent)
: PrtCnvThread(a_parent, "PrtCnvDbThread")
, m_BattleFieldOpStateMutex(QMutex::Recursive)
, m_MemberListByIdMutex(QMutex::Recursive)
, m_CentralListMutex(QMutex::Recursive)
, m_OldCentralAckCounter(0)
, m_RadioListMutex(QMutex::Recursive)
, m_SqlCmdListMutex(QMutex::Recursive)
, m_BroadcastMapMutex(QMutex::Recursive)
, m_DoClean(false)
, m_DoWaitUntilSqlWritten(false)
, m_DoStorePermanent(false)
@@ -156,12 +150,12 @@ bool PrtCnvDbThread::createDatabase()
closeDb();
m_db = QSqlDatabase::addDatabase(m_dbDriver, QStringLiteral("PrtCnv"));
if (m_dbDriver == QLatin1String("QSQLITE"))
if (m_dbDriver == QStringLiteral("QSQLITE"))
{
QString path = m_Config->getString(getName(), QStringLiteral("DatabaseFileName"), QStringLiteral("telegrams.db"));
if (!QDir::isAbsolutePath(path))
{
path = QCoreApplication::applicationDirPath() + QLatin1String("/../") + path;
path = QCoreApplication::applicationDirPath() + QStringLiteral("/../") + path;
QFileInfo fi(path);
QDir().mkpath(fi.absolutePath());
}
@@ -408,7 +402,7 @@ bool PrtCnvDbThread::createDatabase()
ERROR_LOG(m_logger) << "Internal error: conversion of telegram with telId=" << radioTelegram.getTelID() << " from radio to central failed";
}
if (m_db.driverName() == QLatin1String("QSQLITE"))
if (m_db.driverName() == QStringLiteral("QSQLITE"))
{
q.exec(QStringLiteral("VACUUM;"));
q.exec(QStringLiteral("PRAGMA journal_mode=WAL;"));
@@ -213,15 +213,15 @@ namespace PrtCnv
mutable QMutex m_BattleFieldOpStateMutex;
mutable QRecursiveMutex m_BattleFieldOpStateMutex;
mutable QMutex m_MemberListByIdMutex;
mutable QRecursiveMutex m_MemberListByIdMutex;
mutable QMutex m_CentralListMutex;
mutable QRecursiveMutex m_CentralListMutex;
@@ -238,16 +238,16 @@ namespace PrtCnv
std::list<PrtCnvStoredRadioTelegram*> m_RadioList;
mutable QMutex m_RadioListMutex;
mutable QRecursiveMutex m_RadioListMutex;
std::vector<QString> m_SqlCommandList;
mutable QMutex m_SqlCmdListMutex;
mutable QRecursiveMutex m_SqlCmdListMutex;
mutable QMutex m_BroadcastMapMutex;
mutable QRecursiveMutex m_BroadcastMapMutex;
std::list<PrtCnvStoredRadioTelegram*> m_BroadcastList;
@@ -25,6 +25,7 @@ namespace PrtCnv
PrtCnvInjectionSocket::PrtCnvInjectionSocket()
: m_Socket(nullptr)
, m_Server(nullptr)
, m_logger(getLogger("PrtCnvInjectionSocket"))
{}
PrtCnvInjectionSocket::~PrtCnvInjectionSocket()
@@ -55,7 +55,8 @@ namespace PrtCnv
void disconnected(PrtCnvInjectionSocket* a_injectSocket);
protected:
LOGGER_T m_logger;
};
}
@@ -88,9 +88,7 @@ PrtCnvRadioThread::PrtCnvRadioThread(int exerciseId, PrtCnvThreadStarter *a_pare
m_ReceivedTelegrams(0),
m_ReceivedBytes(0),
m_bUseScrambling(false),
m_loggerStats(getLogger("PrtCnvRadioThread.statistic")),
m_exerciseEquipmentAssignmentMutex(QMutex::Recursive),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
m_loggerStats(getLogger("PrtCnvRadioThread.statistic")) {
m_Name = QStringLiteral("Radio");
for (int i = 0; i < AVERAGE_COUNT; ++i)
{
@@ -176,7 +174,7 @@ int32_t PrtCnvRadioThread::init()
m_DbThread->licenseMember(m_DbThread->addMember(0, m_BroadcastISSI));
QString groupString = m_Config->getString(getName(), QStringLiteral("ListenGroups"), QString());
const QVector<QStringView> groups = groupString.splitView(QLatin1Char(','), Qt::SkipEmptyParts);
const QList<QStringView> groups = QStringView(groupString).split(QLatin1Char(','), Qt::SkipEmptyParts);
for (const QStringView &sr : groups)
{
uint32_t group = sr.toUInt();
@@ -192,7 +190,7 @@ int32_t PrtCnvRadioThread::init()
m_LoginPathWithPrefix = m_Config->getString(QStringLiteral("Login"), QStringLiteral("LoginFilePathWithPrefix"), QStringLiteral("login"));
if (!QDir::isAbsolutePath(m_LoginPathWithPrefix))
m_LoginPathWithPrefix = QCoreApplication::applicationDirPath() + QLatin1String("/../") + m_LoginPathWithPrefix;
m_LoginPathWithPrefix = QCoreApplication::applicationDirPath() + QStringLiteral("/../") + m_LoginPathWithPrefix;
m_LoginPathWithPrefix = QDir::cleanPath(QDir::fromNativeSeparators(m_LoginPathWithPrefix));
QString path = m_LoginPathWithPrefix.left(m_LoginPathWithPrefix.lastIndexOf(QLatin1Char('/')));
@@ -1524,8 +1522,8 @@ void PrtCnvRadioThread::writeLoginLog(const N_CoPrtCnv::CoPrtCnvRadioTelegram *a
INFO_LOG(m_logger) << logData;
QString date = QDate::currentDate().toString(QLatin1String("yyyyMMdd"));
QString fileName = m_LoginPathWithPrefix + date + QLatin1Char('_') + QString::number(m_ExerciseId) + QLatin1String(".log");
QString date = QDate::currentDate().toString(QStringLiteral("yyyyMMdd"));
QString fileName = m_LoginPathWithPrefix + date + QLatin1Char('_') + QString::number(m_ExerciseId) + QStringLiteral(".log");
QFile file(fileName);
@@ -263,7 +263,7 @@ public:
std::unordered_map<int, std::unordered_set<int>> m_exerciseEquipmentAssignments;
std::unordered_map<int, TrainingAreaBase::TetraIcd::GroupIssiInformation> m_groupIssiInformation;
mutable QMutex m_exerciseEquipmentAssignmentMutex;
mutable QRecursiveMutex m_exerciseEquipmentAssignmentMutex;
private:
@@ -31,7 +31,6 @@ PrtCnvRadioTrafficThread::PrtCnvRadioTrafficThread(PrtCnvThreadStarter* a_parent
, m_hystLoad(5)
, m_calcTimeout(1000)
, m_cleanupTimeout(5000)
, m_mutex(QMutex::Recursive)
{}
void PrtCnvRadioTrafficThread::newTelegramArrived(unsigned int size)
@@ -72,7 +72,7 @@ protected:
QMutex m_mutex;
QRecursiveMutex m_mutex;
@@ -100,7 +100,7 @@ void PrtCnvSocketThread::createNewSocket()
connect(m_Socket, &QTcpSocket::connected, this, &PrtCnvSocketThread::connected, Qt::QueuedConnection);
connect(m_Socket, &QTcpSocket::disconnected, this, &PrtCnvSocketThread::disconnected, Qt::QueuedConnection);
connect(m_Socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &PrtCnvSocketThread::error, Qt::QueuedConnection);
connect(m_Socket, &QTcpSocket::errorOccurred, this, &PrtCnvSocketThread::error, Qt::QueuedConnection);
connect(m_Socket, &QTcpSocket::hostFound, this, &PrtCnvSocketThread::hostFound, Qt::QueuedConnection);
connect(m_Socket, &QTcpSocket::stateChanged, this, &PrtCnvSocketThread::stateChanged);
connect(m_Socket, &QTcpSocket::readyRead, this, &PrtCnvSocketThread::readyRead, Qt::QueuedConnection);
@@ -364,8 +364,8 @@ void PrtCnvSocketThread::readHostAdresses()
uint16_t port = m_Config->getInteger(getName(), QStringLiteral("Port"), 4934);
m_hostAdresses.push_back(qMakePair(host, port));
for (int i = 1; i < 10; ++i) {
const QString hostName = QLatin1String("HostName") + QString::number(i);
const QString portName = QLatin1String("Port") + QString::number(i);
const QString hostName = QStringLiteral("HostName") + QString::number(i);
const QString portName = QStringLiteral("Port") + QString::number(i);
host = m_Config->getString(getName(), hostName, QString());
port = m_Config->getInteger(getName(), portName, 0);
if (host.isEmpty() || port == 0)
@@ -36,6 +36,8 @@ protected:
Qt::HANDLE m_currentThreadId;
LOGGER_T m_logger;
public:
@@ -33,6 +33,7 @@ PrtCnvThreadStarter::PrtCnvThreadStarter(const PrtCnv::PrtCnvApplication::E_Thre
, m_Application(a_mainApp)
, m_Id(a_id)
, m_settings(new NGL::Settings(configFileName))
, m_logger(getLogger("PrtCnvThreadStarter"))
{
DEBUG_LOG(m_logger) << "Using Config file '" << configFileName << "'";
}
@@ -59,6 +59,8 @@ protected:
void run() override;
LOGGER_T m_logger;
};
}
@@ -14,8 +14,8 @@
int main(int argc, char **argv)
{
QCoreApplication::setApplicationName(QLatin1String("TTS"));
QCoreApplication::setOrganizationName(QLatin1String("RME"));
QCoreApplication::setApplicationName(QStringLiteral("TTS"));
QCoreApplication::setOrganizationName(QStringLiteral("RME"));
NGLCoreApplication app(argc, argv);
app.createLogger("tts", "log4cxx_tetratestserver.props");
@@ -26,96 +26,96 @@ int main(int argc, char **argv)
LtsCommandLineParser::LtsCommandLineParser options(LtsCommandLineParser::LtsCommandLineParser::CustomConfigFile);
options.addOption({ QStringList() << QLatin1String("p") << QLatin1String("player")
, QLatin1String("number of players to be simulated.")
, QLatin1String("Default value")
, QLatin1String("5")
options.addOption({ QStringList() << QStringLiteral("p") << QStringLiteral("player")
, QStringLiteral("number of players to be simulated.")
, QStringLiteral("Default value")
, QStringLiteral("5")
});
options.addOption({ QStringList() << QLatin1String("n") << QLatin1String("northing")
, QLatin1String("initial position UTM north.")
, QLatin1String("Default value")
, QLatin1String("77777")
options.addOption({ QStringList() << QStringLiteral("n") << QStringLiteral("northing")
, QStringLiteral("initial position UTM north.")
, QStringLiteral("Default value")
, QStringLiteral("77777")
});
options.addOption({ QStringList() << QLatin1String("e") << QLatin1String("easting")
, QLatin1String("initial position UTM east.")
, QLatin1String("Default value")
, QLatin1String("99999")
options.addOption({ QStringList() << QStringLiteral("e") << QStringLiteral("easting")
, QStringLiteral("initial position UTM east.")
, QStringLiteral("Default value")
, QStringLiteral("99999")
});
options.addOption({ QStringList() << QLatin1String("f") << QLatin1String("first-id")
, QLatin1String("first equipment ID to use.")
, QLatin1String("Default value")
, QLatin1String("1101")
options.addOption({ QStringList() << QStringLiteral("f") << QStringLiteral("first-id")
, QStringLiteral("first equipment ID to use.")
, QStringLiteral("Default value")
, QStringLiteral("1101")
});
options.addOption({ QStringList() << QLatin1String("r") << QLatin1String("pprow")
, QLatin1String("players per row.")
, QLatin1String("Default value")
, QLatin1String("25")
options.addOption({ QStringList() << QStringLiteral("r") << QStringLiteral("pprow")
, QStringLiteral("players per row.")
, QStringLiteral("Default value")
, QStringLiteral("25")
});
options.addOption({ QStringList() << QLatin1String("s") << QLatin1String("pspacing")
, QLatin1String("utm based spacing between the players.")
, QLatin1String("Default value")
, QLatin1String("100")
options.addOption({ QStringList() << QStringLiteral("s") << QStringLiteral("pspacing")
, QStringLiteral("utm based spacing between the players.")
, QStringLiteral("Default value")
, QStringLiteral("100")
});
options.addOption({ QStringList() << QLatin1String("z") << QLatin1String("issi")
, QLatin1String("DestinationIssi / HostISSI")
, QLatin1String("Default value")
, QLatin1String("2")
options.addOption({ QStringList() << QStringLiteral("z") << QStringLiteral("issi")
, QStringLiteral("DestinationIssi / HostISSI")
, QStringLiteral("Default value")
, QStringLiteral("2")
});
options.addOption({ QStringList() << QLatin1String("m") << QLatin1String("movements")
, QLatin1String("how many movements per milliseconds to make.")
, QLatin1String("Default value")
, QLatin1String("2000")
options.addOption({ QStringList() << QStringLiteral("m") << QStringLiteral("movements")
, QStringLiteral("how many movements per milliseconds to make.")
, QStringLiteral("Default value")
, QStringLiteral("2000")
});
options.addOption({ QStringList() << QLatin1String("d") << QLatin1String("death")
, QLatin1String("minimum times, after the movements timer is triggered, a dead player can revive.")
, QLatin1String("Default value")
, QLatin1String("100")
options.addOption({ QStringList() << QStringLiteral("d") << QStringLiteral("death")
, QStringLiteral("minimum times, after the movements timer is triggered, a dead player can revive.")
, QStringLiteral("Default value")
, QStringLiteral("100")
});
options.addOption({ QStringList() << QLatin1String("o") << QLatin1String("death-offset")
, QLatin1String("maximum times, after the movements timer is triggered, a dead player can revive.")
, QLatin1String("(0 -> identical to min)")
, QLatin1String("0")
options.addOption({ QStringList() << QStringLiteral("o") << QStringLiteral("death-offset")
, QStringLiteral("maximum times, after the movements timer is triggered, a dead player can revive.")
, QStringLiteral("(0 -> identical to min)")
, QStringLiteral("0")
});
options.addOption({ QStringList() << QLatin1String("t") << QLatin1String("pattern")
, QLatin1String("pattern the player has to walk [enter pattern by hand or pattern alias-name from settings file]\r\nfor more info, enter '--pattern-help'.")
, QLatin1String("Default value")
, QLatin1String("3,30,20#3,30,-20#3,-30,-20#3,-30,20")
options.addOption({ QStringList() << QStringLiteral("t") << QStringLiteral("pattern")
, QStringLiteral("pattern the player has to walk [enter pattern by hand or pattern alias-name from settings file]\r\nfor more info, enter '--pattern-help'.")
, QStringLiteral("Default value")
, QStringLiteral("3,30,20#3,30,-20#3,-30,-20#3,-30,20")
});
options.addOption({ QStringList() << QLatin1String("demand-old-broadcast-telegrams")
, QLatin1String("player demand old broadcast telegrams starting at BCI <default value>")
, QLatin1String("Default value")
, QLatin1String("0")
options.addOption({ QStringList() << QStringLiteral("demand-old-broadcast-telegrams")
, QStringLiteral("player demand old broadcast telegrams starting at BCI <default value>")
, QStringLiteral("Default value")
, QStringLiteral("0")
});
options.addOption({ QStringList() << QLatin1String("deactivate-single-mines")
, QLatin1String("the first player deactivates single mines with ids from minimum-mine-id to maximum-mine-id")
options.addOption({ QStringList() << QStringLiteral("deactivate-single-mines")
, QStringLiteral("the first player deactivates single mines with ids from minimum-mine-id to maximum-mine-id")
});
options.addOption({ QStringList() << QLatin1String("minimum-mine-id")
, QLatin1String("sets the value for minimum-mine-id used within deactivate-single-mines command")
, QLatin1String("Default value")
, QLatin1String("minimum-mine-id 2048")
options.addOption({ QStringList() << QStringLiteral("minimum-mine-id")
, QStringLiteral("sets the value for minimum-mine-id used within deactivate-single-mines command")
, QStringLiteral("Default value")
, QStringLiteral("minimum-mine-id 2048")
});
options.addOption({ QStringList() << QLatin1String("maximum-mine-id")
, QLatin1String("sets the value for maximum-mine-Id used within deactivate-single-mines command")
, QLatin1String("Default value")
, QLatin1String("maximum-mine-id 2100")
options.addOption({ QStringList() << QStringLiteral("maximum-mine-id")
, QStringLiteral("sets the value for maximum-mine-Id used within deactivate-single-mines command")
, QStringLiteral("Default value")
, QStringLiteral("maximum-mine-id 2100")
});
options.addOption({ QStringList() << QLatin1String("pattern-help")
, QLatin1String("help for the pattern interpreter.")
options.addOption({ QStringList() << QStringLiteral("pattern-help")
, QStringLiteral("help for the pattern interpreter.")
});
@@ -124,30 +124,30 @@ int main(int argc, char **argv)
options.showHelp();
return -1;
}
QSettings serverSettings(app.applicationDirPath() + QLatin1String("/") + options.iniFile(), QSettings::IniFormat);
QSettings serverSettings(app.applicationDirPath() + QStringLiteral("/") + options.iniFile(), QSettings::IniFormat);
TTSArgs ttsArgs;
ttsArgs.destIssi = options.isSet(QLatin1String("issi")) ? options.value(QLatin1String("issi")).toInt() : 2;
ttsArgs.cntPlayer = options.isSet(QLatin1String("player")) ? options.value(QLatin1String("player")).toInt() : 0;
int northPos_arg = options.isSet(QLatin1String("northing")) ? options.value(QLatin1String("northing")).toInt() : 77777;
int eastPos_arg = options.isSet(QLatin1String("easting")) ? options.value(QLatin1String("easting")).toInt() : 90000;
ttsArgs.destIssi = options.isSet(QStringLiteral("issi")) ? options.value(QStringLiteral("issi")).toInt() : 2;
ttsArgs.cntPlayer = options.isSet(QStringLiteral("player")) ? options.value(QStringLiteral("player")).toInt() : 0;
int northPos_arg = options.isSet(QStringLiteral("northing")) ? options.value(QStringLiteral("northing")).toInt() : 77777;
int eastPos_arg = options.isSet(QStringLiteral("easting")) ? options.value(QStringLiteral("easting")).toInt() : 90000;
ttsArgs.position = QPointF(eastPos_arg, northPos_arg);
ttsArgs.eqIdStart = options.isSet(QLatin1String("first-id")) ? options.value(QLatin1String("first-id")).toInt() : 1101;
ttsArgs.pprow = options.isSet(QLatin1String("pprow")) ? options.value(QLatin1String("pprow")).toInt() : 25;
ttsArgs.pspacing = options.isSet(QLatin1String("pspacing")) ? options.value(QLatin1String("pspacing")).toInt() : 100;
ttsArgs.movs_per_msec = options.isSet(QLatin1String("movements")) ? options.value(QLatin1String("movements")).toInt() : 2000;
ttsArgs.minimumDeathTicks = options.isSet(QLatin1String("death")) ? options.value(QLatin1String("death")).toInt() : 10;
ttsArgs.maximumDeathTicks = options.isSet(QLatin1String("death-offset")) ? options.value(QLatin1String("death-offset")).toInt() : 20;
ttsArgs.demandOldBraodcastTelegrams = options.isSet(QLatin1String("demand-old-broadcast-telegrams")) ? true : false;
ttsArgs.eqIdStart = options.isSet(QStringLiteral("first-id")) ? options.value(QStringLiteral("first-id")).toInt() : 1101;
ttsArgs.pprow = options.isSet(QStringLiteral("pprow")) ? options.value(QStringLiteral("pprow")).toInt() : 25;
ttsArgs.pspacing = options.isSet(QStringLiteral("pspacing")) ? options.value(QStringLiteral("pspacing")).toInt() : 100;
ttsArgs.movs_per_msec = options.isSet(QStringLiteral("movements")) ? options.value(QStringLiteral("movements")).toInt() : 2000;
ttsArgs.minimumDeathTicks = options.isSet(QStringLiteral("death")) ? options.value(QStringLiteral("death")).toInt() : 10;
ttsArgs.maximumDeathTicks = options.isSet(QStringLiteral("death-offset")) ? options.value(QStringLiteral("death-offset")).toInt() : 20;
ttsArgs.demandOldBraodcastTelegrams = options.isSet(QStringLiteral("demand-old-broadcast-telegrams")) ? true : false;
if (ttsArgs.demandOldBraodcastTelegrams)
ttsArgs.demandOldBraodcastTelegramsCounter = options.value(QLatin1String("demand-old-broadcast-telegrams")).toInt();
ttsArgs.deactivationSingleMines = options.isSet(QLatin1String("deactivate-single-mines")) ? true : false;
ttsArgs.minimumMineId = options.isSet(QLatin1String("minimum-mine-id")) ? options.value(QLatin1String("minimum-mine-id")).toInt() : 2048;
ttsArgs.maximumMineId = options.isSet(QLatin1String("maximum-mine-id")) ? options.value(QLatin1String("maximum-mine-id")).toInt() : 2100;
ttsArgs.pattern = options.isSet(QLatin1String("pattern")) ? options.value(QLatin1String("pattern")) : QLatin1String("3,30,20#3,30,-20#3,-30,-20#3,-30,20");
ttsArgs.demandOldBraodcastTelegramsCounter = options.value(QStringLiteral("demand-old-broadcast-telegrams")).toInt();
ttsArgs.deactivationSingleMines = options.isSet(QStringLiteral("deactivate-single-mines")) ? true : false;
ttsArgs.minimumMineId = options.isSet(QStringLiteral("minimum-mine-id")) ? options.value(QStringLiteral("minimum-mine-id")).toInt() : 2048;
ttsArgs.maximumMineId = options.isSet(QStringLiteral("maximum-mine-id")) ? options.value(QStringLiteral("maximum-mine-id")).toInt() : 2100;
ttsArgs.pattern = options.isSet(QStringLiteral("pattern")) ? options.value(QStringLiteral("pattern")) : QStringLiteral("3,30,20#3,30,-20#3,-30,-20#3,-30,20");
if (options.isSet(QLatin1String("pattern-help")))
if (options.isSet(QStringLiteral("pattern-help")))
{
options.showHelp();
return -1;
@@ -170,9 +170,9 @@ int main(int argc, char **argv)
TTServer *s = new TTServer(ttsArgs);
if (!s->listen(QHostAddress::Any, serverSettings.value(QLatin1String("Radio/Port"), 4200).toInt()))
if (!s->listen(QHostAddress::Any, serverSettings.value(QStringLiteral("Radio/Port"), 4200).toInt()))
{
ERROR_LOG(logger) << "Error listening on localhost:" << serverSettings.value(QLatin1String("Radio/Port"), 52010).toInt() << ": "
ERROR_LOG(logger) << "Error listening on localhost:" << serverSettings.value(QStringLiteral("Radio/Port"), 52010).toInt() << ": "
<< s->errorString();
delete s;
return -1;
@@ -7,9 +7,10 @@
#include "worker.h"
TTServer::TTServer(const TTSArgs &ttsArgs) : m_ttsArgs(ttsArgs)
.getNGLLogger("TTServer")),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
TTServer::TTServer(const TTSArgs &ttsArgs)
: m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
, m_ttsArgs(ttsArgs)
{
connect(this, &TTServer::newConnection,
this, &TTServer::onNewConnection);
}
@@ -21,16 +21,15 @@ TTWorker::TTWorker(QTcpSocket *socket, const TTSArgs &ttsArgs)
, m_ttsArgs(ttsArgs)
, m_patternList(interpretPattern(ttsArgs.pattern))
, m_generalPosition(ttsArgs.position)
.getNGLLogger("TTWorker"))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
qsrand(time(nullptr));
}
bool TTWorker::init()
{
connect(m_socket, &QTcpSocket::disconnected,
this, &TTWorker::deleteLater);
connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error),
connect(m_socket, &QTcpSocket::errorOccurred,
this, &TTWorker::onSocketError);
connect(m_socket, &QTcpSocket::readyRead,
this, &TTWorker::onReadyRead);
@@ -87,7 +86,7 @@ QVector<runningPattern> TTWorker::interpretPattern(QString pattern) const
QString patternAlias = pattern;
pattern = m_ttsArgs.settings->value(QLatin1String("pattern/") + patternAlias).toString();
pattern = m_ttsArgs.settings->value(QStringLiteral("pattern/") + patternAlias).toString();
if (pattern.isEmpty())
{
@@ -7,6 +7,7 @@
#include <QtCore/QMap>
#include <QtCore/QObject>
#include <QtCore/QPointF>
#include <QtCore/QRandomGenerator>
#include <QtCore/QMap>
#include <NGLLogger/INGLLogger.h>
#include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
@@ -22,10 +23,9 @@ class QTimer;
class Player
{
private:
NGL::INGLLogger &m_logger;
void randomizeDeathTicks()
{
deathTicks = ((qrand() % (maximumDeathTicks - minimumDeathTicks + 1)) + minimumDeathTicks);
deathTicks = QRandomGenerator::global()->bounded(minimumDeathTicks, maximumDeathTicks + 1);
}
public:
@@ -125,4 +125,6 @@ private:
QVector<Player *> m_playerList;
QVector<runningPattern> m_patternList;
QPointF m_generalPosition;
NGL::INGLLogger &m_logger;
};
@@ -0,0 +1,26 @@
# Unit tests for PrtCnv.
# PrtCnvLib is built with hidden visibility and PrtCnvMember carries no export
# macro, so the classes under test are compiled into the test executable rather
# than widening the library's public ABI for the tests' sake.
# GoogleTest is resolved once in the top-level CMakeLists.txt.
add_executable(PrtCnvTests
${CMAKE_CURRENT_SOURCE_DIR}/../../unittest_main.cpp
PrtCnvMemberTest.cpp
PrtCnvStoredTelegramTest.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../PrtCnvMember.cpp
)
target_include_directories(PrtCnvTests PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
target_link_libraries(PrtCnvTests PRIVATE
CoPrtCnv
Qt6::Core
GTest::gtest
)
include(GoogleTest)
gtest_discover_tests(PrtCnvTests)
@@ -0,0 +1,94 @@
/**
* @file PrtCnvMemberTest.cpp
* @brief Unit tests for PrtCnv::PrtCnvMember.
*
* Covers the public state carried per member and the fragmented-telegram
* bookkeeping (collecting fragments, reporting the telegram id, clearing).
*/
#include <gtest/gtest.h>
#include <QtCore/QByteArray>
#include "PrtCnvMember.hpp"
#include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
#include <CoPrtCnv/tetra_telegram_ids.h>
using PrtCnv::PrtCnvMember;
using N_CoPrtCnv::CoPrtCnvRadioTelegram;
TEST(PrtCnvMemberTest, ConstructorStoresIdAndIssi)
{
const PrtCnvMember member(17, 4711);
EXPECT_EQ(member.m_Id, 17);
EXPECT_EQ(member.m_ISSI, 4711);
EXPECT_EQ(member.m_ClaimCount, 0);
EXPECT_EQ(member.m_loggedInExerciseId, 0);
EXPECT_FALSE(member.m_Licensed);
}
TEST(PrtCnvMemberTest, PublicStateIsWritable)
{
PrtCnvMember member(1, 2);
member.m_ClaimCount = 3;
member.m_loggedInExerciseId = 42;
member.m_Licensed = true;
EXPECT_EQ(member.m_ClaimCount, 3);
EXPECT_EQ(member.m_loggedInExerciseId, 42);
EXPECT_TRUE(member.m_Licensed);
}
TEST(PrtCnvMemberTest, FragmentedListStartsEmpty)
{
const PrtCnvMember member(1, 2);
EXPECT_TRUE(member.isFragmentedListEmpty());
EXPECT_TRUE(member.getUnfragmentedTelegramData().isEmpty());
}
TEST(PrtCnvMemberTest, AddingAFragmentFillsTheList)
{
PrtCnvMember member(1, 2);
const CoPrtCnvRadioTelegram fragment(GEF_GEFECHTSFELDTELEGRAMM, 8, 0);
member.addFragmentedTelegram(fragment);
EXPECT_FALSE(member.isFragmentedListEmpty());
}
TEST(PrtCnvMemberTest, ClearFragmentedListEmptiesTheList)
{
PrtCnvMember member(1, 2);
const CoPrtCnvRadioTelegram fragment(GEF_GEFECHTSFELDTELEGRAMM, 8, 0);
member.addFragmentedTelegram(fragment);
ASSERT_FALSE(member.isFragmentedListEmpty());
member.clearFragmentedList();
EXPECT_TRUE(member.isFragmentedListEmpty());
}
TEST(PrtCnvMemberTest, ClearFragmentedListIsIdempotent)
{
PrtCnvMember member(1, 2);
member.clearFragmentedList();
member.clearFragmentedList();
EXPECT_TRUE(member.isFragmentedListEmpty());
}
TEST(PrtCnvMemberTest, TelegramIdFallsBackWhenNoFirstFragmentIsPresent)
{
PrtCnvMember member(1, 2);
// A telegram built from the plain telegram-id constructor is not fragmented,
// so no entry qualifies as the first fragment of a fragmented telegram.
const CoPrtCnvRadioTelegram fragment(GEF_GEFECHTSFELDTELEGRAMM, 8, 0);
member.addFragmentedTelegram(fragment);
EXPECT_EQ(member.getFragmentedTelegramId(), GEF_BESTAETIGUNG);
}
@@ -0,0 +1,100 @@
/**
* @file PrtCnvStoredTelegramTest.cpp
* @brief Unit tests for PrtCnv::PrtCnvStoredTelegram.
*
* PrtCnvStoredTelegram is a small value holder pairing a radio telegram with
* the database bookkeeping the DB thread needs. These tests pin down its
* defaults and its copy behaviour (the telegram is shared, not cloned).
*/
#include <gtest/gtest.h>
#include <memory>
#include "PrtCnvStoredTelegram.hpp"
#include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
#include <CoPrtCnv/tetra_telegram_ids.h>
using PrtCnv::PrtCnvStoredTelegram;
using N_CoPrtCnv::CoPrtCnvRadioTelegram;
namespace
{
// CoPrtCnvRadioTelegram has no default constructor; the telegram-id constructor
// is the cheapest way to obtain a well-formed instance.
std::shared_ptr<CoPrtCnvRadioTelegram> makeTelegram()
{
return std::make_shared<CoPrtCnvRadioTelegram>(GEF_GEFECHTSFELDTELEGRAMM, uint16_t(8), uint16_t(0));
}
} // namespace
TEST(PrtCnvStoredTelegramTest, ConstructorStoresTelegramAndDefaults)
{
const std::shared_ptr<CoPrtCnvRadioTelegram> telegram = makeTelegram();
const PrtCnvStoredTelegram stored(telegram);
EXPECT_EQ(stored.m_RadioTelegram, telegram);
EXPECT_EQ(stored.m_Id, 0);
EXPECT_FALSE(stored.m_WriteCounterChanged);
}
TEST(PrtCnvStoredTelegramTest, CopyKeepsTheSameTelegramInstance)
{
const std::shared_ptr<CoPrtCnvRadioTelegram> telegram = makeTelegram();
PrtCnvStoredTelegram original(telegram);
original.m_Id = 123;
original.m_WriteCounterChanged = true;
const PrtCnvStoredTelegram copy(original);
EXPECT_EQ(copy.m_RadioTelegram, original.m_RadioTelegram);
EXPECT_EQ(copy.m_Id, 123);
EXPECT_TRUE(copy.m_WriteCounterChanged);
}
TEST(PrtCnvStoredTelegramTest, AssignmentCopiesEveryField)
{
const std::shared_ptr<CoPrtCnvRadioTelegram> telegram = makeTelegram();
PrtCnvStoredTelegram source(telegram);
source.m_Id = 789;
source.m_WriteCounterChanged = true;
PrtCnvStoredTelegram target(makeTelegram());
target = source;
EXPECT_EQ(target.m_RadioTelegram, telegram);
EXPECT_EQ(target.m_Id, 789);
EXPECT_TRUE(target.m_WriteCounterChanged);
}
TEST(PrtCnvStoredTelegramTest, MovingLeavesTheTargetHoldingTheTelegram)
{
const std::shared_ptr<CoPrtCnvRadioTelegram> telegram = makeTelegram();
PrtCnvStoredTelegram original(telegram);
original.m_Id = 456;
original.m_WriteCounterChanged = true;
const PrtCnvStoredTelegram moved(std::move(original));
EXPECT_EQ(moved.m_RadioTelegram, telegram);
EXPECT_EQ(moved.m_Id, 456);
EXPECT_TRUE(moved.m_WriteCounterChanged);
}
TEST(PrtCnvStoredTelegramTest, StoredTelegramKeepsTheTelegramAlive)
{
std::weak_ptr<CoPrtCnvRadioTelegram> observer;
{
PrtCnvStoredTelegram stored(makeTelegram());
observer = stored.m_RadioTelegram;
EXPECT_FALSE(observer.expired());
}
EXPECT_TRUE(observer.expired());
}