0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add debug printing for Version

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2023-01-19 09:46:35 +02:00 committed by Edgars Cīrulis
parent 730f714e97
commit 9934537e19
No known key found for this signature in database
GPG Key ID: 307C4E4663F1FCC3
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
launcher/Version.cpp
View File

@ -1,5 +1,6 @@
#include "Version.h" #include "Version.h"
#include <QDebug>
#include <QUrl> #include <QUrl>
#include <QRegularExpression> #include <QRegularExpression>
#include <QRegularExpressionMatch> #include <QRegularExpressionMatch>
@ -93,3 +94,20 @@ void Version::parse()
m_sections.append(Section(currentSection)); m_sections.append(Section(currentSection));
} }
} }
/// qDebug print support for the BlockedMod struct
QDebug operator<<(QDebug debug, const Version& v)
{
QDebugStateSaver saver(debug);
debug.nospace() << "Version{ string: " << v.toString() << ", sections: [ ";
for (auto s : v.m_sections) {
debug.nospace() << s.m_fullString << ", ";
}
debug.nospace() << " ]" << " }";
return debug;
}

7
launcher/Version.h
View File

@ -35,6 +35,7 @@
#pragma once #pragma once
#include <QDebug>
#include <QString> #include <QString>
#include <QStringView> #include <QStringView>
#include <QList> #include <QList>
@ -59,6 +60,8 @@ public:
return m_string; return m_string;
} }
friend QDebug operator<<(QDebug debug, const Version& v);
private: private:
QString m_string; QString m_string;
struct Section struct Section
@ -143,7 +146,11 @@ private:
} }
} }
}; };
QList<Section> m_sections; QList<Section> m_sections;
void parse(); void parse();
}; };

3
tests/CMakeLists.txt
View File

@ -53,3 +53,6 @@ ecm_add_test(Packwiz_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR
ecm_add_test(Index_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test ecm_add_test(Index_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
TEST_NAME Index) TEST_NAME Index)
ecm_add_test(Version_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
TEST_NAME Version)

3
tests/Version_test.cpp
View File

@ -15,7 +15,6 @@
#include <QTest> #include <QTest>
#include <TestUtil.h>
#include <Version.h> #include <Version.h>
class ModUtilsTest : public QObject class ModUtilsTest : public QObject
@ -74,6 +73,8 @@ private slots:
const auto v1 = Version(first); const auto v1 = Version(first);
const auto v2 = Version(second); const auto v2 = Version(second);
qDebug() << v1 << "vs" << v2;
QCOMPARE(v1 < v2, lessThan); QCOMPARE(v1 < v2, lessThan);
QCOMPARE(v1 > v2, !lessThan && !equal); QCOMPARE(v1 > v2, !lessThan && !equal);
QCOMPARE(v1 == v2, equal); QCOMPARE(v1 == v2, equal);