From 7aa5a89eeff40b70b8318171f71bc222dc23179d Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Fri, 3 Feb 2012 13:03:10 +1000
Subject: Add data tag names to datetime selftest.

Change-Id: I73a0faab06df99521a48f106d93dd7b9a620148d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 tests/auto/testlib/selftests/datetime/tst_datetime.cpp  | 8 ++++----
 tests/auto/testlib/selftests/expected_datetime.lightxml | 2 ++
 tests/auto/testlib/selftests/expected_datetime.txt      | 4 ++--
 tests/auto/testlib/selftests/expected_datetime.xml      | 2 ++
 tests/auto/testlib/selftests/expected_datetime.xunitxml | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'tests/auto/testlib/selftests')

diff --git a/tests/auto/testlib/selftests/datetime/tst_datetime.cpp b/tests/auto/testlib/selftests/datetime/tst_datetime.cpp
index 60ebbfc104..c98f119f75 100644
--- a/tests/auto/testlib/selftests/datetime/tst_datetime.cpp
+++ b/tests/auto/testlib/selftests/datetime/tst_datetime.cpp
@@ -78,10 +78,10 @@ void tst_DateTime::qurl_data() const
     QTest::addColumn<QUrl>("operandA");
     QTest::addColumn<QUrl>("operandB");
 
-    QTest::newRow("") << QUrl() << QUrl();
-    QTest::newRow("") << QUrl(QLatin1String("http://example.com")) << QUrl();
-    QTest::newRow("") << QUrl() << QUrl(QLatin1String("http://example.com"));
-    QTest::newRow("") << QUrl(QLatin1String("http://example.com")) << QUrl(QLatin1String("http://example.com"));
+    QTest::newRow("empty urls") << QUrl() << QUrl();
+    QTest::newRow("empty rhs") << QUrl(QLatin1String("http://example.com")) << QUrl();
+    QTest::newRow("empty lhs") << QUrl() << QUrl(QLatin1String("http://example.com"));
+    QTest::newRow("same urls") << QUrl(QLatin1String("http://example.com")) << QUrl(QLatin1String("http://example.com"));
 }
 
 QTEST_MAIN(tst_DateTime)
diff --git a/tests/auto/testlib/selftests/expected_datetime.lightxml b/tests/auto/testlib/selftests/expected_datetime.lightxml
index 1b7e601585..0024b101aa 100644
--- a/tests/auto/testlib/selftests/expected_datetime.lightxml
+++ b/tests/auto/testlib/selftests/expected_datetime.lightxml
@@ -14,11 +14,13 @@
 </TestFunction>
 <TestFunction name="qurl">
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="74">
+    <DataTag><![CDATA[empty rhs]]></DataTag>
     <Description><![CDATA[Compared values are not the same
    Actual (operandA): http://example.com
    Expected (operandB): ]]></Description>
 </Incident>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="74">
+    <DataTag><![CDATA[empty lhs]]></DataTag>
     <Description><![CDATA[Compared values are not the same
    Actual (operandA): 
    Expected (operandB): http://example.com]]></Description>
diff --git a/tests/auto/testlib/selftests/expected_datetime.txt b/tests/auto/testlib/selftests/expected_datetime.txt
index 70d5c5a70c..e2966b9168 100644
--- a/tests/auto/testlib/selftests/expected_datetime.txt
+++ b/tests/auto/testlib/selftests/expected_datetime.txt
@@ -5,11 +5,11 @@ FAIL!  : tst_DateTime::dateTime() Compared values are not the same
    Actual (local): 2000/05/03 04:03:04.000[local time]
    Expected (utc): 2000/05/03 04:03:04.000[UTC]
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp(33)]
-FAIL!  : tst_DateTime::qurl() Compared values are not the same
+FAIL!  : tst_DateTime::qurl(empty rhs) Compared values are not the same
    Actual (operandA): http://example.com
    Expected (operandB): 
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp(41)]
-FAIL!  : tst_DateTime::qurl() Compared values are not the same
+FAIL!  : tst_DateTime::qurl(empty lhs) Compared values are not the same
    Actual (operandA): 
    Expected (operandB): http://example.com
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp(41)]
diff --git a/tests/auto/testlib/selftests/expected_datetime.xml b/tests/auto/testlib/selftests/expected_datetime.xml
index d848e73c82..f1b5a6aafd 100644
--- a/tests/auto/testlib/selftests/expected_datetime.xml
+++ b/tests/auto/testlib/selftests/expected_datetime.xml
@@ -16,11 +16,13 @@
 </TestFunction>
 <TestFunction name="qurl">
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="74">
+    <DataTag><![CDATA[empty rhs]]></DataTag>
     <Description><![CDATA[Compared values are not the same
    Actual (operandA): http://example.com
    Expected (operandB): ]]></Description>
 </Incident>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="74">
+    <DataTag><![CDATA[empty lhs]]></DataTag>
     <Description><![CDATA[Compared values are not the same
    Actual (operandA): 
    Expected (operandB): http://example.com]]></Description>
diff --git a/tests/auto/testlib/selftests/expected_datetime.xunitxml b/tests/auto/testlib/selftests/expected_datetime.xunitxml
index b30d1c441f..f25e20674b 100644
--- a/tests/auto/testlib/selftests/expected_datetime.xunitxml
+++ b/tests/auto/testlib/selftests/expected_datetime.xunitxml
@@ -11,10 +11,10 @@
    Expected (utc): 2000/05/03 04:03:04.000[UTC]" result="fail"/>
   </testcase>
   <testcase result="fail" name="qurl">
-    <failure message="Compared values are not the same
+    <failure tag="empty rhs" message="Compared values are not the same
    Actual (operandA): http://example.com
    Expected (operandB): " result="fail"/>
-    <failure message="Compared values are not the same
+    <failure tag="empty lhs" message="Compared values are not the same
    Actual (operandA): 
    Expected (operandB): http://example.com" result="fail"/>
   </testcase>
-- 
cgit v1.2.3