Improve diagnostics of QPluginLoader test.
authorJason McDonald <jason.mcdonald@nokia.com>
Fri, 18 Nov 2011 07:24:38 +0000 (17:24 +1000)
committerQt by Nokia <qt-info@nokia.com>
Fri, 18 Nov 2011 07:58:56 +0000 (08:58 +0100)
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 <rohan.mcgovern@nokia.com>
tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp

index 8c125cb..7cdd816 100644 (file)
@@ -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.");
     }