Document shell-friendly data tags as best practice

Also follow this best practice in testlib's own documentation and
examples.

Pick-to: 6.4
Change-Id: I8b57dfa8f88835adae8fceeb122a16635708e338
Reviewed-by: Paul Wicking <[email protected]>

3 files changed, 13 insertions, 13 deletions

diff --git a/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc b/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc
index 93bf5111a0e..10d9cb5beed 100644
--- a/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc
+++ b/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc
@@ -54,9 +54,9 @@ Totals: 3 passed, 0 failed, 0 skipped
 ********* Start testing of TestQString *********
 Config: Using QtTest library %VERSION%, Qt %VERSION%
 PASS   : TestQString::initTestCase()
-PASS   : TestQString::toUpper(all lower)
+PASS   : TestQString::toUpper(all-lower)
 PASS   : TestQString::toUpper(mixed)
-PASS   : TestQString::toUpper(all upper)
+PASS   : TestQString::toUpper(all-upper)
 PASS   : TestQString::cleanupTestCase()
 Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
 ********* Finished testing of TestQString *********
@@ -77,7 +77,7 @@ Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 20ms
 Config: Using QtTest library %VERSION%, Qt %VERSION%
 PASS   : TestGui::initTestCase()
 PASS   : TestGui::testGui(char)
-PASS   : TestGui::testGui(there and back again)
+PASS   : TestGui::testGui(there+back-again)
 PASS   : TestGui::cleanupTestCase()
 Totals: 4 passed, 0 failed, 0 skipped, 0 blacklisted, 18ms
 ********* Finished testing of TestGui *********
@@ -90,12 +90,12 @@ PASS   : TestBenchmark::initTestCase()
 PASS   : TestBenchmark::simple()
 RESULT : TestBenchmark::simple():
      0.00030 msecs per iteration (total: 79, iterations: 262144)
-PASS   : TestBenchmark::multiple(locale aware compare)
-RESULT : TestBenchmark::multiple():"locale aware compare":
+PASS   : TestBenchmark::multiple(locale-aware-compare)
+RESULT : TestBenchmark::multiple():"locale-aware-compare":
      0.00029 msecs per iteration (total: 78, iterations: 262144)
 .....
-PASS   : TestBenchmark::series(locale aware compare--8001)
-RESULT : TestBenchmark::series():"locale aware compare--8001":
+PASS   : TestBenchmark::series(locale-aware-compare:8001)
+RESULT : TestBenchmark::series():"locale-aware-compare:8001":
      0.039 msecs per iteration (total: 81, iterations: 2048)
 Totals: 15 passed, 0 failed, 0 skipped, 0 blacklisted, 3971ms
 ********* Finished testing of TestBenchmark *********
diff --git a/src/testlib/doc/snippets/code/doc_src_qtqskip.cpp b/src/testlib/doc/snippets/code/doc_src_qtqskip.cpp
index 14f5085dd4f..85aed2870dd 100644
--- a/src/testlib/doc/snippets/code/doc_src_qtqskip.cpp
+++ b/src/testlib/doc/snippets/code/doc_src_qtqskip.cpp
@@ -13,8 +13,8 @@ void tst_Skip::test_data()
 {
 //! [1]
     QTest::addColumn<bool>("bool");
-    QTest::newRow("local 1") << false;
-    QTest::newRow("local 2") << true;
+    QTest::newRow("local.1") << false;
+    QTest::newRow("local.2") << true;
 
     QSKIP("skipping all");
 //! [1]
diff --git a/src/testlib/doc/snippets/code/src_qtestlib_qtestcase.cpp b/src/testlib/doc/snippets/code/src_qtestlib_qtestcase.cpp
index 63d0b992fcd..532b26b4f18 100644
--- a/src/testlib/doc/snippets/code/src_qtestlib_qtestcase.cpp
+++ b/src/testlib/doc/snippets/code/src_qtestlib_qtestcase.cpp
@@ -56,8 +56,8 @@ void TestQString::toInt_data()
     QTest::addColumn<QString>("aString");
     QTest::addColumn<int>("expected");
 
-    QTest::newRow("positive value") << "42" << 42;
-    QTest::newRow("negative value") << "-42" << -42;
+    QTest::newRow("positive+value") << "42" << 42;
+    QTest::newRow("negative-value") << "-42" << -42;
     QTest::newRow("zero") << "0" << 0;
 }
 //! [3]
@@ -135,8 +135,8 @@ dir.mkdir("");
 void MyTestClass::addSingleStringRows()
 {
     QTest::addColumn<QString>("aString");
-    QTest::newRow("just hello") << QString("hello");
-    QTest::newRow("a null string") << QString();
+    QTest::newRow("just.hello") << QString("hello");
+    QTest::newRow("a.null.string") << QString();
 }
 //! [20]