From c8cfc1c5fcc6d9984bf2f6a462ed11c84579aaa6 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 10 Jul 2025 00:06:51 -0400 Subject: [PATCH] Autotest changes. --- tests/PC/autotest_cod5_pc.cpp | 2 +- tests/autotest_cod.cpp | 109 +++++++++++++++++++++++++++++++++ tests/autotest_cod.h | 110 ++++------------------------------ tests/autotest_xplor.cpp | 14 +++-- tests/autotest_xplor.h | 15 +++++ 5 files changed, 145 insertions(+), 105 deletions(-) create mode 100644 tests/autotest_cod.cpp create mode 100644 tests/autotest_xplor.h diff --git a/tests/PC/autotest_cod5_pc.cpp b/tests/PC/autotest_cod5_pc.cpp index 6a8e3c4..e4e6955 100644 --- a/tests/PC/autotest_cod5_pc.cpp +++ b/tests/PC/autotest_cod5_pc.cpp @@ -117,7 +117,7 @@ void AutoTest_COD5_PC::testFactory() { const QString testName = "Factory ingest: " + fastFilePath; - std::shared_ptr fastFile = FastFileFactory::Create(fastFilePath, true); + std::shared_ptr fastFile = FastFileFactory::Create(fastFilePath); const QString game = fastFile->GetGame(); bool correctGame = game == "COD5"; diff --git a/tests/autotest_cod.cpp b/tests/autotest_cod.cpp new file mode 100644 index 0000000..e91f076 --- /dev/null +++ b/tests/autotest_cod.cpp @@ -0,0 +1,109 @@ +#include "autotest_cod.h" + +const QList > &AutoTest_COD::getCollectedTestResults() const { + return m_subtestResults; +} + +void AutoTest_COD::recordResult(const QString &name, bool passed) { + m_subtestResults.append({ name, passed }); +} + +void AutoTest_COD::setFastFileDirectory(const QString aFastFileDir) { + mFastFileDirectory = aFastFileDir; +} + +QString AutoTest_COD::getFastFileDirectory() { + return mFastFileDirectory; +} + +void AutoTest_COD::setZoneFileDirectory(const QString aZoneFileDir) { + mZoneFileDirectory = aZoneFileDir; +} + +QString AutoTest_COD::getZoneFileDirectory() { + return mZoneFileDirectory; +} + +void AutoTest_COD::createDirectory(const QString aDir) { + QDir newDir("."); + newDir.mkpath(aDir); +} + +QStringList AutoTest_COD::findZoneFiles(const QString &aBaseDir, int aMaxIter) { + QList> fileList; + + QDirIterator it(aBaseDir, QStringList() << "*.zone", QDir::Files, QDirIterator::Subdirectories); + int i = 0; + while (it.hasNext() && i < aMaxIter) { + QString path = it.next(); + QFileInfo fi(path); + fileList.append(qMakePair(fi.size(), path)); + ++i; + } + + std::sort(fileList.begin(), fileList.end(), + [](const QPair &a, const QPair &b) { + return a.first < b.first; // sort by size + }); + + QStringList sorted; + for (const auto &pair : fileList) + sorted << pair.second; + + return sorted; +} + +QStringList AutoTest_COD::findFastFiles(const QString &aBaseDir, int aMaxIter) { + QList> fileList; + + QDirIterator it(aBaseDir, QStringList() << "*.ff", QDir::Files, QDirIterator::Subdirectories); + int i = 0; + while (it.hasNext() && i < aMaxIter) { + QString path = it.next(); + QFileInfo fi(path); + fileList.append(qMakePair(fi.size(), path)); + ++i; + } + + std::sort(fileList.begin(), fileList.end(), + [](const QPair &a, const QPair &b) { + return a.first < b.first; // sort by size + }); + + QStringList sorted; + for (const auto &pair : fileList) + sorted << pair.second; + + return sorted; +} + +void AutoTest_COD::testDecompression_data() { + QTest::addColumn("fastFilePath"); + + QStringList ffFiles = findFastFiles(getFastFileDirectory()); + for (const QString &filePath : ffFiles) { + QString fileName = QFileInfo(filePath).fileName(); + QTest::newRow(qPrintable(fileName)) << filePath; + } +} + +void AutoTest_COD::testCompression_data() { + QTest::addColumn("zoneFilePath"); + + QStringList zoneFiles = findZoneFiles(getZoneFileDirectory()); + for (const QString &filePath : zoneFiles) { + QString fileName = QFileInfo(filePath).fileName(); + QTest::newRow(qPrintable(fileName)) << filePath; + break; + } +} + +void AutoTest_COD::testFactory_data() { + QTest::addColumn("fastFilePath"); + + QStringList ffFiles = findFastFiles(getFastFileDirectory()); + for (const QString &filePath : ffFiles) { + QString fileName = QFileInfo(filePath).fileName(); + QTest::newRow(qPrintable(fileName)) << filePath; + } +} diff --git a/tests/autotest_cod.h b/tests/autotest_cod.h index ab62fc1..bc8a53c 100644 --- a/tests/autotest_cod.h +++ b/tests/autotest_cod.h @@ -3,8 +3,6 @@ #include -#include "fastfile_factory.h" - #define FILE_MAX 3 class AutoTest_COD : public QObject { @@ -14,112 +12,28 @@ protected: QList> m_subtestResults; public: - const QList>& getCollectedTestResults() const { - return m_subtestResults; - } - void recordResult(const QString& name, bool passed) { - m_subtestResults.append({ name, passed }); - } - void setFastFileDirectory(const QString aFastFileDir) { - mFastFileDirectory = aFastFileDir; - } - QString getFastFileDirectory() { - return mFastFileDirectory; - } + const QList>& getCollectedTestResults() const; + void recordResult(const QString& name, bool passed); + void setFastFileDirectory(const QString aFastFileDir); + QString getFastFileDirectory(); - void setZoneFileDirectory(const QString aZoneFileDir) { - mZoneFileDirectory = aZoneFileDir; - } - QString getZoneFileDirectory() { - return mZoneFileDirectory; - } + void setZoneFileDirectory(const QString aZoneFileDir); + QString getZoneFileDirectory(); - void createDirectory(const QString aDir) { - QDir newDir("."); - newDir.mkpath(aDir); - } - QStringList findZoneFiles(const QString &aBaseDir, int aMaxIter = FILE_MAX) { - QList> fileList; + void createDirectory(const QString aDir); + QStringList findZoneFiles(const QString &aBaseDir, int aMaxIter = FILE_MAX); - QDirIterator it(aBaseDir, QStringList() << "*.zone", QDir::Files, QDirIterator::Subdirectories); - int i = 0; - while (it.hasNext() && i < aMaxIter) { - QString path = it.next(); - QFileInfo fi(path); - fileList.append(qMakePair(fi.size(), path)); - ++i; - } - - std::sort(fileList.begin(), fileList.end(), - [](const QPair &a, const QPair &b) { - return a.first < b.first; // sort by size - }); - - QStringList sorted; - for (const auto &pair : fileList) - sorted << pair.second; - - return sorted; - } - - QStringList findFastFiles(const QString &aBaseDir, int aMaxIter = FILE_MAX) { - QList> fileList; - - QDirIterator it(aBaseDir, QStringList() << "*.ff", QDir::Files, QDirIterator::Subdirectories); - int i = 0; - while (it.hasNext() && i < aMaxIter) { - QString path = it.next(); - QFileInfo fi(path); - fileList.append(qMakePair(fi.size(), path)); - ++i; - } - - std::sort(fileList.begin(), fileList.end(), - [](const QPair &a, const QPair &b) { - return a.first < b.first; // sort by size - }); - - QStringList sorted; - for (const auto &pair : fileList) - sorted << pair.second; - - return sorted; - } + QStringList findFastFiles(const QString &aBaseDir, int aMaxIter = FILE_MAX); virtual void initTestCase() = 0; - void testDecompression_data() { - QTest::addColumn("fastFilePath"); - - QStringList ffFiles = findFastFiles(getFastFileDirectory()); - for (const QString &filePath : ffFiles) { - QString fileName = QFileInfo(filePath).fileName(); - QTest::newRow(qPrintable(fileName)) << filePath; - } - } + void testDecompression_data(); virtual void testDecompression() = 0; - void testCompression_data() { - QTest::addColumn("zoneFilePath"); - - QStringList zoneFiles = findZoneFiles(getZoneFileDirectory()); - for (const QString &filePath : zoneFiles) { - QString fileName = QFileInfo(filePath).fileName(); - QTest::newRow(qPrintable(fileName)) << filePath; - break; - } - } + void testCompression_data(); virtual void testCompression() = 0; - void testFactory_data() { - QTest::addColumn("fastFilePath"); - - QStringList ffFiles = findFastFiles(getFastFileDirectory()); - for (const QString &filePath : ffFiles) { - QString fileName = QFileInfo(filePath).fileName(); - QTest::newRow(qPrintable(fileName)) << filePath; - } - } + void testFactory_data(); virtual void testFactory() = 0; virtual void cleanupTestCase() = 0; diff --git a/tests/autotest_xplor.cpp b/tests/autotest_xplor.cpp index bb24eb4..8015aba 100644 --- a/tests/autotest_xplor.cpp +++ b/tests/autotest_xplor.cpp @@ -1,9 +1,11 @@ -#include +#include "autotest_xplor.h" -class AutoTest_XPlor : public QObject { - Q_OBJECT +void AutoTest_XPlor::initTestCase() +{ -private slots: -}; +} -#include "autotest_xplor.moc" +void AutoTest_XPlor::cleanupTestCase() +{ + +} diff --git a/tests/autotest_xplor.h b/tests/autotest_xplor.h new file mode 100644 index 0000000..27fc532 --- /dev/null +++ b/tests/autotest_xplor.h @@ -0,0 +1,15 @@ +#ifndef AUTOTEST_XPLOR_H +#define AUTOTEST_XPLOR_H + +#include + +class AutoTest_XPlor : public QObject { + Q_OBJECT + + void initTestCase(); + void cleanupTestCase(); + +private slots: +}; + +#endif // AUTOTEST_XPLOR_H