cxx-qt-lib: add standalone unit tests for logging

Author: jnbooth

tests/qt_types_standalone/CMakeLists.txt

@@ -104,6 +104,7 @@ add_executable(${APP_NAME}
     cpp/qstringlist.h
     cpp/qtime.h
     cpp/qtimezone.h
+    cpp/qtlogging.h
     cpp/qurl.h
     cpp/qvariant.h
     cpp/qvector.h

tests/qt_types_standalone/cpp/main.cpp

@@ -45,6 +45,7 @@
 #include "qstringlist.h"
 #include "qtime.h"
 #include "qtimezone.h"
+#include "qtlogging.h"
 #include "qurl.h"
 #include "qvariant.h"
 #include "qvector.h"
@@ -97,6 +98,7 @@ main(int argc, char* argv[])
   runTest(QScopedPointer<QObject>(new QStringListTest));
   runTest(QScopedPointer<QObject>(new QTimeTest));
   runTest(QScopedPointer<QObject>(new QTimeZoneTest));
+  runTest(QScopedPointer<QObject>(new QtLoggingTest));
   runTest(QScopedPointer<QObject>(new QUrlTest));
   runTest(QScopedPointer<QObject>(new QVariantTest));
   runTest(QScopedPointer<QObject>(new QVectorTest));

tests/qt_types_standalone/cpp/qtlogging.h

@@ -0,0 +1,45 @@
+// clang-format off
+// SPDX-FileCopyrightText: 2025 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+// clang-format on
+// SPDX-FileContributor: Joshua Booth <[email protected]>
+//
+// SPDX-License-Identifier: MIT OR Apache-2.0
+#pragma once
+
+#include <QtCore/qlogging.h>
+#include <QtTest/QTest>
+
+#include "qt_types_standalone/src/qtlogging.cxx.h"
+
+static QtMessageHandler originalHandler = nullptr;
+static QString loggedMessage{};
+
+class QtLoggingTest : public QObject
+{
+  Q_OBJECT
+
+private:
+  static void logAndStore(QtMsgType type,
+                          const QMessageLogContext& context,
+                          const QString& msg)
+  {
+    if (type == QtMsgType::QtInfoMsg) {
+      loggedMessage = QStringLiteral("%1:%2 - %3")
+                        .arg(QString::fromUtf8(context.file))
+                        .arg(context.line)
+                        .arg(msg);
+    }
+    if (originalHandler) {
+      (*originalHandler)(type, context, msg);
+    }
+  }
+
+private Q_SLOTS:
+  void log()
+  {
+    originalHandler = qInstallMessageHandler(logAndStore);
+    const QString expectedMessage = log_info(QStringLiteral("test message"));
+    qInstallMessageHandler(originalHandler);
+    QCOMPARE(loggedMessage, expectedMessage);
+  }
+};

tests/qt_types_standalone/rust/build.rs

@@ -44,6 +44,7 @@ fn main() {
         .file("src/qstringlist.rs")
         .file("src/qtime.rs")
         .file("src/qtimezone.rs")
+        .file("src/qtlogging.rs")
         .file("src/qurl.rs")
         .file("src/qvariant.rs")
         .file("src/qvector.rs")

tests/qt_types_standalone/rust/src/lib.rs

@@ -41,6 +41,7 @@ mod qstring;
 mod qstringlist;
 mod qtime;
 mod qtimezone;
+mod qtlogging;
 mod qurl;
 mod qvariant;
 mod qvector;

tests/qt_types_standalone/rust/src/qtlogging.rs

@@ -0,0 +1,23 @@
+// SPDX-FileCopyrightText: 2025 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+// SPDX-FileContributor: Joshua Booth <[email protected]>
+//
+// SPDX-License-Identifier: MIT OR Apache-2.0
+
+use cxx_qt_lib::{q_info, QString};
+
+#[cxx::bridge]
+mod ffi {
+    extern "C++" {
+        include!("cxx-qt-lib/qstring.h");
+        type QString = cxx_qt_lib::QString;
+    }
+
+    extern "Rust" {
+        fn log_info(message: &QString) -> QString;
+    }
+}
+
+fn log_info(message: &QString) -> QString {
+    q_info!("Message: {message}");
+    QString::from(&format!("{}:{} - Message: {message}", file!(), line!() - 1))
+}