Use UTF-8 in the QtTest data and benchmark tags

Future-proofing. Since Qt source code is now mandated to be in UTF-8,
it is entirely possible that someone will use non-ASCII in data tags.

Though it would be interesting to see how to access them from the
Windows command-line.

Change-Id: I880fc312432b62143888ff1e1d9abbd54f704601
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index 8fd9e8b..5a451b3 100644 (file)
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -264,7 +264,7 @@ void QPlainTestLogger::printBenchmarkResult(const QBenchmarkResult &result)
 
     char bufTag[1024];
     bufTag[0] = 0;
-    QByteArray tag = result.context.tag.toAscii();
+    QByteArray tag = result.context.tag.toLocal8Bit();
     if (tag.isEmpty() == false) {
         qsnprintf(bufTag, sizeof(bufTag), ":\"%s\"", tag.data());
     }

diff --git a/src/testlib/qxmltestlogger.cpp b/src/testlib/qxmltestlogger.cpp
index 7e5da20..185cbc5 100644 (file)
--- a/src/testlib/qxmltestlogger.cpp
+++ b/src/testlib/qxmltestlogger.cpp
@@ -110,7 +110,7 @@ void QXmlTestLogger::startLogging()
         QTestCharBuffer quotedTc;
         xmlQuote(&quotedTc, QTestResult::currentTestObjectName());
         QTest::qt_asprintf(&buf,
-                "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n"
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                 "<TestCase name=\"%s\">\n", quotedTc.constData());
         outputString(buf.constData());
     }
@@ -244,7 +244,7 @@ void QXmlTestLogger::addBenchmarkResult(const QBenchmarkResult &result)
 
     xmlQuote(&quotedMetric,
         benchmarkMetricName(result.metric));
