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>
author: Thiago Macieira <thiago.macieira@intel.com> 2012-05-02 14:49:31 +0200
committer: Qt by Nokia <qt-info@nokia.com> 2012-06-09 10:45:01 +0200
commit: fbabbe63c5dcf688f38a7c9bf1bae63b19086935 (patch)
tree: d67ceadb22ec11b03b9d84ea1bd203fef831b2d5
parent: 693468a54da02ff64b104bae8d3b419253889233 (diff)
35 files changed, 36 insertions, 36 deletions
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index 8fd9e8b215..5a451b331d 100644
--- 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 7e5da20680..185cbc5c0a 100644
--- 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 5967ccdd4e..4eeb7a0e19 100644
--- 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 27aa04fcf6..8dc20628af 100644
--- 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 849bc07bfc..97e917602e 100644
--- 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 5bf71fbf8e..1e0f4531e2 100644
--- 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 47b497881a..cead0adf8c 100644
--- 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 3cd82a2b1a..8c9d823485 100644
--- 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 1379d4bcc9..69d025b9cf 100644
--- 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 339ef01e2d..0e5b6de335 100644
--- 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 2296ae8e74..76e297801c 100644
--- 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 7ed93b9c73..7caa915f65 100644
--- 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 132b34ec4a..2579ff24cc 100644
--- 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 a3b7bbdee0..ebdd5f4650 100644
--- 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 f45dc41f3d..ab0f9a917e 100644
--- 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 e3200b00d6..58a48197b0 100644
--- 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 5d0d2c5751..13633a8a0d 100644
--- 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 6261670cae..4ab455c966 100644
--- 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 97c15f71b4..e4da823112 100644
--- 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 7daa065e3d..ee33a85dc4 100644
--- 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 bcb5a2e536..dd1fc08f68 100644
--- 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 09edaacd43..906e66ca68 100644
--- 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 290d9fda43..b3d1c5c846 100644
--- 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 2c3736e263..d5845ebf1d 100644
--- 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 363c217f58..393344b478 100644
--- 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 6609c0464a..0f010860d4 100644
--- 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 8fbfc7711c..e6c5d85783 100644
--- 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 e595d83045..bc6b7d12f8 100644
--- 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 8371700547..eb42569598 100644
--- 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 c35509ad7f..0c5a73918d 100644
--- 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 89dd7e3006..365df51e23 100644
--- 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 7ed93b9c73..7caa915f65 100644
--- 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 d181c6d215..bbdca567d3 100644
--- 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 12cff7c13d..8ad236b52a 100644
--- 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 bfd1e9f8fa..e5d2876e20 100644
--- 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>
author	Thiago Macieira <thiago.macieira@intel.com>	2012-05-02 14:49:31 +0200
committer	Qt by Nokia <qt-info@nokia.com>	2012-06-09 10:45:01 +0200
commit	fbabbe63c5dcf688f38a7c9bf1bae63b19086935 (patch)
tree	d67ceadb22ec11b03b9d84ea1bd203fef831b2d5
parent	693468a54da02ff64b104bae8d3b419253889233 (diff)