diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2013-07-01 15:58:40 -0700 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-21 03:01:06 +0200 |
commit | d040681b6f3d03b349e9b9487fe89a611d03ee3c (patch) | |
tree | f929c817dbfe85f34752ee0720f5a9cec3258141 /src/testlib/qtestresult.cpp | |
parent | d5d07f26f683e4737b0ecc7da4a8cfce493aec2d (diff) |
TestLib: align the colons so the "actual" and "expected" align too
Before:
FAIL! tst_testcase::testcase: Compared values are not the same
Actual (actual): F0O
Expected (expected): FOO
Now:
FAIL! tst_testcase::testcase: Compared values are not the same
Actual (actual) : F0O
Expected (expected): FOO
Change-Id: I6f0768e4ef53e065b85a56879cecbad06fa34aef
Reviewed-by: Jason McDonald <macadder1@gmail.com>
Diffstat (limited to 'src/testlib/qtestresult.cpp')
-rw-r--r-- | src/testlib/qtestresult.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp index a6a8ee0cc1..7ab317f209 100644 --- a/src/testlib/qtestresult.cpp +++ b/src/testlib/qtestresult.cpp @@ -268,10 +268,12 @@ bool QTestResult::compare(bool success, const char *failureMsg, if (success && QTest::expectFailMode) { qsnprintf(msg, 1024, "QCOMPARE(%s, %s) returned TRUE unexpectedly.", actual, expected); } else if (val1 || val2) { - qsnprintf(msg, 1024, "%s\n Actual (%s): %s\n Expected (%s): %s", + size_t len1 = strlen(actual); + size_t len2 = strlen(expected); + qsnprintf(msg, 1024, "%s\n Actual (%s)%*s %s\n Expected (%s)%*s %s", failureMsg, - actual, val1 ? val1 : "<null>", - expected, val2 ? val2 : "<null>"); + actual, qMax(len1, len2) - len1 + 1, ":", val1 ? val1 : "<null>", + expected, qMax(len1, len2) - len2 + 1, ":", val2 ? val2 : "<null>"); } else qsnprintf(msg, 1024, "%s", failureMsg); |