From 21570a03fbb2973712f1ffe5f1bb4d6095e53e4c Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri, 18 Apr 2025 15:22:39 -0700
Subject: [PATCH] feat(xml-logs): finish tests

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/BaseInstance.h                       |   3 -
 launcher/MessageLevel.cpp                     |  17 +-
 launcher/launch/LaunchTask.cpp                |  12 +-
 launcher/launch/LogModel.cpp                  |   8 +
 launcher/launch/LogModel.h                    |   2 +
 launcher/logs/LogParser.cpp                   |  50 +-
 launcher/logs/LogParser.h                     |   5 +-
 launcher/minecraft/MinecraftInstance.cpp      |  43 -
 launcher/minecraft/MinecraftInstance.h        |   3 -
 launcher/ui/pages/instance/OtherLogsPage.cpp  |   7 +-
 tests/CMakeLists.txt                          |   4 +
 tests/XmlLogs_test.cpp                        | 104 +-
 .../TestLogs/TerraFirmaGreg-Modern-levels.txt | 945 ++++++++++++++++++
 .../TerraFirmaGreg-Modern-xml-levels.txt      | 869 ++++++++++++++++
 .../TestLogs/vanilla-1.21.5-levels.txt        |  25 +
 15 files changed, 2006 insertions(+), 91 deletions(-)
 create mode 100644 tests/testdata/TestLogs/TerraFirmaGreg-Modern-levels.txt
 create mode 100644 tests/testdata/TestLogs/TerraFirmaGreg-Modern-xml-levels.txt
 create mode 100644 tests/testdata/TestLogs/vanilla-1.21.5-levels.txt

diff --git a/launcher/BaseInstance.h b/launcher/BaseInstance.h
index 2a2b4dc4a..99ce49a62 100644
--- a/launcher/BaseInstance.h
+++ b/launcher/BaseInstance.h
@@ -151,9 +151,6 @@ class BaseInstance : public QObject, public std::enable_shared_from_this<BaseIns
     void setManagedPack(const QString& type, const QString& id, const QString& name, const QString& versionId, const QString& version);
     void copyManagedPack(BaseInstance& other);
 
-    /// guess log level from a line of game log
-    virtual MessageLevel::Enum guessLevel([[maybe_unused]] const QString& line, MessageLevel::Enum level) { return level; }
-
     virtual QStringList extraArguments();
 
     /// Traits. Normally inside the version, depends on instance implementation.
