2 files changed, 64 insertions, 2 deletions
diff --git a/tests/auto/selftests/cmptest/tst_cmptest.cpp b/tests/auto/selftests/cmptest/tst_cmptest.cpp
index 59dd678..7395210 100644
--- a/tests/auto/selftests/cmptest/tst_cmptest.cpp
+++ b/tests/auto/selftests/cmptest/tst_cmptest.cpp
@@ -50,6 +50,8 @@ class tst_Cmptest: public QObject
 private slots:
     void compare_boolfuncs();
     void compare_pointerfuncs();
+    void compare_tostring();
+    void compare_tostring_data();
 };
 
 static bool boolfunc() { return true; }
@@ -76,6 +78,50 @@ void tst_Cmptest::compare_pointerfuncs()
     QCOMPARE(&i, intptr());
 }
 
+Q_DECLARE_METATYPE(QVariant)
+
+class PhonyClass
+{};
+
+void tst_Cmptest::compare_tostring_data()
+{
+    QTest::addColumn<QVariant>("actual");
+    QTest::addColumn<QVariant>("expected");
+
+    QTest::newRow("int, string")
+        << QVariant::fromValue(123)
+        << QVariant::fromValue(QString("hi"))
+    ;
+
+    QTest::newRow("both invalid")
+        << QVariant()
+        << QVariant()
+    ;
+
+    QTest::newRow("null hash, invalid")
+        << QVariant(QVariant::Hash)
+        << QVariant()
+    ;
+
+    QTest::newRow("string, null user type")
+        << QVariant::fromValue(QString::fromLatin1("A simple string"))
+        << QVariant(QVariant::Type(qRegisterMetaType<PhonyClass>("PhonyClass")))
+    ;
+
+    QTest::newRow("both non-null user type")
+        << QVariant(qRegisterMetaType<PhonyClass>("PhonyClass"), (const void*)0)
+        << QVariant(qRegisterMetaType<PhonyClass>("PhonyClass"), (const void*)0)
+    ;
+}
+
+void tst_Cmptest::compare_tostring()
+{
+    QFETCH(QVariant, actual);
+    QFETCH(QVariant, expected);
+
+    QCOMPARE(actual, expected);
+}
+
 QTEST_MAIN(tst_Cmptest)
 
 #include "tst_cmptest.moc"
diff --git a/tests/auto/selftests/expected_cmptest.txt b/tests/auto/selftests/expected_cmptest.txt
index dc89d9d..f70eba5 100644
--- a/tests/auto/selftests/expected_cmptest.txt
+++ b/tests/auto/selftests/expected_cmptest.txt
@@ -1,8 +1,24 @@
 ********* Start testing of tst_Cmptest *********
-Config: Using QTest library 4.1.0, Qt 4.1.0
+Config: Using QTest library 4.6.0, Qt 4.6.0
 PASS   : tst_Cmptest::initTestCase()
 PASS   : tst_Cmptest::compare_boolfuncs()
 PASS   : tst_Cmptest::compare_pointerfuncs()
+FAIL!  : tst_Cmptest::compare_tostring(int, string) Compared values are not the same
+   Actual (actual): QVariant(int,123)
+   Expected (expected): QVariant(QString,hi)
+   Loc: [/home/rmcgover/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)]
+FAIL!  : tst_Cmptest::compare_tostring(null hash, invalid) Compared values are not the same
+   Actual (actual): QVariant(QVariantHash)
+   Expected (expected): QVariant()
+   Loc: [/home/rmcgover/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)]
+FAIL!  : tst_Cmptest::compare_tostring(string, null user type) Compared values are not the same
+   Actual (actual): QVariant(QString,A simple string)
+   Expected (expected): QVariant(PhonyClass)
+   Loc: [/home/rmcgover/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)]
+FAIL!  : tst_Cmptest::compare_tostring(both non-null user type) Compared values are not the same
+   Actual (actual): QVariant(PhonyClass,<value not representable as string>)
+   Expected (expected): QVariant(PhonyClass,<value not representable as string>)
+   Loc: [/home/rmcgover/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)]
 PASS   : tst_Cmptest::cleanupTestCase()
-Totals: 4 passed, 0 failed, 0 skipped
+Totals: 4 passed, 4 failed, 0 skipped
 ********* Finished testing of tst_Cmptest *********