-    xmlQuote(&quotedTag, result.context.tag.toAscii().constData());
+    xmlQuote(&quotedTag, result.context.tag.toUtf8().constData());
 
     QTest::qt_asprintf(
         &buf,

diff --git a/src/testlib/qxunittestlogger.cpp b/src/testlib/qxunittestlogger.cpp
index 5967ccd..4eeb7a0 100644 (file)
--- a/src/testlib/qxunittestlogger.cpp
+++ b/src/testlib/qxunittestlogger.cpp
@@ -231,7 +231,7 @@ void QXunitTestLogger::addBenchmarkResult(const QBenchmarkResult &result)
     benchmarkElement->addAttribute(
         QTest::AI_Metric,
         QTest::benchmarkMetricName(QBenchmarkTestMethodData::current->result.metric));
-    benchmarkElement->addAttribute(QTest::AI_Tag, result.context.tag.toAscii().data());
+    benchmarkElement->addAttribute(QTest::AI_Tag, result.context.tag.toUtf8().data());
     benchmarkElement->addAttribute(QTest::AI_Value, QByteArray::number(result.value).constData());
 
     char buf[100];

diff --git a/tests/auto/testlib/selftests/expected_assert.xml b/tests/auto/testlib/selftests/expected_assert.xml
index 27aa04f..8dc2062 100644 (file)
--- a/tests/auto/testlib/selftests/expected_assert.xml
+++ b/tests/auto/testlib/selftests/expected_assert.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_Assert">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_badxml.xml b/tests/auto/testlib/selftests/expected_badxml.xml
index 849bc07..97e9176 100644 (file)
--- a/tests/auto/testlib/selftests/expected_badxml.xml
+++ b/tests/auto/testlib/selftests/expected_badxml.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_BadXml">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.xml b/tests/auto/testlib/selftests/expected_benchlibcounting.xml
index 5bf71fb..1e0f453 100644 (file)
--- a/tests/auto/testlib/selftests/expected_benchlibcounting.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibcounting.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_BenchlibCounting">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml
index 47b4978..cead0ad 100644 (file)
--- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_BenchlibEventCounter">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml
index 3cd82a2..8c9d823 100644 (file)
--- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_BenchlibTickCounter">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.xml b/tests/auto/testlib/selftests/expected_benchlibwalltime.xml
index 1379d4b..69d025b 100644 (file)
--- a/tests/auto/testlib/selftests/expected_benchlibwalltime.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_BenchlibWalltime">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml
index 339ef01..0e5b6de 100644 (file)
--- a/tests/auto/testlib/selftests/expected_cmptest.xml
+++ b/tests/auto/testlib/selftests/expected_cmptest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_Cmptest">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.xml b/tests/auto/testlib/selftests/expected_commandlinedata.xml
index 2296ae8..76e2978 100644 (file)
--- a/tests/auto/testlib/selftests/expected_commandlinedata.xml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_DataTable">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_counting.xml b/tests/auto/testlib/selftests/expected_counting.xml
index 7ed93b9..7caa915 100644 (file)
--- a/tests/auto/testlib/selftests/expected_counting.xml
+++ b/tests/auto/testlib/selftests/expected_counting.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_Counting">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_datatable.xml b/tests/auto/testlib/selftests/expected_datatable.xml
index 132b34e..2579ff2 100644 (file)
--- a/tests/auto/testlib/selftests/expected_datatable.xml
+++ b/tests/auto/testlib/selftests/expected_datatable.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_DataTable">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_datetime.xml b/tests/auto/testlib/selftests/expected_datetime.xml
index a3b7bbd..ebdd5f4 100644 (file)
--- a/tests/auto/testlib/selftests/expected_datetime.xml
+++ b/tests/auto/testlib/selftests/expected_datetime.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_DateTime">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.xml b/tests/auto/testlib/selftests/expected_exceptionthrow.xml
index f45dc41..ab0f9a9 100644 (file)
--- a/tests/auto/testlib/selftests/expected_exceptionthrow.xml
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_Exception">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_expectfail.xml b/tests/auto/testlib/selftests/expected_expectfail.xml
index e3200b0..58a4819 100644 (file)
--- a/tests/auto/testlib/selftests/expected_expectfail.xml
+++ b/tests/auto/testlib/selftests/expected_expectfail.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_ExpectFail">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_failcleanup.xml b/tests/auto/testlib/selftests/expected_failcleanup.xml
index 5d0d2c5..13633a8 100644 (file)
--- a/tests/auto/testlib/selftests/expected_failcleanup.xml
+++ b/tests/auto/testlib/selftests/expected_failcleanup.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_FailCleanup">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_failinit.xml b/tests/auto/testlib/selftests/expected_failinit.xml
index 6261670..4ab455c 100644 (file)
--- a/tests/auto/testlib/selftests/expected_failinit.xml
+++ b/tests/auto/testlib/selftests/expected_failinit.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_FailInit">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_failinitdata.xml b/tests/auto/testlib/selftests/expected_failinitdata.xml
index 97c15f7..e4da823 100644 (file)
--- a/tests/auto/testlib/selftests/expected_failinitdata.xml
+++ b/tests/auto/testlib/selftests/expected_failinitdata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_FailInitData">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.xml b/tests/auto/testlib/selftests/expected_fetchbogus.xml
index 7daa065..ee33a85 100644 (file)
--- a/tests/auto/testlib/selftests/expected_fetchbogus.xml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_FetchBogus">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_findtestdata.xml b/tests/auto/testlib/selftests/expected_findtestdata.xml
index bcb5a2e..dd1fc08 100644 (file)
--- a/tests/auto/testlib/selftests/expected_findtestdata.xml
+++ b/tests/auto/testlib/selftests/expected_findtestdata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="FindTestData">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_globaldata.xml b/tests/auto/testlib/selftests/expected_globaldata.xml
index 09edaac..906e66c 100644 (file)
--- a/tests/auto/testlib/selftests/expected_globaldata.xml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_globaldata">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_longstring.xml b/tests/auto/testlib/selftests/expected_longstring.xml
index 290d9fd..b3d1c5c 100644 (file)
--- a/tests/auto/testlib/selftests/expected_longstring.xml
+++ b/tests/auto/testlib/selftests/expected_longstring.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_LongString">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.xml b/tests/auto/testlib/selftests/expected_maxwarnings.xml
index 2c3736e..d5845eb 100644 (file)
--- a/tests/auto/testlib/selftests/expected_maxwarnings.xml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="MaxWarnings">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_singleskip.xml b/tests/auto/testlib/selftests/expected_singleskip.xml
index 363c217..393344b 100644 (file)
--- a/tests/auto/testlib/selftests/expected_singleskip.xml
+++ b/tests/auto/testlib/selftests/expected_singleskip.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_SingleSkip">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_skip.xml b/tests/auto/testlib/selftests/expected_skip.xml
index 6609c04..0f01086 100644 (file)
--- a/tests/auto/testlib/selftests/expected_skip.xml
+++ b/tests/auto/testlib/selftests/expected_skip.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_Skip">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.xml b/tests/auto/testlib/selftests/expected_skipcleanup.xml
index 8fbfc77..e6c5d85 100644 (file)
--- a/tests/auto/testlib/selftests/expected_skipcleanup.xml
+++ b/tests/auto/testlib/selftests/expected_skipcleanup.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_SkipCleanup">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_skipinit.xml b/tests/auto/testlib/selftests/expected_skipinit.xml
index e595d83..bc6b7d1 100644 (file)
--- a/tests/auto/testlib/selftests/expected_skipinit.xml
+++ b/tests/auto/testlib/selftests/expected_skipinit.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_SkipInit">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.xml b/tests/auto/testlib/selftests/expected_skipinitdata.xml
index 8371700..eb42569 100644 (file)
--- a/tests/auto/testlib/selftests/expected_skipinitdata.xml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_SkipInitData">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_strcmp.xml b/tests/auto/testlib/selftests/expected_strcmp.xml
index c35509a..0c5a739 100644 (file)
--- a/tests/auto/testlib/selftests/expected_strcmp.xml
+++ b/tests/auto/testlib/selftests/expected_strcmp.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_StrCmp">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_subtest.xml b/tests/auto/testlib/selftests/expected_subtest.xml
index 89dd7e3..365df51 100644 (file)
--- a/tests/auto/testlib/selftests/expected_subtest.xml
+++ b/tests/auto/testlib/selftests/expected_subtest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_Subtest">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_verbose1.xml b/tests/auto/testlib/selftests/expected_verbose1.xml
index 7ed93b9..7caa915 100644 (file)
--- a/tests/auto/testlib/selftests/expected_verbose1.xml
+++ b/tests/auto/testlib/selftests/expected_verbose1.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_Counting">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_verbose2.xml b/tests/auto/testlib/selftests/expected_verbose2.xml
index d181c6d..bbdca56 100644 (file)
--- a/tests/auto/testlib/selftests/expected_verbose2.xml
+++ b/tests/auto/testlib/selftests/expected_verbose2.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_Counting">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_warnings.xml b/tests/auto/testlib/selftests/expected_warnings.xml
index 12cff7c..8ad236b 100644 (file)
--- a/tests/auto/testlib/selftests/expected_warnings.xml
+++ b/tests/auto/testlib/selftests/expected_warnings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_Warnings">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>

diff --git a/tests/auto/testlib/selftests/expected_xunit.xml b/tests/auto/testlib/selftests/expected_xunit.xml
index bfd1e9f..e5d2876 100644 (file)
--- a/tests/auto/testlib/selftests/expected_xunit.xml
+++ b/tests/auto/testlib/selftests/expected_xunit.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <TestCase name="tst_Xunit">
 <Environment>
     <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>