From 572ca4363791f7bbed78dab9f7f5dd0c6b5d11d1 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 18 Nov 2011 17:24:38 +1000 Subject: Improve diagnostics of QPluginLoader test. Use QVERIFY2 so that the test output shows the full error string when it does not contain the expected sub-string. Change-Id: I31f91bd5c47c082aacabd2333bc12137bc4d24a6 Reviewed-by: Rohan McGovern --- tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/corelib/plugin') diff --git a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp index 8c125cba30..7cdd81691a 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp +++ b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp @@ -263,19 +263,19 @@ void tst_QPluginLoader::loadCorruptElf() QPluginLoader lib1(SRCDIR "elftest/corrupt1.elf64.so"); QCOMPARE(lib1.load(), false); - QVERIFY(lib1.errorString().contains("not a valid Qt plugin")); + QVERIFY2(lib1.errorString().contains("not a valid Qt plugin"), qPrintable(lib1.errorString())); QPluginLoader lib2(SRCDIR "elftest/corrupt2.elf64.so"); QCOMPARE(lib2.load(), false); - QVERIFY(lib2.errorString().contains("not a valid Qt plugin")); + QVERIFY2(lib2.errorString().contains("not a valid Qt plugin"), qPrintable(lib2.errorString())); QPluginLoader lib3(SRCDIR "elftest/corrupt3.elf64.so"); QCOMPARE(lib3.load(), false); - QVERIFY(lib3.errorString().contains("not a valid Qt plugin")); + QVERIFY2(lib3.errorString().contains("not a valid Qt plugin"), qPrintable(lib3.errorString())); } else if (sizeof(void*) == 4) { QPluginLoader libW(SRCDIR "elftest/corrupt3.elf64.so"); QCOMPARE(libW.load(), false); - QVERIFY(libW.errorString().contains("architecture")); + QVERIFY2(libW.errorString().contains("architecture"), qPrintable(libW.errorString())); } else { QFAIL("Please port QElfParser to this platform or blacklist this test."); } -- cgit v1.2.3