diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2021-11-23 08:58:58 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2021-11-26 09:57:59 +0100 |
| commit | 59600a514ba99ed62b46237d8f160dea84474190 (patch) | |
| tree | 99daa7bda9085b6a540eb55891658a5fdd7315e1 /tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml | |
| parent | 405adf3348b6d5ffb87f02550743050e4f0da4a6 (diff) | |
QTest: de-inline QVERIFY_THROWS_EXCEPTION message formatting
Extract Method QTest::qCaught() to take the string handling out of the
header. This should help a bit in speeding up compilation of large
unit test files (provided they use QVERIFY_THROWS_EXCEPTION), although
I have no data to support that.
Since we changed the error message, update the selftest accordingly.
Change-Id: Id4a3c8c34d5df8d0c7a861106d269097f4a6de5c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml index dd730909da..d6b48dfd66 100644 --- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml @@ -10,19 +10,19 @@ <testcase name="testCorrectStdExceptions" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"/> <testcase name="testCorrectMyExceptions" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"/> <testcase name="testFailInt" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"> - <failure type="fail" message="Expected exception of type double to be thrown but unknown exception caught"/> + <failure type="fail" message="Expected an exception of type double to be thrown, but caught unknown exception"/> </testcase> <testcase name="testFailStdString" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"> - <failure type="fail" message="Expected exception of type char* to be thrown but unknown exception caught"/> + <failure type="fail" message="Expected an exception of type char* to be thrown, but caught unknown exception"/> </testcase> <testcase name="testFailStdRuntimeError" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"> - <failure type="fail" message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error"/> + <failure type="fail" message="Expected an exception of type std::runtime_error to be thrown, but caught std::exception with message logic error"/> </testcase> <testcase name="testFailMyException" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"> - <failure type="fail" message="Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error"/> + <failure type="fail" message="Expected an exception of type MyBaseException to be thrown, but caught std::exception with message logic error"/> </testcase> <testcase name="testFailMyDerivedException" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"> - <failure type="fail" message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException"/> + <failure type="fail" message="Expected an exception of type std::runtime_error to be thrown, but caught std::exception with message MyDerivedException"/> </testcase> <testcase name="testFailNoException" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"> <failure type="fail" message="Expected exception of type std::exception to be thrown but no exception caught"/> |