feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Add QVERIFY_EXPECTED macro

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

Change-Id: I086bbb8aa021726f133f8d8615ba54785074b145
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-09-23 10:25:57 +02:00
parent 635e746571
commit 821d9e8690
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/utils/expected.h
View File

@@ -39,3 +39,6 @@ using expected_str = tl::expected<T, QString>;
} \ } \
do { \ do { \
} while (0) } while (0)
#define QVERIFY_EXPECTED(expected) \
QVERIFY2(expected, expected ? #expected : expected.error().toUtf8())

8
tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
View File

@@ -236,7 +236,7 @@ void tst_PluginSpec::locationAndPath()
{ {
Utils::expected_str<std::unique_ptr<PluginSpec>> ps = readCppPluginSpec( Utils::expected_str<std::unique_ptr<PluginSpec>> ps = readCppPluginSpec(
PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test"))); PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
QVERIFY(ps); QVERIFY_EXPECTED(ps);
CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps->get()); CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps->get());
QCOMPARE(spec->location(), PLUGIN_DIR_PATH / "testplugin"); QCOMPARE(spec->location(), PLUGIN_DIR_PATH / "testplugin");
QCOMPARE(spec->filePath(), PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test"))); 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( Utils::expected_str<std::unique_ptr<PluginSpec>> ps = readCppPluginSpec(
PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test"))); PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
QVERIFY(ps); QVERIFY_EXPECTED(ps);
CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps->get()); CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps->get());
QCOMPARE(spec->errorString(), QString()); QCOMPARE(spec->errorString(), QString());
@@ -308,7 +308,7 @@ void tst_PluginSpec::initializePlugin()
{ {
Utils::expected_str<std::unique_ptr<PluginSpec>> ps = readCppPluginSpec( Utils::expected_str<std::unique_ptr<PluginSpec>> ps = readCppPluginSpec(
PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test"))); PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
QVERIFY(ps); QVERIFY_EXPECTED(ps);
CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps->get()); CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps->get());
QVERIFY(spec->resolveDependencies({})); QVERIFY(spec->resolveDependencies({}));
QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString())); QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString()));
@@ -332,7 +332,7 @@ void tst_PluginSpec::initializeExtensions()
{ {
Utils::expected_str<std::unique_ptr<PluginSpec>> ps = readCppPluginSpec( Utils::expected_str<std::unique_ptr<PluginSpec>> ps = readCppPluginSpec(
PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test"))); PLUGIN_DIR_PATH / "testplugin" / libraryName(QLatin1String("test")));
QVERIFY(ps); QVERIFY_EXPECTED(ps);
CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps->get()); CppPluginSpec *spec = static_cast<CppPluginSpec *>(ps->get());
QVERIFY(spec->resolveDependencies({})); QVERIFY(spec->resolveDependencies({}));
QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString())); QVERIFY2(spec->loadLibrary(), qPrintable(spec->errorString()));