diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
index 924b734e51..c2e7f26387 100644
--- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
+++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
@@ -142,7 +142,7 @@ void tst_Cmptest::compareQStringLists_data()
opA.append(QLatin1String("string3"));
opB.append(QLatin1String("DIFFERS"));
- QTest::newRow("") << opA << opB;
+ QTest::newRow("last item different") << opA << opB;
}
{
@@ -157,7 +157,7 @@ void tst_Cmptest::compareQStringLists_data()
opB.append(QLatin1String("DIFFERS"));
opB.append(QLatin1String("string4"));
- QTest::newRow("") << opA << opB;
+ QTest::newRow("second-last item different") << opA << opB;
}
{
@@ -168,7 +168,7 @@ void tst_Cmptest::compareQStringLists_data()
QStringList opB;
opB.append(QLatin1String("string1"));
- QTest::newRow("") << opA << opB;
+ QTest::newRow("prefix") << opA << opB;
}
{
@@ -189,9 +189,9 @@ void tst_Cmptest::compareQStringLists_data()
QStringList opB;
opB.append(QLatin1String("viewDocumentSource"));
- QTest::newRow("") << opA << opB;
+ QTest::newRow("short list second") << opA << opB;
- QTest::newRow("") << opB << opA;
+ QTest::newRow("short list first") << opB << opA;
}
}
diff --git a/tests/auto/testlib/selftests/expected_cmptest.lightxml b/tests/auto/testlib/selftests/expected_cmptest.lightxml
index 7aa4fe1f2f..d027dcde11 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.lightxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.lightxml
@@ -39,26 +39,31 @@
+
+
+
+
+
diff --git a/tests/auto/testlib/selftests/expected_cmptest.txt b/tests/auto/testlib/selftests/expected_cmptest.txt
index 3e40b3be7a..f7dc5cfed3 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.txt
+++ b/tests/auto/testlib/selftests/expected_cmptest.txt
@@ -19,23 +19,23 @@ FAIL! : tst_Cmptest::compare_tostring(both non-null user type) Compared values
Actual (actual): QVariant(PhonyClass,)
Expected (expected): QVariant(PhonyClass,)
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(122)]
-FAIL! : tst_Cmptest::compareQStringLists() Compared QStringLists differ at index 2.
+FAIL! : tst_Cmptest::compareQStringLists(last item different) Compared QStringLists differ at index 2.
Actual (opA) : 'string3'
Expected (opB) : 'DIFFERS'
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/alive/tst_alive.cpp(68)]
-FAIL! : tst_Cmptest::compareQStringLists() Compared QStringLists differ at index 2.
+FAIL! : tst_Cmptest::compareQStringLists(second-last item different) Compared QStringLists differ at index 2.
Actual (opA) : 'string3'
Expected (opB) : 'DIFFERS'
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/alive/tst_alive.cpp(68)]
-FAIL! : tst_Cmptest::compareQStringLists() Compared QStringLists have different sizes.
+FAIL! : tst_Cmptest::compareQStringLists(prefix) Compared QStringLists have different sizes.
Actual (opA) size : '2'
Expected (opB) size: '1'
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/alive/tst_alive.cpp(68)]
-FAIL! : tst_Cmptest::compareQStringLists() Compared QStringLists have different sizes.
+FAIL! : tst_Cmptest::compareQStringLists(short list second) Compared QStringLists have different sizes.
Actual (opA) size : '12'
Expected (opB) size: '1'
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/alive/tst_alive.cpp(68)]
-FAIL! : tst_Cmptest::compareQStringLists() Compared QStringLists have different sizes.
+FAIL! : tst_Cmptest::compareQStringLists(short list first) Compared QStringLists have different sizes.
Actual (opA) size : '1'
Expected (opB) size: '12'
Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/alive/tst_alive.cpp(68)]
diff --git a/tests/auto/testlib/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml
index 1b32389acb..7faa3a979d 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.xml
+++ b/tests/auto/testlib/selftests/expected_cmptest.xml
@@ -41,26 +41,31 @@
+
+
+
+
+
diff --git a/tests/auto/testlib/selftests/expected_cmptest.xunitxml b/tests/auto/testlib/selftests/expected_cmptest.xunitxml
index 8ce2dc92d5..aa765a65e0 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.xunitxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.xunitxml
@@ -22,19 +22,19 @@
Expected (expected): QVariant(PhonyClass,<value not representable as string>)" result="fail"/>
-
-
-
-
-