Restore in-scope files missing from the merge and scope-aware CMakeLists
The merge from story/release-validation-scope only carried files that existed at the common base or on that branch. In-scope files added on story/release-2-cleanup after the base (per-module unit-test dirs, the Release 2 driver and rpmbuild script) were missing, breaking ADD_SUBDIRECTORY(unit-test) references. - Restore the 33 missing in-scope files from story/release-2-cleanup. - Lts/Common/CMakeLists.txt and LtsUtilsGui/CMakeLists.txt: take the story/release-2-cleanup versions (the validation versions still reference out-of-scope subdirectories: httq, LtsRestClient, LtsWebSocket, ConnectDialog, StyleManager).
This commit is contained in:
1 parent
cfe15c72c4
commit
262fd226f9
35 files changed
+6856
-16
No files matched your search
@@ -0,0 +1,25 @@
|
||||
#
|
||||
# Unit tests for the nglsettings module.
|
||||
# One test executable per module, each registered with ctest.
|
||||
#
|
||||
if (NOT BUILD_TESTING)
|
||||
return()
|
||||
endif()
|
||||
|
||||
# --- nglsettings: QSettings-backed settings + connection-name mapping.
|
||||
# --- setPortOffset/setServerHostname have no export macro and the tree builds
|
||||
# --- with hidden visibility, so those symbols are not exported from
|
||||
# --- libnglsettings - the module source is compiled directly into the test
|
||||
# --- (same pattern as the LogView test in TetraIF/unit-test).
|
||||
if (TARGET nglsettings)
|
||||
ADD_EXECUTABLE(nglsettings_unit_test
|
||||
nglsettings_unit_test.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../nglsettings_connections.cpp)
|
||||
TARGET_LINK_LIBRARIES(nglsettings_unit_test
|
||||
nglsettings
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::Test
|
||||
)
|
||||
ADD_TEST(NAME nglsettings_unit_test COMMAND $<TARGET_FILE:nglsettings_unit_test>)
|
||||
endif()
|
||||
@@ -0,0 +1,253 @@
|
||||
//
|
||||
// Unit tests for the nglsettings module (Z/src/nglsettings): the Settings
|
||||
// getters (integer, float, double, boolean, string, grouped and ungrouped),
|
||||
// database password derivation, AVS server port, base/temp path logic, and the
|
||||
// Connections namespace (port lookup with offset, host name resolution and
|
||||
// connection naming).
|
||||
//
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <nglsettings/nglsettings_connections.h>
|
||||
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtCore/QTemporaryDir>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
class nglsettings_unit_test : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
private:
|
||||
QTemporaryDir m_tmpDir;
|
||||
QString m_iniPath;
|
||||
|
||||
private slots:
|
||||
void initTestCase();
|
||||
void cleanupTestCase();
|
||||
|
||||
// --- Settings getters (instance, from a controlled ini file) ----------
|
||||
void testGetInteger();
|
||||
void testGetIntegerGrouped();
|
||||
void testGetFloat();
|
||||
void testGetDouble();
|
||||
void testGetBoolean();
|
||||
void testGetString();
|
||||
void testGetIntegerDefaultOnMissing();
|
||||
void testGetIntegerDefaultOnInvalid();
|
||||
|
||||
// --- Database / AVS configuration -------------------------------------
|
||||
void testDatabasePasswordDefault();
|
||||
void testDatabasePasswordFromUser();
|
||||
void testDatabaseDriver();
|
||||
void testAvsServerPortDefault();
|
||||
void testAvsServerPortOverride();
|
||||
|
||||
// --- Path logic -------------------------------------------------------
|
||||
void testBasePath();
|
||||
void testTempPath();
|
||||
|
||||
// --- Connections namespace --------------------------------------------
|
||||
void testConnectionsIniFile();
|
||||
void testConnectionsPortOffset();
|
||||
void testConnectionsHostName();
|
||||
void testConnectionsServerHostname();
|
||||
void testConnectionsName();
|
||||
};
|
||||
|
||||
void nglsettings_unit_test::initTestCase()
|
||||
{
|
||||
QVERIFY(m_tmpDir.isValid());
|
||||
m_iniPath = m_tmpDir.path() + QStringLiteral("/test.ini");
|
||||
QSettings ini(m_iniPath, QSettings::IniFormat);
|
||||
// Values used by the generic getter tests
|
||||
ini.setValue(QStringLiteral("test/intValue"), 42);
|
||||
ini.setValue(QStringLiteral("grp/intValueGrouped"), 100);
|
||||
ini.setValue(QStringLiteral("test/floatValue"), 3.14f);
|
||||
ini.setValue(QStringLiteral("test/doubleValue"), 2.71828);
|
||||
ini.setValue(QStringLiteral("test/boolValue"), true);
|
||||
ini.setValue(QStringLiteral("test/strValue"), QStringLiteral("hello"));
|
||||
ini.setValue(QStringLiteral("test/badInt"), QStringLiteral("notanumber"));
|
||||
// AVS / database values
|
||||
ini.setValue(QStringLiteral("avs/serverport_ave"), 64321);
|
||||
ini.setValue(QStringLiteral("db/driver"), QStringLiteral("QODBC"));
|
||||
ini.sync();
|
||||
|
||||
// Values used by the Connections tests (port < 100 to exercise the offset
|
||||
// path; host overrides to exercise the override path)
|
||||
QSettings conn(m_iniPath, QSettings::IniFormat);
|
||||
conn.setValue(QStringLiteral("LVS/port"), 50);
|
||||
conn.setValue(QStringLiteral("PWS_WEBSOCKET/port"), 5701);
|
||||
conn.setValue(QStringLiteral("AVS_WORKSTATION/host"), QStringLiteral("10.0.0.1"));
|
||||
conn.sync();
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::cleanupTestCase()
|
||||
{
|
||||
qunsetenv("GFS_PATH");
|
||||
qunsetenv("TMP_PATH");
|
||||
}
|
||||
|
||||
// --- Settings getters -----------------------------------------------------
|
||||
|
||||
void nglsettings_unit_test::testGetInteger()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(settings.getInteger(QStringLiteral("test/intValue"), 0), 42);
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testGetIntegerGrouped()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(settings.getInteger(QStringLiteral("grp"), QStringLiteral("intValueGrouped"), 0), 100);
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testGetFloat()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(settings.getFloat(QStringLiteral("test/floatValue"), 0.f), 3.14f);
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testGetDouble()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(settings.getDouble(QStringLiteral("test/doubleValue"), 0.0), 2.71828);
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testGetBoolean()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(settings.getBoolean(QStringLiteral("test/boolValue"), false), true);
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testGetString()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(settings.getString(QStringLiteral("test/strValue"), QStringLiteral("fallback")),
|
||||
QStringLiteral("hello"));
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testGetIntegerDefaultOnMissing()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(settings.getInteger(QStringLiteral("does/not/exist"), 7), 7);
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testGetIntegerDefaultOnInvalid()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
// "test/badInt" is the string "notanumber", so toInt fails and the
|
||||
// default value 7 is returned.
|
||||
QCOMPARE(settings.getInteger(QStringLiteral("test/badInt"), 7), 7);
|
||||
}
|
||||
|
||||
// --- Database / AVS configuration -----------------------------------------
|
||||
|
||||
void nglsettings_unit_test::testDatabasePasswordDefault()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(settings.databasePassword(QString()), QStringLiteral("ctc11de"));
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testDatabasePasswordFromUser()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(settings.databasePassword(QStringLiteral("ctc_aar")),
|
||||
QStringLiteral("ctc11de"));
|
||||
QCOMPARE(settings.databasePassword(QStringLiteral("foobar_x")),
|
||||
QStringLiteral("foobar11de"));
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testDatabaseDriver()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(settings.databaseDriver(), QStringLiteral("QODBC"));
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testAvsServerPortDefault()
|
||||
{
|
||||
// Use a clean ini file that does NOT define avs/serverport_ave
|
||||
const QString cleanPath = m_tmpDir.path() + QStringLiteral("/clean.ini");
|
||||
{
|
||||
QSettings s(cleanPath, QSettings::IniFormat);
|
||||
s.sync();
|
||||
}
|
||||
NGL::Settings settings(cleanPath);
|
||||
QCOMPARE(settings.avsServerPortAVE(), static_cast<quint16>(6350));
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testAvsServerPortOverride()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
// m_iniPath has avs/serverport_ave = 64321
|
||||
QCOMPARE(settings.avsServerPortAVE(), static_cast<quint16>(64321));
|
||||
}
|
||||
|
||||
// --- Path logic -----------------------------------------------------------
|
||||
|
||||
void nglsettings_unit_test::testBasePath()
|
||||
{
|
||||
qputenv("GFS_PATH", m_tmpDir.path().toLocal8Bit().constData());
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(settings.basePath(), m_tmpDir.path() + QStringLiteral("/"));
|
||||
qunsetenv("GFS_PATH");
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testTempPath()
|
||||
{
|
||||
qputenv("TMP_PATH", m_tmpDir.path().toLocal8Bit().constData());
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(settings.tempPath(), m_tmpDir.path() + QStringLiteral("/"));
|
||||
qunsetenv("TMP_PATH");
|
||||
}
|
||||
|
||||
// --- Connections namespace ------------------------------------------------
|
||||
|
||||
void nglsettings_unit_test::testConnectionsIniFile()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(NGL::Connections::iniFile(), m_iniPath);
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testConnectionsPortOffset()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
NGL::Connections::setPortOffset(9000);
|
||||
// LVS base port is 94; ini overrides it to 50, which is < 100, so the
|
||||
// offset is applied: 9000 + 50 = 9050.
|
||||
QCOMPARE(NGL::Connections::port(NGL::Connections::eConnection::LVS), static_cast<unsigned short>(9050));
|
||||
// PWS_WEBSOCKET base port is 5701; ini keeps it at 5701, which is >= 100, so
|
||||
// no offset is applied.
|
||||
QCOMPARE(NGL::Connections::port(NGL::Connections::eConnection::PWS_WEBSOCKET), static_cast<unsigned short>(5701));
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testConnectionsHostName()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
QCOMPARE(NGL::Connections::hostName(NGL::Connections::eConnection::AVS_WORKSTATION),
|
||||
QStringLiteral("10.0.0.1"));
|
||||
QCOMPARE(NGL::Connections::hostName(NGL::Connections::eConnection::AVS_ROOT),
|
||||
QStringLiteral("EXCAVS01"));
|
||||
QCOMPARE(NGL::Connections::hostName(NGL::Connections::eConnection::PWS_WEBSOCKET),
|
||||
QStringLiteral("EXCTDS01"));
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testConnectionsServerHostname()
|
||||
{
|
||||
NGL::Settings settings(m_iniPath);
|
||||
NGL::Connections::setServerHostname(QStringLiteral("EXCTDS99"));
|
||||
QCOMPARE(NGL::Connections::hostName(NGL::Connections::eConnection::PWS_WEBSOCKET),
|
||||
QStringLiteral("EXCTDS99"));
|
||||
NGL::Connections::setServerHostname(QStringLiteral("EXCTDS01"));
|
||||
}
|
||||
|
||||
void nglsettings_unit_test::testConnectionsName()
|
||||
{
|
||||
QCOMPARE(NGL::Connections::connectionName(NGL::Connections::eConnection::LVS),
|
||||
QStringLiteral("LVS"));
|
||||
QCOMPARE(NGL::Connections::connectionName(NGL::Connections::eConnection::AVS_ROOT),
|
||||
QStringLiteral("AVS_ROOT"));
|
||||
}
|
||||
|
||||
QTEST_MAIN(nglsettings_unit_test)
|
||||
#include "nglsettings_unit_test.moc"
|
||||
Reference in new issue
Block a user