From 821d9e86902a4b73f1d990e22674793b0be68d65 Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Mon, 23 Sep 2024 10:25:57 +0200
Subject: [PATCH] Utils: Add QVERIFY_EXPECTED macro

Allows to get more descriptive Unit test error messages when
checking expected values.

Change-Id: I086bbb8aa021726f133f8d8615ba54785074b145
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/utils/expected.h                                | 3 +++
 tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/libs/utils/expected.h b/src/libs/utils/expected.h
index 0e018eb8ab5..d7f78f1ec4f 100644
--- a/src/libs/utils/expected.h
+++ b/src/libs/utils/expected.h
@@ -39,3 +39,6 @@ using expected_str = tl::expected<T, QString>;
     } \
     do { \
     } while (0)
+
+#define QVERIFY_EXPECTED(expected) \
+    QVERIFY2(expected, expected ? #expected : expected.error().toUtf8())
diff --git a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
index 3a4a9444400..a735abf348c 100644
--- a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
+++ b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
@@ -236,7 +236,7 @@ void tst_PluginSpec::locationAndPath()
 {
     Utils::expected_str<std::unique_ptr<PluginSpec>> ps = readCppPluginSpec(
         PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
-    QVERIFY(ps);
+    QVERIFY_EXPECTED(ps);
     CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps->get());
     QCOMPARE(spec->location(), PLUGIN_DIR_PATH / "testplugin");
     QCOMPARE(spec->filePath(), PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
@@ -291,7 +291,7 @@ void tst_PluginSpec::loadLibrary()
     Utils::expected_str<std::unique_ptr<PluginSpec>> ps = readCppPluginSpec(
         PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
 
-    QVERIFY(ps);
+    QVERIFY_EXPECTED(ps);
     CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps->get());
 
     QCOMPARE(spec->errorString(), QString());
@@ -308,7 +308,7 @@ void tst_PluginSpec::initializePlugin()
 {
     Utils::expected_str<std::unique_ptr<PluginSpec>> ps = readCppPluginSpec(
         PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
-    QVERIFY(ps);
+    QVERIFY_EXPECTED(ps);
     CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps->get());
     QVERIFY(spec->resolveDependencies({}));
     QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString()));
@@ -332,7 +332,7 @@ void tst_PluginSpec::initializeExtensions()
 {
     Utils::expected_str<std::unique_ptr<PluginSpec>> ps = readCppPluginSpec(
         PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
-    QVERIFY(ps);
+    QVERIFY_EXPECTED(ps);
     CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps->get());
     QVERIFY(spec->resolveDependencies({}));
     QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString()));