diff --git a/launcher/MessageLevel.cpp b/launcher/MessageLevel.cpp
index d0e8809ec..2bd6ecc00 100644
--- a/launcher/MessageLevel.cpp
+++ b/launcher/MessageLevel.cpp
@@ -2,21 +2,22 @@
 
 MessageLevel::Enum MessageLevel::getLevel(const QString& levelName)
 {
-    if (levelName == "Launcher")
+    QString name = levelName.toUpper();
+    if (name == "LAUNCHER")
         return MessageLevel::Launcher;
-    else if (levelName == "Trace")
+    else if (name == "TRACE")
         return MessageLevel::Trace;
-    else if (levelName == "Debug")
+    else if (name == "DEBUG")
         return MessageLevel::Debug;
-    else if (levelName == "Info")
+    else if (name == "INFO")
         return MessageLevel::Info;
-    else if (levelName == "Message")
+    else if (name == "MESSAGE")
         return MessageLevel::Message;
-    else if (levelName == "Warning")
+    else if (name == "WARNING" || name == "WARN")
         return MessageLevel::Warning;
-    else if (levelName == "Error")
+    else if (name == "ERROR")
         return MessageLevel::Error;
-    else if (levelName == "Fatal")
+    else if (name == "FATAL")
         return MessageLevel::Fatal;
     // Skip PrePost, it's not exposed to !![]!
     // Also skip StdErr and StdOut
diff --git a/launcher/launch/LaunchTask.cpp b/launcher/launch/LaunchTask.cpp
index e1eaf8b1f..e3e8eaec2 100644
--- a/launcher/launch/LaunchTask.cpp
+++ b/launcher/launch/LaunchTask.cpp
@@ -37,7 +37,6 @@
 
 #include "launch/LaunchTask.h"
 #include <assert.h>
-#include <qlogging.h>
 #include <QAnyStringView>
 #include <QCoreApplication>
 #include <QDebug>
@@ -237,9 +236,9 @@ bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel::Enum level)
         model.append(MessageLevel::Error, tr("[Log4j Parse Error] Failed to parse log4j log event: %1").arg(err.value().errMessage));
         return false;
     } else {
-        if (items.has_value()) {
+        if (!items.isEmpty()) {
             auto& model = *getLogModel();
-            for (auto const& item : items.value()) {
+            for (auto const& item : items) {
                 if (std::holds_alternative<LogParser::LogEntry>(item)) {
                     auto entry = std::get<LogParser::LogEntry>(item);
                     auto msg = QString("[%1] [%2/%3] [%4]: %5")
@@ -252,7 +251,7 @@ bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel::Enum level)
                     model.append(entry.level, msg);
                 } else if (std::holds_alternative<LogParser::PlainText>(item)) {
                     auto msg = std::get<LogParser::PlainText>(item).message;
-                    level = m_instance->guessLevel(msg, level);
+                    level = LogParser::guessLevel(msg, model.previousLevel());
                     msg = censorPrivateInfo(msg);
                     model.append(level, msg);
                 }
@@ -281,15 +280,16 @@ void LaunchTask::onLogLine(QString line, MessageLevel::Enum level)
         level = innerLevel;
     }
 
+    auto& model = *getLogModel();
+
     // If the level is still undetermined, guess level
     if (level == MessageLevel::Unknown) {
-        level = m_instance->guessLevel(line, level);
+        level = LogParser::guessLevel(line, model.previousLevel());
     }
 
     // censor private user info
     line = censorPrivateInfo(line);
 
-    auto& model = *getLogModel();
     model.append(level, line);
 }
 
diff --git a/launcher/launch/LogModel.cpp b/launcher/launch/LogModel.cpp
index 45aac6099..5d32be9a2 100644
--- a/launcher/launch/LogModel.cpp
+++ b/launcher/launch/LogModel.cpp
@@ -166,3 +166,11 @@ bool LogModel::isOverFlow()
 {
     return m_numLines >= m_maxLines && m_stopOnOverflow;
 }
+
+
+MessageLevel::Enum LogModel::previousLevel() {
+    if (!m_content.isEmpty()) {
+        return m_content.last().level;
+    }
+    return MessageLevel::Unknown;
+}
diff --git a/launcher/launch/LogModel.h b/launcher/launch/LogModel.h
index ba7b14487..f4664c47c 100644
--- a/launcher/launch/LogModel.h
+++ b/launcher/launch/LogModel.h
@@ -31,6 +31,8 @@ class LogModel : public QAbstractListModel {
     void setColorLines(bool state);
     bool colorLines() const;
 
+    MessageLevel::Enum previousLevel();
+
     enum Roles { LevelRole = Qt::UserRole };
 
    private /* types */:
diff --git a/launcher/logs/LogParser.cpp b/launcher/logs/LogParser.cpp
index 294036134..c5d2a8647 100644
--- a/launcher/logs/LogParser.cpp
+++ b/launcher/logs/LogParser.cpp
@@ -19,6 +19,9 @@
 
 #include "LogParser.h"
 
+#include <QRegularExpression>
+#include "MessageLevel.h"
+
 void LogParser::appendLine(QAnyStringView data)
 {
     if (!m_partialData.isEmpty()) {
@@ -202,7 +205,7 @@ std::optional<LogParser::ParsedItem> LogParser::parseNext()
     }
 }
 
-std::optional<QList<LogParser::ParsedItem>> LogParser::parseAvailable()
+QList<LogParser::ParsedItem> LogParser::parseAvailable()
 {
     QList<LogParser::ParsedItem> items;
     bool doNext = true;
@@ -320,3 +323,48 @@ std::optional<LogParser::ParsedItem> LogParser::parseLog4J()
 
     throw std::runtime_error("unreachable: already verified this was a complete log4j:Event");
 }
+
+MessageLevel::Enum LogParser::guessLevel(const QString& line, MessageLevel::Enum level)
+{
+    static const QRegularExpression LINE_WITH_LEVEL("^\\[(?<timestamp>[0-9:]+)\\] \\[[^/]+/(?<level>[^\\]]+)\\]");
+    auto match = LINE_WITH_LEVEL.match(line);
+    if (match.hasMatch()) {
+        // New style logs from log4j
+        QString timestamp = match.captured("timestamp");
+        QString levelStr = match.captured("level");
+        if (levelStr == "INFO")
+            level = MessageLevel::Info;
+        if (levelStr == "WARN")
+            level = MessageLevel::Warning;
+        if (levelStr == "ERROR")
+            level = MessageLevel::Error;
+        if (levelStr == "FATAL")
+            level = MessageLevel::Fatal;
+        if (levelStr == "TRACE" || levelStr == "DEBUG")
+            level = MessageLevel::Debug;
+    } else {
+        // Old style forge logs
+        if (line.contains("[INFO]") || line.contains("[CONFIG]") || line.contains("[FINE]") || line.contains("[FINER]") ||
+            line.contains("[FINEST]"))
+            level = MessageLevel::Info;
+        if (line.contains("[SEVERE]") || line.contains("[STDERR]"))
+            level = MessageLevel::Error;
+        if (line.contains("[WARNING]"))
+            level = MessageLevel::Warning;
+        if (line.contains("[DEBUG]"))
+            level = MessageLevel::Debug;
+    }
+    if (level != MessageLevel::Unknown)
+        return level;
+
+    if (line.contains("overwriting existing"))
+        return MessageLevel::Fatal;
+
+    // NOTE: this diverges from the real regexp. no unicode, the first section is + instead of *
+    // static const QRegularExpression JAVA_EXCEPTION(
+    //     R"(Exception in thread|...\d more$|(\s+at |Caused by: )([a-zA-Z_$][a-zA-Z\d_$]*\.)+[a-zA-Z_$][a-zA-Z\d_$]*)|([a-zA-Z_$][a-zA-Z\d_$]*\.)+[a-zA-Z_$][a-zA-Z\d_$]*(Exception|Error|Throwable)");
+    //
+    // if (line.contains(JAVA_EXCEPTION))
+    //     return MessageLevel::Error;
+    return MessageLevel::Info;
+}
diff --git a/launcher/logs/LogParser.h b/launcher/logs/LogParser.h
index 462ea43cf..8b23754ac 100644
--- a/launcher/logs/LogParser.h
+++ b/launcher/logs/LogParser.h
@@ -55,9 +55,12 @@ class LogParser {
 
     void appendLine(QAnyStringView data);
     std::optional<ParsedItem> parseNext();
-    std::optional<QList<ParsedItem>> parseAvailable();
+    QList<ParsedItem> parseAvailable();
     std::optional<Error> getError();
 
+    /// guess log level from a line of game log
+    static MessageLevel::Enum guessLevel(const QString& line, MessageLevel::Enum level);
+
    protected:
     MessageLevel::Enum parseLogLevel(const QString& level);
     std::optional<LogEntry> parseAttributes();
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index ec136ede0..e8db24b10 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -1004,49 +1004,6 @@ QMap<QString, QString> MinecraftInstance::createCensorFilterFromSession(AuthSess
     return filter;
 }
 
-MessageLevel::Enum MinecraftInstance::guessLevel(const QString& line, MessageLevel::Enum level)
-{
-    if (line.contains("overwriting existing"))
-        return MessageLevel::Fatal;
-
-    // NOTE: this diverges from the real regexp. no unicode, the first section is + instead of *
-    static const QRegularExpression JAVA_EXCEPTION(
-        R"(Exception in thread|...\d more$|(\s+at |Caused by: )([a-zA-Z_$][a-zA-Z\d_$]*\.)+[a-zA-Z_$][a-zA-Z\d_$]*)|([a-zA-Z_$][a-zA-Z\d_$]*\.)+[a-zA-Z_$][a-zA-Z\d_$]*(Exception|Error|Throwable)");
-
-    if (line.contains(JAVA_EXCEPTION))
-        return MessageLevel::Error;
-
-    static const QRegularExpression LINE_WITH_LEVEL("\\[(?<timestamp>[0-9:]+)\\] \\[[^/]+/(?<level>[^\\]]+)\\]");
-    auto match = LINE_WITH_LEVEL.match(line);
-    if (match.hasMatch()) {
-        // New style logs from log4j
-        QString timestamp = match.captured("timestamp");
-        QString levelStr = match.captured("level");
-        if (levelStr == "INFO")
-            level = MessageLevel::Message;
-        if (levelStr == "WARN")
-            level = MessageLevel::Warning;
-        if (levelStr == "ERROR")
-            level = MessageLevel::Error;
-        if (levelStr == "FATAL")
-            level = MessageLevel::Fatal;
-        if (levelStr == "TRACE" || levelStr == "DEBUG")
-            level = MessageLevel::Debug;
-    } else {
-        // Old style forge logs
-        if (line.contains("[INFO]") || line.contains("[CONFIG]") || line.contains("[FINE]") || line.contains("[FINER]") ||
-            line.contains("[FINEST]"))
-            level = MessageLevel::Message;
-        if (line.contains("[SEVERE]") || line.contains("[STDERR]"))
-            level = MessageLevel::Error;
-        if (line.contains("[WARNING]"))
-            level = MessageLevel::Warning;
-        if (line.contains("[DEBUG]"))
-            level = MessageLevel::Debug;
-    }
-    return level;
-}
-
 IPathMatcher::Ptr MinecraftInstance::getLogFileMatcher()
 {
     auto combined = std::make_shared<MultiMatcher>();
diff --git a/launcher/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h
index 5d9bb45ef..cd5cd1ddc 100644
--- a/launcher/minecraft/MinecraftInstance.h
+++ b/launcher/minecraft/MinecraftInstance.h
@@ -139,9 +139,6 @@ class MinecraftInstance : public BaseInstance {
     QProcessEnvironment createEnvironment() override;
     QProcessEnvironment createLaunchEnvironment() override;
 
-    /// guess log level from a line of minecraft log
-    MessageLevel::Enum guessLevel(const QString& line, MessageLevel::Enum level) override;
-
     IPathMatcher::Ptr getLogFileMatcher() override;
 
     QString getLogFileRoot() override;
diff --git a/launcher/ui/pages/instance/OtherLogsPage.cpp b/launcher/ui/pages/instance/OtherLogsPage.cpp
index 0aeb942a8..8b8c64c6d 100644
--- a/launcher/ui/pages/instance/OtherLogsPage.cpp
+++ b/launcher/ui/pages/instance/OtherLogsPage.cpp
@@ -179,7 +179,9 @@ void OtherLogsPage::on_btnReload_clicked()
             showTooBig();
             return;
         }
-        auto handleLine = [this](QString line) {
+        MessageLevel::Enum last = MessageLevel::Unknown;
+
+        auto handleLine = [this, &last](QString line) {
             if (line.isEmpty())
                 return false;
             if (line.back() == '\n')
@@ -194,9 +196,10 @@ void OtherLogsPage::on_btnReload_clicked()
 
             // If the level is still undetermined, guess level
             if (level == MessageLevel::StdErr || level == MessageLevel::StdOut || level == MessageLevel::Unknown) {
-                level = m_instance->guessLevel(line, level);
+                level = LogParser::guessLevel(line, last);
             }
 
+            last = level;
             m_model->append(level, line);
             return m_model->isOverFlow();
         };
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2dedb47cc..31b887ff1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -62,3 +62,7 @@ ecm_add_test(MetaComponentParse_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VE
 
 ecm_add_test(CatPack_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME CatPack)
+
+
+ecm_add_test(XmlLogs_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+    TEST_NAME XmlLogs)
diff --git a/tests/XmlLogs_test.cpp b/tests/XmlLogs_test.cpp
index 072448c4e..e01238570 100644
--- a/tests/XmlLogs_test.cpp
+++ b/tests/XmlLogs_test.cpp
@@ -23,9 +23,11 @@
 
 #include <QList>
 #include <QObject>
+#include <QRegularExpression>
 #include <QString>
 
-#include <optional>
+#include <algorithm>
+#include <iterator>
 
 #include <FileSystem.h>
 #include <MessageLevel.h>
@@ -42,16 +44,62 @@ class XmlLogParseTest : public QObject {
 
         QString shortXml = QString::fromUtf8(FS::read(FS::PathCombine(source, "vanilla-1.21.5.xml.log")));
         QString shortText = QString::fromUtf8(FS::read(FS::PathCombine(source, "vanilla-1.21.5.text.log")));
+        QStringList shortTextLevels_s = QString::fromUtf8(FS::read(FS::PathCombine(source, "vanilla-1.21.5-levels.txt")))
+                                            .split(QRegularExpression("\n|\r\n|\r"), Qt::SkipEmptyParts);
+
+        QList<MessageLevel::Enum> shortTextLevels;
+        shortTextLevels.reserve(24);
+        std::transform(shortTextLevels_s.cbegin(), shortTextLevels_s.cend(), std::back_inserter(shortTextLevels),
+                       [](const QString& line) { return MessageLevel::getLevel(line.trimmed()); });
 
         QString longXml = QString::fromUtf8(FS::read(FS::PathCombine(source, "TerraFirmaGreg-Modern-forge.xml.log")));
         QString longText = QString::fromUtf8(FS::read(FS::PathCombine(source, "TerraFirmaGreg-Modern-forge.text.log")));
-        QTest::addColumn<QString>("text");
-        QTest::addColumn<QString>("xml");
-        QTest::newRow("short-vanilla") << shortText << shortXml;
-        QTest::newRow("long-forge") << longText << longXml;
+        QStringList longTextLevels_s = QString::fromUtf8(FS::read(FS::PathCombine(source, "TerraFirmaGreg-Modern-levels.txt")))
+                                           .split(QRegularExpression("\n|\r\n|\r"), Qt::SkipEmptyParts);
+        QStringList longTextLevelsXml_s = QString::fromUtf8(FS::read(FS::PathCombine(source, "TerraFirmaGreg-Modern-xml-levels.txt")))
+                                              .split(QRegularExpression("\n|\r\n|\r"), Qt::SkipEmptyParts);
+
+        QList<MessageLevel::Enum> longTextLevelsPlain;
+        longTextLevelsPlain.reserve(974);
+        std::transform(longTextLevels_s.cbegin(), longTextLevels_s.cend(), std::back_inserter(longTextLevelsPlain),
+                       [](const QString& line) { return MessageLevel::getLevel(line.trimmed()); });
+        QList<MessageLevel::Enum> longTextLevelsXml;
+        longTextLevelsXml.reserve(896);
+        std::transform(longTextLevelsXml_s.cbegin(), longTextLevelsXml_s.cend(), std::back_inserter(longTextLevelsXml),
+                       [](const QString& line) { return MessageLevel::getLevel(line.trimmed()); });
+
+        QTest::addColumn<QString>("log");
+        QTest::addColumn<int>("num_entries");
+        QTest::addColumn<QList<MessageLevel::Enum>>("entry_levels");
+
+        QTest::newRow("short-vanilla-plain") << shortText << 25 << shortTextLevels;
+        QTest::newRow("short-vanilla-xml") << shortXml << 25 << shortTextLevels;
+        QTest::newRow("long-forge-plain") << longText << 945 << longTextLevelsPlain;
+        QTest::newRow("long-forge-xml") << longXml << 869 << longTextLevelsXml;
     }
 
-    void parseXml() { QFETCH(QString, ) }
+    void parseXml()
+    {
+        QFETCH(QString, log);
+        QFETCH(int, num_entries);
+        QFETCH(QList<MessageLevel::Enum>, entry_levels);
+
+        QList<std::pair<MessageLevel::Enum, QString>> entries = {};
+
+        QBENCHMARK
+        {
+            entries = parseLines(log.split(QRegularExpression("\n|\r\n|\r")));
+        }
+
+        QCOMPARE(entries.length(), num_entries);
+
+        QList<MessageLevel::Enum> levels = {};
+
+        std::transform(entries.cbegin(), entries.cend(), std::back_inserter(levels),
+                       [](std::pair<MessageLevel::Enum, QString> entry) { return entry.first; });
+
+        QCOMPARE(levels, entry_levels);
+    }
 
    private:
     LogParser m_parser;
@@ -59,27 +107,35 @@ class XmlLogParseTest : public QObject {
     QList<std::pair<MessageLevel::Enum, QString>> parseLines(const QStringList& lines)
     {
         QList<std::pair<MessageLevel::Enum, QString>> out;
-        for (const auto& line : lines)
+        MessageLevel::Enum last = MessageLevel::Unknown;
+
+        for (const auto& line : lines) {
             m_parser.appendLine(line);
-        auto items = m_parser.parseAvailable();
-        for (const auto& item : items) {
-            if (std::holds_alternative<LogParser::LogEntry>(item)) {
-                auto entry = std::get<LogParser::LogEntry>(item);
-                auto msg = QString("[%1] [%2/%3] [%4]: %5")
-                               .arg(entry.timestamp.toString("HH:mm:ss"))
-                               .arg(entry.thread)
-                               .arg(entry.levelText)
-                               .arg(entry.logger)
-                               .arg(entry.message);
-                msg = censorPrivateInfo(msg);
-                out.append(std::make_pair(entry.level, msg));
-            } else if (std::holds_alternative<LogParser::PlainText>(item)) {
-                auto msg = std::get<LogParser::PlainText>(item).message;
-                level = m_instance->guessLevel(msg, level);
-                msg = censorPrivateInfo(msg);
-                out.append(std::make_pair(entry.level, msg));
+
+            auto items = m_parser.parseAvailable();
+            for (const auto& item : items) {
+                if (std::holds_alternative<LogParser::LogEntry>(item)) {
+                    auto entry = std::get<LogParser::LogEntry>(item);
+                    auto msg = QString("[%1] [%2/%3] [%4]: %5")
+                                   .arg(entry.timestamp.toString("HH:mm:ss"))
+                                   .arg(entry.thread)
+                                   .arg(entry.levelText)
+                                   .arg(entry.logger)
+                                   .arg(entry.message);
+                    out.append(std::make_pair(entry.level, msg));
+                    last = entry.level;
+                } else if (std::holds_alternative<LogParser::PlainText>(item)) {
+                    auto msg = std::get<LogParser::PlainText>(item).message;
+                    auto level = LogParser::guessLevel(msg, last);
+                    out.append(std::make_pair(level, msg));
+                    last = level;
+                }
             }
         }
         return out;
     }
 };
+
+QTEST_GUILESS_MAIN(XmlLogParseTest)
+
+#include "XmlLogs_test.moc"
diff --git a/tests/testdata/TestLogs/TerraFirmaGreg-Modern-levels.txt b/tests/testdata/TestLogs/TerraFirmaGreg-Modern-levels.txt
new file mode 100644
index 000000000..1b3002117
--- /dev/null
+++ b/tests/testdata/TestLogs/TerraFirmaGreg-Modern-levels.txt
@@ -0,0 +1,945 @@
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+ERROR
+INFO
+ERROR
+ERROR
+ERROR
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+WARN
+WARN
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+INFO
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO
+INFO	
+INFO	
+INFO
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO
+INFO
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO
+INFO
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+INFO	
+WARN
+WARN
+INFO
+INFO
+WARN
+WARN
+WARN
+INFO
+WARN
+INFO
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+INFO
+WARN
+INFO
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+WARN
+INFO
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+WARN
+INFO
+INFO
+WARN
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+WARN
+WARN	
+WARN	
+WARN	
+WARN	
+WARN	
+WARN	
+WARN	
+WARN
+WARN
+WARN
+WARN 
+WARN
+WARN
+INFO
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+ERROR
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+INFO
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+ERROR
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+INFO
+INFO
+ERROR
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+ERROR
+ERROR
+ERROR
+ERROR
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
diff --git a/tests/testdata/TestLogs/TerraFirmaGreg-Modern-xml-levels.txt b/tests/testdata/TestLogs/TerraFirmaGreg-Modern-xml-levels.txt
new file mode 100644
index 000000000..941e5e3fe
--- /dev/null
+++ b/tests/testdata/TestLogs/TerraFirmaGreg-Modern-xml-levels.txt
@@ -0,0 +1,869 @@
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+WARN
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+ERROR
+INFO
+ERROR
+ERROR
+ERROR
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+WARN
+WARN
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+WARN
+WARN
+INFO
+INFO
+WARN
+WARN
+WARN
+INFO
+WARN
+INFO
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+INFO
+WARN
+INFO
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+WARN
+INFO
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+WARN
+INFO
+INFO
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+ERROR
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+ERROR
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+INFO
+INFO
+ERROR
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+WARN
+WARN
+WARN
+WARN
+WARN
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+ERROR
+ERROR
+ERROR
+ERROR
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
diff --git a/tests/testdata/TestLogs/vanilla-1.21.5-levels.txt b/tests/testdata/TestLogs/vanilla-1.21.5-levels.txt
new file mode 100644
index 000000000..02734e56f
--- /dev/null
+++ b/tests/testdata/TestLogs/vanilla-1.21.5-levels.txt
@@ -0,0 +1,25 @@
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+WARN
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO
+INFO