Eliminate duplicate data row names from corelib autotests.

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

diff --git a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
index 064724e..899efc1 100644 (file)
--- a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
+++ b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
@@ -72,7 +72,7 @@ void tst_QNumeric::fuzzyCompare_data()
     QTest::newRow("mis2") << 0.0 << 10000000.0 << false;
     QTest::newRow("mis3") << 0.0 << 0.000000001 << false;
     QTest::newRow("mis4") << 100000000.0 << 0.000000001 << false;
-    QTest::newRow("mis4") << 0.0000000001 << 0.000000001 << false;
+    QTest::newRow("mis5") << 0.0000000001 << 0.000000001 << false;
 }
 
 void tst_QNumeric::fuzzyCompare()

diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
index eb22762..79c96fb 100644 (file)
--- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
@@ -2680,8 +2680,8 @@ void tst_QDataStream::status_QBitArray_data()
     // past end
     QTest::newRow("empty") << QByteArray() << (int) QDataStream::ReadPastEnd << QBitArray();
     QTest::newRow("badsize 0a") << QByteArray("\x00", 1) << (int) QDataStream::ReadPastEnd << QBitArray();
-    QTest::newRow("badsize 0a") << QByteArray("\x00\x00", 2) << (int) QDataStream::ReadPastEnd << QBitArray();
-    QTest::newRow("badsize 0a") << QByteArray("\x00\x00\x00", 3) << (int) QDataStream::ReadPastEnd << QBitArray();
+    QTest::newRow("badsize 0b") << QByteArray("\x00\x00", 2) << (int) QDataStream::ReadPastEnd << QBitArray();
+    QTest::newRow("badsize 0c") << QByteArray("\x00\x00\x00", 3) << (int) QDataStream::ReadPastEnd << QBitArray();
     QTest::newRow("badsize 1") << QByteArray("\x00\x00\x00\x01", 4) << (int) QDataStream::ReadPastEnd << QBitArray();
     QTest::newRow("badsize 2") << QByteArray("\x00\x00\x00\x02", 4) << (int) QDataStream::ReadPastEnd << QBitArray();
     QTest::newRow("badsize 3") << QByteArray("\x00\x00\x00\x03", 4) << (int) QDataStream::ReadPastEnd << QBitArray();

diff --git a/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp b/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
index fe2e30a..b083d3b 100644 (file)
--- a/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
+++ b/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
@@ -241,15 +241,15 @@ void tst_QFileSystemEntry::suffix_data()
     QTest::newRow("data1") << "file.tar.gz" << "gz";
     QTest::newRow("data2") << "/path/file/file.tar.gz" << "gz";
     QTest::newRow("data3") << "/path/file.tar" << "tar";
-    QTest::newRow("hidden1") << ".ext1" << "ext1";
-    QTest::newRow("hidden1") << ".ext" << "ext";
-    QTest::newRow("hidden1") << ".ex" << "ex";
-    QTest::newRow("hidden1") << ".e" << "e";
-    QTest::newRow("hidden2") << ".ext1.ext2" << "ext2";
-    QTest::newRow("hidden2") << ".ext.ext2" << "ext2";
-    QTest::newRow("hidden2") << ".ex.ext2" << "ext2";
-    QTest::newRow("hidden2") << ".e.ext2" << "ext2";
-    QTest::newRow("hidden2") << "..ext2" << "ext2";
+    QTest::newRow("hidden1-1") << ".ext1" << "ext1";
+    QTest::newRow("hidden1-2") << ".ext" << "ext";
+    QTest::newRow("hidden1-3") << ".ex" << "ex";
+    QTest::newRow("hidden1-4") << ".e" << "e";
+    QTest::newRow("hidden2-1") << ".ext1.ext2" << "ext2";
+    QTest::newRow("hidden2-2") << ".ext.ext2" << "ext2";
+    QTest::newRow("hidden2-3") << ".ex.ext2" << "ext2";
+    QTest::newRow("hidden2-4") << ".e.ext2" << "ext2";
+    QTest::newRow("hidden2-5") << "..ext2" << "ext2";
     QTest::newRow("dots") << "/path/file.with.dots/file..ext2" << "ext2";
     QTest::newRow("dots2") << "/path/file.with.dots/.file..ext2" << "ext2";
 }

diff --git a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
index 01aecc2..37a1556 100644 (file)
--- a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
@@ -2755,7 +2755,7 @@ void tst_QTextStream::double_write_with_flags_data()
     QTest::newRow("inf uppercase") << qInf() << QString("INF") << (int)QTextStream::UppercaseDigits << 0;
     QTest::newRow("-inf uppercase") << -qInf() << QString("-INF") << (int)QTextStream::UppercaseDigits << 0;
     QTest::newRow("nan") << qQNaN() << QString("nan") << 0 << 0;
-    QTest::newRow("nan") << qQNaN() << QString("NAN") << (int)QTextStream::UppercaseDigits << 0;
+    QTest::newRow("NAN") << qQNaN() << QString("NAN") << (int)QTextStream::UppercaseDigits << 0;
     QTest::newRow("scientific") << 1.234567e+02 << QString("1.234567e+02") << 0  << (int)QTextStream::ScientificNotation;
     QTest::newRow("scientific2") << 1.234567e+02 << QString("1.234567e+02") << (int)QTextStream::UppercaseBase << (int)QTextStream::ScientificNotation;
     QTest::newRow("scientific uppercase") << 1.234567e+02 << QString("1.234567E+02") << (int)QTextStream::UppercaseDigits << (int)QTextStream::ScientificNotation;

diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index e283103..a74d817 100644 (file)
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -3120,8 +3120,8 @@ void tst_QUrl::fromUserInput_data()
     QTest::newRow("port-0") << "example.org:80" << portUrl;
     QTest::newRow("port-1") << "http://example.org:80" << portUrl;
     portUrl.setPath("path");
-    QTest::newRow("port-1") << "example.org:80/path" << portUrl;
-    QTest::newRow("port-1") << "http://example.org:80/path" << portUrl;
+    QTest::newRow("port-2") << "example.org:80/path" << portUrl;
+    QTest::newRow("port-3") << "http://example.org:80/path" << portUrl;
 
     // mailto doesn't have a ://, but is valid
     QUrl mailto("ben@example.net");

diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
index 2ca5df4..8d451db 100644 (file)
--- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -1257,13 +1257,13 @@ void tst_QAbstractItemModel::testMoveToGrandParent_data()
     QTest::newRow("move09") << 8 << 8 << 8;
 
     // Moving to the row of my parent and its neighbours doesn't confuse things
-    QTest::newRow("move09") << 8 << 8 << 4;
-    QTest::newRow("move10") << 8 << 8 << 5;
-    QTest::newRow("move11") << 8 << 8 << 6;
+    QTest::newRow("move10") << 8 << 8 << 4;
+    QTest::newRow("move11") << 8 << 8 << 5;
+    QTest::newRow("move12") << 8 << 8 << 6;
 
     // Moving everything from one parent to another
-    QTest::newRow("move12") << 0 << 9 << 10;
-    QTest::newRow("move13") << 0 << 9 << 0;
+    QTest::newRow("move13") << 0 << 9 << 10;
+    QTest::newRow("move14") << 0 << 9 << 0;
 }
 
 void tst_QAbstractItemModel::testMoveToGrandParent()
@@ -1397,14 +1397,14 @@ void tst_QAbstractItemModel::testMoveToSibling_data()
     QTest::newRow("move09") << 8 << 8 << 8;
 
     // Moving to the row of my target and its neighbours doesn't confuse things
-    QTest::newRow("move09") << 8 << 8 << 4;
-    QTest::newRow("move10") << 8 << 8 << 5;
-    QTest::newRow("move11") << 8 << 8 << 6;
+    QTest::newRow("move10") << 8 << 8 << 4;
+    QTest::newRow("move11") << 8 << 8 << 5;
+    QTest::newRow("move12") << 8 << 8 << 6;
 
     // Move such that the destination parent no longer valid after the move.
     // The destination parent is always QMI(5, 0), but after this move the
     // row count is 5, so (5, 0) (used internally in QAIM) no longer refers to a valid index.
-    QTest::newRow("move12") << 0 << 4 << 0;
+    QTest::newRow("move13") << 0 << 4 << 0;
 }
 
 void tst_QAbstractItemModel::testMoveToSibling()
@@ -1541,12 +1541,12 @@ void tst_QAbstractItemModel::testMoveToUncle_data()
     QTest::newRow("move09") << 8 << 8 << 8;
 
     // Moving to the row of my parent and its neighbours doesn't confuse things
-    QTest::newRow("move09") << 8 << 8 << 4;
-    QTest::newRow("move10") << 8 << 8 << 5;
-    QTest::newRow("move11") << 8 << 8 << 6;
+    QTest::newRow("move10") << 8 << 8 << 4;
+    QTest::newRow("move11") << 8 << 8 << 5;
+    QTest::newRow("move12") << 8 << 8 << 6;
 
     // Moving everything from one parent to another
-    QTest::newRow("move12") << 0 << 9 << 10;
+    QTest::newRow("move13") << 0 << 9 << 10;
 }
 
 void tst_QAbstractItemModel::testMoveToUncle()
@@ -1734,22 +1734,22 @@ void tst_QAbstractItemModel::testMoveWithinOwnRange_data()
     QTest::newRow("move07") << 0 << 5 << 4;
     QTest::newRow("move08") << 0 << 5 << 5;
     QTest::newRow("move09") << 0 << 5 << 6;
-    QTest::newRow("move08") << 3 << 5 << 5;
-    QTest::newRow("move08") << 3 << 5 << 6;
-    QTest::newRow("move09") << 4 << 5 << 5;
-    QTest::newRow("move10") << 4 << 5 << 6;
-    QTest::newRow("move11") << 5 << 5 << 5;
-    QTest::newRow("move12") << 5 << 5 << 6;
-    QTest::newRow("move13") << 5 << 9 << 9;
-    QTest::newRow("move14") << 5 << 9 << 10;
-    QTest::newRow("move15") << 6 << 9 << 9;
-    QTest::newRow("move16") << 6 << 9 << 10;
-    QTest::newRow("move17") << 7 << 9 << 9;
-    QTest::newRow("move18") << 7 << 9 << 10;
-    QTest::newRow("move19") << 8 << 9 << 9;
-    QTest::newRow("move20") << 8 << 9 << 10;
-    QTest::newRow("move21") << 9 << 9 << 9;
-    QTest::newRow("move22") << 0 << 9 << 10;
+    QTest::newRow("move10") << 3 << 5 << 5;
+    QTest::newRow("move11") << 3 << 5 << 6;
+    QTest::newRow("move12") << 4 << 5 << 5;
+    QTest::newRow("move13") << 4 << 5 << 6;
+    QTest::newRow("move14") << 5 << 5 << 5;
+    QTest::newRow("move15") << 5 << 5 << 6;
+    QTest::newRow("move16") << 5 << 9 << 9;
+    QTest::newRow("move17") << 5 << 9 << 10;
+    QTest::newRow("move18") << 6 << 9 << 9;
+    QTest::newRow("move19") << 6 << 9 << 10;
+    QTest::newRow("move20") << 7 << 9 << 9;
+    QTest::newRow("move21") << 7 << 9 << 10;
+    QTest::newRow("move22") << 8 << 9 << 9;
+    QTest::newRow("move23") << 8 << 9 << 10;
+    QTest::newRow("move24") << 9 << 9 << 9;
+    QTest::newRow("move25") << 0 << 9 << 10;
 }
 
 void tst_QAbstractItemModel::testMoveWithinOwnRange()

diff --git a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
index cbe7da1..d27d685 100644 (file)
--- a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
@@ -779,19 +779,19 @@ void tst_QItemModel::remove_data()
         makeTestRow(":none at the middle", MIDDLE, 0, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
         makeTestRow(":none at the end",    END,    0, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
 
-        makeTestRow(":invalid start, valid count", -99,  0,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":invalid start, valid count", 9999, 0,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":invalid start, valid count", -99,  1,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":invalid start, valid count", 9999, 1,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":invalid start, valid count", -99,  MANY, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":invalid start, valid count", 9999, MANY, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-
-        makeTestRow(":valid start, invalid count",  START,  -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":valid start, invalid count",  MIDDLE, -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":valid start, invalid count",  END,    -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":valid start, invalid count",  START,  9999, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":valid start, invalid count",  MIDDLE, 9999, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":valid start, invalid count",  END,    9999, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":invalid start, valid count 1", -99,  0,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":invalid start, valid count 2", 9999, 0,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":invalid start, valid count 3", -99,  1,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":invalid start, valid count 4", 9999, 1,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":invalid start, valid count 5", -99,  MANY, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":invalid start, valid count 6", 9999, MANY, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+
+        makeTestRow(":valid start, invalid count 1",  START,  -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":valid start, invalid count 2",  MIDDLE, -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":valid start, invalid count 3",  END,    -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":valid start, invalid count 4",  START,  9999, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":valid start, invalid count 5",  MIDDLE, 9999, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":valid start, invalid count 6",  END,    9999, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
 
         // Recursive remove's might assert, haven't decided yet...
         //makeTestRow(":one at the start recursivly",  START,  DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, FAIL);
@@ -1126,16 +1126,16 @@ void tst_QItemModel::insert_data()
         makeTestRow(":none at the middle", MIDDLE, 0, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
         makeTestRow(":none at the end",    END,    0, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
 
-        makeTestRow(":invalid start, valid count", -99,  0,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":invalid start, valid count", 9999, 0,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":invalid start, valid count", -99,  1,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":invalid start, valid count", 9999, 1,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":invalid start, valid count", -99,  MANY, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":invalid start, valid count", 9999, MANY, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":invalid start, valid count 1", -99,  0,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":invalid start, valid count 2", 9999, 0,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":invalid start, valid count 3", -99,  1,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":invalid start, valid count 4", 9999, 1,    NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":invalid start, valid count 5", -99,  MANY, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":invalid start, valid count 6", 9999, MANY, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
 
-        makeTestRow(":valid start, invalid count",  START,  -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":valid start, invalid count",  MIDDLE, -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
-        makeTestRow(":valid start, invalid count",  END,    -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":valid start, invalid count 1",  START,  -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":valid start, invalid count 2",  MIDDLE, -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
+        makeTestRow(":valid start, invalid count 3",  END,    -2,   NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
 
         // Recursive insert's might assert, haven't decided yet...
         //makeTestRow(":one at the start recursivly",  START,  DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, FAIL);

diff --git a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
index 1dd0410..aa4d163 100644 (file)
--- a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
+++ b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
@@ -367,17 +367,17 @@ void tst_QThreadPool::setMaxThreadCount_data()
 {
     QTest::addColumn<int>("limit");
 
-    QTest::newRow("") << 1;
-    QTest::newRow("") << -1;
-    QTest::newRow("") << 2;
-    QTest::newRow("") << -2;
-    QTest::newRow("") << 4;
-    QTest::newRow("") << -4;
-    QTest::newRow("") << 0;
-    QTest::newRow("") << 12345;
-    QTest::newRow("") << -6789;
-    QTest::newRow("") << 42;
-    QTest::newRow("") << -666;
+    QTest::newRow("1") << 1;
+    QTest::newRow("-1") << -1;
+    QTest::newRow("2") << 2;
+    QTest::newRow("-2") << -2;
+    QTest::newRow("4") << 4;
+    QTest::newRow("-4") << -4;
+    QTest::newRow("0") << 0;
+    QTest::newRow("12345") << 12345;
+    QTest::newRow("-6789") << -6789;
+    QTest::newRow("42") << 42;
+    QTest::newRow("-666") << -666;
 }
 
 void tst_QThreadPool::setMaxThreadCount()

diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
index 40e4cc3..5e53683 100644 (file)
--- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
@@ -865,7 +865,7 @@ void tst_QByteArray::indexOf_data()
     QTest::newRow("BoyerMooreStressTest4") << QByteArray(veryBigHaystack) <<  QByteArray(veryBigHaystack + 'c') << 0 << -1;
     QTest::newRow("BoyerMooreStressTest5") << QByteArray(veryBigHaystack) <<  QByteArray('c' + veryBigHaystack) << 0 << -1;
     QTest::newRow("BoyerMooreStressTest6") << QByteArray('d' + veryBigHaystack) <<  QByteArray('c' + veryBigHaystack) << 0 << -1;
-    QTest::newRow("BoyerMooreStressTest6") << QByteArray(veryBigHaystack + 'c') <<  QByteArray('c' + veryBigHaystack) << 0 << -1;
+    QTest::newRow("BoyerMooreStressTest7") << QByteArray(veryBigHaystack + 'c') <<  QByteArray('c' + veryBigHaystack) << 0 << -1;
 }
 
 void tst_QByteArray::indexOf()
@@ -988,13 +988,13 @@ void tst_QByteArray::toInt_data()
     QTest::addColumn<bool>("expectedok");
 
     QTest::newRow("base 10") << QByteArray("100") << 10 << int(100) << true;
-    QTest::newRow("base 16") << QByteArray("100") << 16 << int(256) << true;
-    QTest::newRow("base 16") << QByteArray("0400") << 16 << int(1024) << true;
+    QTest::newRow("base 16-1") << QByteArray("100") << 16 << int(256) << true;
+    QTest::newRow("base 16-2") << QByteArray("0400") << 16 << int(1024) << true;
     QTest::newRow("base 2") << QByteArray("1111") << 2 << int(15) << true;
     QTest::newRow("base 8") << QByteArray("100") << 8 << int(64) << true;
-    QTest::newRow("base 0") << QByteArray("0x10") << 0 << int(16) << true;
-    QTest::newRow("base 0") << QByteArray("10") << 0 << int(10) << true;
-    QTest::newRow("base 0") << QByteArray("010") << 0 << int(8) << true;
+    QTest::newRow("base 0-1") << QByteArray("0x10") << 0 << int(16) << true;
+    QTest::newRow("base 0-2") << QByteArray("10") << 0 << int(10) << true;
+    QTest::newRow("base 0-3") << QByteArray("010") << 0 << int(8) << true;
     QTest::newRow("empty") << QByteArray() << 0 << int(0) << false;
 
     // using fromRawData
@@ -1002,7 +1002,7 @@ void tst_QByteArray::toInt_data()
     QTest::newRow("raw2") << QByteArray::fromRawData("1foo", 1) << 10 << 1 << true;
     QTest::newRow("raw3") << QByteArray::fromRawData("12", 1) << 10 << 1 << true;
     QTest::newRow("raw4") << QByteArray::fromRawData("123456789", 1) << 10 << 1 << true;
-    QTest::newRow("raw4") << QByteArray::fromRawData("123456789", 2) << 10 << 12 << true;
+    QTest::newRow("raw5") << QByteArray::fromRawData("123456789", 2) << 10 << 12 << true;
 
     QTest::newRow("raw-static") << QByteArray::fromRawData(&globalChar, 1) << 10 << 1 << true;
 }
@@ -1394,58 +1394,58 @@ void tst_QByteArray::repeated_data() const
     QTest::addColumn<int>("count" );
 
     /* Empty strings. */
-    QTest::newRow("")
+    QTest::newRow("data1")
         << QByteArray()
         << QByteArray()
         << 0;
 
-    QTest::newRow("")
+    QTest::newRow("data2")
         << QByteArray()
         << QByteArray()
         << -1004;
 
-    QTest::newRow("")
+    QTest::newRow("data3")
         << QByteArray()
         << QByteArray()
         << 1;
 
-    QTest::newRow("")
+    QTest::newRow("data4")
         << QByteArray()
         << QByteArray()
         << 5;
 
     /* On simple string. */
-    QTest::newRow("")
+    QTest::newRow("data5")
         << QByteArray("abc")
         << QByteArray()
         << -1004;
 
-    QTest::newRow("")
+    QTest::newRow("data6")
         << QByteArray("abc")
         << QByteArray()
         << -1;
 
-    QTest::newRow("")
+    QTest::newRow("data7")
         << QByteArray("abc")
         << QByteArray()
         << 0;
 
-    QTest::newRow("")
+    QTest::newRow("data8")
         << QByteArray("abc")
         << QByteArray("abc")
         << 1;
 
-    QTest::newRow("")
+    QTest::newRow("data9")
         << QByteArray(("abc"))
         << QByteArray(("abcabc"))
         << 2;
 
-    QTest::newRow("")
+    QTest::newRow("data10")
         << QByteArray(("abc"))
         << QByteArray(("abcabcabc"))
         << 3;
 
-    QTest::newRow("")
+    QTest::newRow("data11")
         << QByteArray(("abc"))
         << QByteArray(("abcabcabcabc"))
         << 4;

diff --git a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
index 3a257c2..0f35089 100644 (file)
--- a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
+++ b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
@@ -158,8 +158,8 @@ void tst_QCryptographicHash::files_data() {
     QTest::addColumn<QString>("filename");
     QTest::addColumn<QCryptographicHash::Algorithm>("algorithm");
     QTest::addColumn<QByteArray>("md5sum");
-    QTest::newRow("Line") << QString::fromAscii("data/2c1517dad3678f03917f15849b052fd5.md5") << QCryptographicHash::Md5 << QByteArray("2c1517dad3678f03917f15849b052fd5");
-    QTest::newRow("Line") << QString::fromAscii("data/d41d8cd98f00b204e9800998ecf8427e.md5") << QCryptographicHash::Md5 << QByteArray("d41d8cd98f00b204e9800998ecf8427e");
+    QTest::newRow("data1") << QString::fromAscii("data/2c1517dad3678f03917f15849b052fd5.md5") << QCryptographicHash::Md5 << QByteArray("2c1517dad3678f03917f15849b052fd5");
+    QTest::newRow("data2") << QString::fromAscii("data/d41d8cd98f00b204e9800998ecf8427e.md5") << QCryptographicHash::Md5 << QByteArray("d41d8cd98f00b204e9800998ecf8427e");
 }
 
 

diff --git a/tests/auto/corelib/tools/qdate/tst_qdate.cpp b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
index 4921a7e..258dbf8 100644 (file)
--- a/tests/auto/corelib/tools/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
@@ -147,14 +147,14 @@ void tst_QDate::isValid_data()
     QTest::newRow("month 13") << 2000 << 13 << 1 << nullJd << false;
 
     // test leap years
-    QTest::newRow("non-leap")         << 2006 <<  2 << 29 << nullJd  << false;
-    QTest::newRow("normal leap")      << 2004 <<  2 << 29 << qint64(2453065) << true;
-    QTest::newRow("century leap")     << 1900 <<  2 << 29 << nullJd  << false;
-    QTest::newRow("century leap")     << 2100 <<  2 << 29 << nullJd  << false;
-    QTest::newRow("400-years leap")   << 2000 <<  2 << 29 << qint64(2451604) << true;
-    QTest::newRow("400-years leap 2") << 2400 <<  2 << 29 << qint64(2597701) << true;
-    QTest::newRow("400-years leap 3") << 1600 <<  2 << 29 << qint64(2305507) << true;
-    QTest::newRow("year 0")           <<    0 <<  2 << 27 << nullJd  << false;
+    QTest::newRow("non-leap")            << 2006 <<  2 << 29 << nullJd  << false;
+    QTest::newRow("normal leap")         << 2004 <<  2 << 29 << qint64(2453065) << true;
+    QTest::newRow("century leap 1900")   << 1900 <<  2 << 29 << nullJd  << false;
+    QTest::newRow("century leap 2100")   << 2100 <<  2 << 29 << nullJd  << false;
+    QTest::newRow("400-years leap 2000") << 2000 <<  2 << 29 << qint64(2451604) << true;
+    QTest::newRow("400-years leap 2400") << 2400 <<  2 << 29 << qint64(2597701) << true;
+    QTest::newRow("400-years leap 1600") << 1600 <<  2 << 29 << qint64(2305507) << true;
+    QTest::newRow("year 0")              <<    0 <<  2 << 27 << nullJd  << false;
 
     // test the number of days in months:
     QTest::newRow("jan") << 2000 <<  1 << 31 << qint64(2451575) << true;
@@ -262,7 +262,7 @@ void tst_QDate::dayOfWeek_data()
     QTest::newRow("data8")  << -4800 <<  1 <<  1 << 1;
     QTest::newRow("data9")  << -4800 <<  1 <<  2 << 2;
     QTest::newRow("data10") << -4800 <<  1 <<  3 << 3;
-    QTest::newRow("data12") << -4800 <<  1 <<  4 << 4;
+    QTest::newRow("data11") << -4800 <<  1 <<  4 << 4;
     QTest::newRow("data12") << -4800 <<  1 <<  5 << 5;
     QTest::newRow("data13") << -4800 <<  1 <<  6 << 6;
     QTest::newRow("data14") << -4800 <<  1 <<  7 << 7;
@@ -580,10 +580,10 @@ void tst_QDate::addMonths_data()
     QTest::newRow( "data14" ) << 2000 << 2 << 29 << -12 << 1999 << 2 << 28;
 
     // year sign change:
-    QTest::newRow( "data14" ) << 1 << 1 << 1 << -1 << -1 << 12 << 1;
-    QTest::newRow( "data15" ) << 1 << 1 << 1 << -12 << -1 << 1 << 1;
-    QTest::newRow( "data16" ) << -1 << 12 << 1 << 1 << 1 << 1 << 1;
-    QTest::newRow( "data17" ) << -1 << 1 << 1 << 12 << 1 << 1 << 1;
+    QTest::newRow( "data15" ) << 1 << 1 << 1 << -1 << -1 << 12 << 1;
+    QTest::newRow( "data16" ) << 1 << 1 << 1 << -12 << -1 << 1 << 1;
+    QTest::newRow( "data17" ) << -1 << 12 << 1 << 1 << 1 << 1 << 1;
+    QTest::newRow( "data18" ) << -1 << 1 << 1 << 12 << 1 << 1 << 1;
 }
 
 void tst_QDate::addYears()

diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index af8deef..eb6af23 100644 (file)
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
@@ -1363,19 +1363,19 @@ void tst_QDateTime::dateFromStringFormat_data()
     QTest::newRow("data24") << tuesday << QString("dddd") << QDate(1900, 1, 2);
     QTest::newRow("data25") << wednesday << QString("dddd") << QDate(1900, 1, 3);
     QTest::newRow("data26") << thursday << QString("dddd") << QDate(1900, 1, 4);
-    QTest::newRow("data26") << friday << QString("dddd") << QDate(1900, 1, 5);
-    QTest::newRow("data27") << saturday << QString("dddd") << QDate(1900, 1, 6);
-    QTest::newRow("data28") << sunday << QString("dddd") << QDate(1900, 1, 7);
-
-    QTest::newRow("data29") << monday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 2);
-    QTest::newRow("data30") << tuesday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 3);
-    QTest::newRow("data31") << wednesday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 4);
-    QTest::newRow("data32") << thursday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 5);
-    QTest::newRow("data33") << friday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 6);
-    QTest::newRow("data34") << saturday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 7);
-    QTest::newRow("data35") << sunday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 1);
-
-    QTest::newRow("data36 ") << tuesday + " 2007 " + march << QString("dddd yyyy MMMM") << QDate(2007, 3, 6);
+    QTest::newRow("data27") << friday << QString("dddd") << QDate(1900, 1, 5);
+    QTest::newRow("data28") << saturday << QString("dddd") << QDate(1900, 1, 6);
+    QTest::newRow("data29") << sunday << QString("dddd") << QDate(1900, 1, 7);
+
+    QTest::newRow("data30") << monday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 2);
+    QTest::newRow("data31") << tuesday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 3);
+    QTest::newRow("data32") << wednesday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 4);
+    QTest::newRow("data33") << thursday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 5);
+    QTest::newRow("data34") << friday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 6);
+    QTest::newRow("data35") << saturday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 7);
+    QTest::newRow("data36") << sunday + " 2006" << QString("dddd yyyy") << QDate(2006, 1, 1);
+
+    QTest::newRow("data37") << tuesday + " 2007 " + march << QString("dddd yyyy MMMM") << QDate(2007, 3, 6);
 
 }
 

diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index 5544c0f..e23448c 100644 (file)
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -934,7 +934,7 @@ void tst_QLocale::formatDateTime_data()
                          << "\"yymm\"" << "\"7414\"";
     QTest::newRow("27C") << "C" << QDateTime(QDate(1974, 12, 1), QTime(15, 14, 13))
                          << "'\"yymm\"'" << "\"yymm\"";
-    QTest::newRow("27C") << "C" << QDateTime()
+    QTest::newRow("28C") << "C" << QDateTime()
                          << "'\"yymm\"'" << "";
 
     QTest::newRow("1no_NO") << "no_NO" << QDateTime(QDate(1974, 12, 1), QTime(5, 14, 13))
@@ -976,7 +976,7 @@ void tst_QLocale::formatDateTime_data()
                              << "\"yymm\"" << "\"7414\"";
     QTest::newRow("27no_NO") << "no_NO" << QDateTime(QDate(1974, 12, 1), QTime(15, 14, 13))
                              << "'\"yymm\"'" << "\"yymm\"";
-    QTest::newRow("27no_NO") << "no_NO" << QDateTime()
+    QTest::newRow("28no_NO") << "no_NO" << QDateTime()
                              << "'\"yymm\"'" << "";
 
 }

diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
index 3be7302..3fb253c 100644 (file)
--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
@@ -447,7 +447,7 @@ void tst_QString::replace_uint_uint_data()
     QTest::newRow( "rep08" ) << QString("ACABCAB") << 3 << 2 << QString("XX") << QString("ACAXXAB");
     QTest::newRow( "rep09" ) << QString("ACABCAB") << 4 << 2 << QString("XX") << QString("ACABXXB");
     QTest::newRow( "rep10" ) << QString("ACABCAB") << 5 << 2 << QString("XX") << QString("ACABCXX");
-    QTest::newRow( "rep10" ) << QString("ACABCAB") << 6 << 2 << QString("XX") << QString("ACABCAXX");
+    QTest::newRow( "rep11" ) << QString("ACABCAB") << 6 << 2 << QString("XX") << QString("ACABCAXX");
     QTest::newRow( "rep12" ) << QString() << 0 << 10 << QString("X") << QString("X");
     QTest::newRow( "rep13" ) << QString("short") << 0 << 10 << QString("X") << QString("X");
     QTest::newRow( "rep14" ) << QString() << 0 << 10 << QString("XX") << QString("XX");
@@ -1042,7 +1042,7 @@ void tst_QString::indexOf_data()
     QTest::newRow("BoyerMooreStressTest4") << veryBigHaystack << QString(veryBigHaystack + 'c') << 0 << true << -1;
     QTest::newRow("BoyerMooreStressTest5") << veryBigHaystack << QString('c' + veryBigHaystack) << 0 << true << -1;
     QTest::newRow("BoyerMooreStressTest6") << QString('d' + veryBigHaystack) << QString('c' + veryBigHaystack) << 0 << true << -1;
-    QTest::newRow("BoyerMooreStressTest6") << QString(veryBigHaystack + 'c') << QString('c' + veryBigHaystack) << 0 << true << -1;
+    QTest::newRow("BoyerMooreStressTest7") << QString(veryBigHaystack + 'c') << QString('c' + veryBigHaystack) << 0 << true << -1;
 
     QTest::newRow("BoyerMooreInsensitiveStressTest") << veryBigHaystack << veryBigHaystack << 0 << false << 0;
 
@@ -1211,15 +1211,15 @@ void tst_QString::lastIndexOf_data()
     QTest::newRow("4") << a << "G" << 14 << 14 << true;
     QTest::newRow("5") << a << "G" << 13 << 11 << true;
     QTest::newRow("6") << a << "B" << a.size() - 1 << 1 << true;
-    QTest::newRow("6") << a << "B" << - 1 << 1 << true;
-    QTest::newRow("7") << a << "B" << 1 << 1 << true;
-    QTest::newRow("8") << a << "B" << 0 << -1 << true;
+    QTest::newRow("7") << a << "B" << - 1 << 1 << true;
+    QTest::newRow("8") << a << "B" << 1 << 1 << true;
+    QTest::newRow("9") << a << "B" << 0 << -1 << true;
 
-    QTest::newRow("9") << a << "G" <<  -1 <<  a.size()-1 << true;
-    QTest::newRow("10") << a << "G" <<  a.size()-1 <<  a.size()-1 << true;
-    QTest::newRow("11") << a << "G" <<  a.size() <<  -1 << true;
-    QTest::newRow("12") << a << "A" <<  0 <<  0 << true;
-    QTest::newRow("13") << a << "A" <<  -1*a.size() <<  0 << true;
+    QTest::newRow("10") << a << "G" <<  -1 <<  a.size()-1 << true;
+    QTest::newRow("11") << a << "G" <<  a.size()-1 <<  a.size()-1 << true;
+    QTest::newRow("12") << a << "G" <<  a.size() <<  -1 << true;
+    QTest::newRow("13") << a << "A" <<  0 <<  0 << true;
+    QTest::newRow("14") << a << "A" <<  -1*a.size() <<  0 << true;
 
     QTest::newRow("15") << a << "efg" << 0 << -1 << false;
     QTest::newRow("16") << a << "efg" << a.size() << -1 << false;
@@ -4672,8 +4672,8 @@ void tst_QString::compare_data()
 
     // different length
     QTest::newRow("data6") << QString("abcdef") << QString("abc") << 1 << 1;
-    QTest::newRow("data6") << QString("abCdef") << QString("abc") << -1 << 1;
-    QTest::newRow("data7") << QString("abc") << QString("abcdef") << -1 << -1;
+    QTest::newRow("data7") << QString("abCdef") << QString("abc") << -1 << 1;
+    QTest::newRow("data8") << QString("abc") << QString("abcdef") << -1 << -1;
 
     QString upper;
     upper += QChar(QChar::highSurrogate(0x10400));
@@ -4685,12 +4685,12 @@ void tst_QString::compare_data()
 
     // embedded nulls
     // These don't work as of now. It's OK that these don't work since \0 is not a valid unicode
-    /*QTest::newRow("data9") << QString(QByteArray("\0", 1)) << QString(QByteArray("\0", 1)) << 0 << 0;
-    QTest::newRow("data10") << QString(QByteArray("\0", 1)) << QString("") << 1 << 1;
-    QTest::newRow("data11") << QString("") << QString(QByteArray("\0", 1)) << -1 << -1;
-    QTest::newRow("data12") << QString("ab\0c") << QString(QByteArray("ab\0c", 4)) << 0 << 0;
-    QTest::newRow("data13") << QString(QByteArray("ab\0c", 4)) << QString("abc") << -1 << -1;
-    QTest::newRow("data14") << QString("abc") << QString(QByteArray("ab\0c", 4)) << 1 << 1;*/
+    /*QTest::newRow("data10") << QString(QByteArray("\0", 1)) << QString(QByteArray("\0", 1)) << 0 << 0;
+    QTest::newRow("data11") << QString(QByteArray("\0", 1)) << QString("") << 1 << 1;
+    QTest::newRow("data12") << QString("") << QString(QByteArray("\0", 1)) << -1 << -1;
+    QTest::newRow("data13") << QString("ab\0c") << QString(QByteArray("ab\0c", 4)) << 0 << 0;
+    QTest::newRow("data14") << QString(QByteArray("ab\0c", 4)) << QString("abc") << -1 << -1;
+    QTest::newRow("data15") << QString("abc") << QString(QByteArray("ab\0c", 4)) << 1 << 1;*/
 }
 
 static bool isLatin(const QString &s)
@@ -4934,58 +4934,58 @@ void tst_QString::repeated_data() const
     QTest::addColumn<int>("count" );
 
     /* Empty strings. */
-    QTest::newRow("")
+    QTest::newRow("data1")
         << QString()
         << QString()
         << 0;
 
-    QTest::newRow("")
+    QTest::newRow("data2")
         << QString()
         << QString()
         << -1004;
 
-    QTest::newRow("")
+    QTest::newRow("data3")
         << QString()
         << QString()
         << 1;
 
-    QTest::newRow("")
+    QTest::newRow("data4")
         << QString()
         << QString()
         << 5;
 
     /* On simple string. */
-    QTest::newRow("")
+    QTest::newRow("data5")
         << QString(QLatin1String("abc"))
         << QString()
         << -1004;
 
-    QTest::newRow("")
+    QTest::newRow("data6")
         << QString(QLatin1String("abc"))
         << QString()
         << -1;
 
-    QTest::newRow("")
+    QTest::newRow("data7")
         << QString(QLatin1String("abc"))
         << QString()
         << 0;
 
-    QTest::newRow("")
+    QTest::newRow("data8")
         << QString(QLatin1String("abc"))
         << QString(QLatin1String("abc"))
         << 1;
 
-    QTest::newRow("")
+    QTest::newRow("data9")
         << QString(QLatin1String("abc"))
         << QString(QLatin1String("abcabc"))
         << 2;
 
-    QTest::newRow("")
+    QTest::newRow("data10")
         << QString(QLatin1String("abc"))
         << QString(QLatin1String("abcabcabc"))
         << 3;
 
-    QTest::newRow("")
+    QTest::newRow("data11")
         << QString(QLatin1String("abc"))
         << QString(QLatin1String("abcabcabcabc"))
         << 4;

diff --git a/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp b/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp
index e3eb1a2..6066f7c 100644 (file)
--- a/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp
+++ b/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp
@@ -193,8 +193,8 @@ void tst_QStringList::removeDuplicates_data()
     QTest::addColumn<QString>("after");
     QTest::addColumn<int>("count");
 
-    QTest::newRow("empty") << "Hello,Hello" << "Hello" << 1;
-    QTest::newRow("empty") << "Hello,World" << "Hello,World" << 0;
+    QTest::newRow("empty-1") << "Hello,Hello" << "Hello" << 1;
+    QTest::newRow("empty-2") << "Hello,World" << "Hello,World" << 0;
 }
 
 void tst_QStringList::removeDuplicates()
@@ -245,35 +245,35 @@ void tst_QStringList::join_data() const
     QTest::addColumn<QString>("separator");
     QTest::addColumn<QString>("expectedResult");
 
-    QTest::newRow("")
+    QTest::newRow("data1")
                 << QStringList()
                 << QString()
                 << QString();
 
-    QTest::newRow("")
+    QTest::newRow("data2")
                 << QStringList()
                 << QString(QLatin1String("separator"))
                 << QString();
 
-    QTest::newRow("")
+    QTest::newRow("data3")
                 << QStringList("one")
                 << QString(QLatin1String("separator"))
                 << QString("one");
 
-    QTest::newRow("")
+    QTest::newRow("data4")
                 << QStringList("one")
                 << QString(QLatin1String("separator"))
                 << QString("one");
 
 
-    QTest::newRow("")
+    QTest::newRow("data5")
                 << (QStringList()
                         << QLatin1String("a")
                         << QLatin1String("b"))
                 << QString(QLatin1String(" "))
                 << QString("a b");
 
-    QTest::newRow("")
+    QTest::newRow("data6")
                 << (QStringList()
                         << QLatin1String("a")
                         << QLatin1String("b")

diff --git a/tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp b/tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp
index ebbad86..5829c0e 100644 (file)
--- a/tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp
+++ b/tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp
@@ -81,16 +81,16 @@ void tst_QStringMatcher::indexIn_data()
     QTest::addColumn<QString>("haystack");
     QTest::addColumn<int>("from");
     QTest::addColumn<int>("indexIn");
-    QTest::newRow("empty") << QString() << QString("foo") << 0 << 0;
-    QTest::newRow("empty") << QString() << QString("foo") << 10 << -1;
-    QTest::newRow("empty") << QString() << QString("foo") << -10 << 0;
-
-    QTest::newRow("simple") << QString("a") << QString("foo") << 0 << -1;
-    QTest::newRow("simple") << QString("a") << QString("bar") << 0 << 1;
-    QTest::newRow("harder") << QString("foo") << QString("slkdf sldkjf slakjf lskd ffools ldjf") << 0 << 26;
-    QTest::newRow("harder") << QString("foo") << QString("slkdf sldkjf slakjf lskd ffools ldjf") << 20 << 26;
-    QTest::newRow("harder") << QString("foo") << QString("slkdf sldkjf slakjf lskd ffools ldjf") << 26 << 26;
-    QTest::newRow("harder") << QString("foo") << QString("slkdf sldkjf slakjf lskd ffools ldjf") << 27 << -1;
+    QTest::newRow("empty-1") << QString() << QString("foo") << 0 << 0;
+    QTest::newRow("empty-2") << QString() << QString("foo") << 10 << -1;
+    QTest::newRow("empty-3") << QString() << QString("foo") << -10 << 0;
+
+    QTest::newRow("simple-1") << QString("a") << QString("foo") << 0 << -1;
+    QTest::newRow("simple-2") << QString("a") << QString("bar") << 0 << 1;
+    QTest::newRow("harder-1") << QString("foo") << QString("slkdf sldkjf slakjf lskd ffools ldjf") << 0 << 26;
+    QTest::newRow("harder-2") << QString("foo") << QString("slkdf sldkjf slakjf lskd ffools ldjf") << 20 << 26;
+    QTest::newRow("harder-3") << QString("foo") << QString("slkdf sldkjf slakjf lskd ffools ldjf") << 26 << 26;
+    QTest::newRow("harder-4") << QString("foo") << QString("slkdf sldkjf slakjf lskd ffools ldjf") << 27 << -1;
 }
 
 void tst_QStringMatcher::indexIn()

diff --git a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
index 77d2101..de01df2 100644 (file)
--- a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
+++ b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
@@ -288,7 +288,7 @@ void tst_QStringRef::indexOf_data()
     QTest::newRow("BoyerMooreStressTest4") << veryBigHaystack << veryBigHaystack + 'c' << 0 << true << -1;
     QTest::newRow("BoyerMooreStressTest5") << veryBigHaystack << 'c' + veryBigHaystack << 0 << true << -1;
     QTest::newRow("BoyerMooreStressTest6") << 'd' + veryBigHaystack << 'c' + veryBigHaystack << 0 << true << -1;
-    QTest::newRow("BoyerMooreStressTest6") << veryBigHaystack + 'c' << 'c' + veryBigHaystack << 0 << true << -1;
+    QTest::newRow("BoyerMooreStressTest7") << veryBigHaystack + 'c' << 'c' + veryBigHaystack << 0 << true << -1;
 
     QTest::newRow("BoyerMooreInsensitiveStressTest") << veryBigHaystack << veryBigHaystack << 0 << false << 0;
 
@@ -441,15 +441,15 @@ void tst_QStringRef::lastIndexOf_data()
     QTest::newRow("4") << a << "G" << 14 << 14 << true;
     QTest::newRow("5") << a << "G" << 13 << 11 << true;
     QTest::newRow("6") << a << "B" << a.size() - 1 << 1 << true;
-    QTest::newRow("6") << a << "B" << - 1 << 1 << true;
-    QTest::newRow("7") << a << "B" << 1 << 1 << true;
-    QTest::newRow("8") << a << "B" << 0 << -1 << true;
+    QTest::newRow("7") << a << "B" << - 1 << 1 << true;
+    QTest::newRow("8") << a << "B" << 1 << 1 << true;
+    QTest::newRow("9") << a << "B" << 0 << -1 << true;
 
-    QTest::newRow("9") << a << "G" <<  -1 <<  a.size()-1 << true;
-    QTest::newRow("10") << a << "G" <<  a.size()-1 <<  a.size()-1 << true;
-    QTest::newRow("11") << a << "G" <<  a.size() <<  -1 << true;
-    QTest::newRow("12") << a << "A" <<  0 <<  0 << true;
-    QTest::newRow("13") << a << "A" <<  -1*a.size() <<  0 << true;
+    QTest::newRow("10") << a << "G" <<  -1 <<  a.size()-1 << true;
+    QTest::newRow("11") << a << "G" <<  a.size()-1 <<  a.size()-1 << true;
+    QTest::newRow("12") << a << "G" <<  a.size() <<  -1 << true;
+    QTest::newRow("13") << a << "A" <<  0 <<  0 << true;
+    QTest::newRow("14") << a << "A" <<  -1*a.size() <<  0 << true;
 
     QTest::newRow("15") << a << "efg" << 0 << -1 << false;
     QTest::newRow("16") << a << "efg" << a.size() << -1 << false;
@@ -777,8 +777,8 @@ void tst_QStringRef::compare_data()
 
     // different length
     QTest::newRow("data6") << QString("abcdef") << QString("abc") << 1 << 1;
-    QTest::newRow("data6") << QString("abCdef") << QString("abc") << -1 << 1;
-    QTest::newRow("data7") << QString("abc") << QString("abcdef") << -1 << -1;
+    QTest::newRow("data7") << QString("abCdef") << QString("abc") << -1 << 1;
+    QTest::newRow("data8") << QString("abc") << QString("abcdef") << -1 << -1;
 
     QString upper;
     upper += QChar(QChar::highSurrogate(0x10400));
@@ -786,7 +786,7 @@ void tst_QStringRef::compare_data()
     QString lower;
     lower += QChar(QChar::highSurrogate(0x10428));
     lower += QChar(QChar::lowSurrogate(0x10428));
-    QTest::newRow("data8") << upper << lower << -1 << 0;
+    QTest::newRow("data9") << upper << lower << -1 << 0;
 }
 
 static bool isLatin(const QString &s)

diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
index 89dd01a..b8ae709 100644 (file)
--- a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
@@ -302,22 +302,22 @@ void tst_QTextBoundaryFinder::toNextBoundary_data()
 
     QList<int> boundaries;
     boundaries << 0 << 3 << 4 << 7 << 8 << 11 << 12 << 13 << 16 << 17 << 20 << 21 << 24 << 25;
-    QTest::newRow("Line") << QString("Aaa bbb ccc. Ddd eee fff.") << int(QTextBoundaryFinder::Word) \
+    QTest::newRow("data1") << QString("Aaa bbb ccc. Ddd eee fff.") << int(QTextBoundaryFinder::Word) \
             << boundaries;
 
     boundaries.clear();
     boundaries << 0 << 13 << 25;
-    QTest::newRow("Line") << QString("Aaa bbb ccc. Ddd eee fff.") << int(QTextBoundaryFinder::Sentence) \
+    QTest::newRow("data2") << QString("Aaa bbb ccc. Ddd eee fff.") << int(QTextBoundaryFinder::Sentence) \
             << boundaries;
 
     boundaries.clear();
     boundaries << 0 << 4 << 8 << 13 << 17 << 21 << 25;
-    QTest::newRow("Line") << QString("Aaa bbb ccc. Ddd eee fff.") << int(QTextBoundaryFinder::Line) \
+    QTest::newRow("data3") << QString("Aaa bbb ccc. Ddd eee fff.") << int(QTextBoundaryFinder::Line) \
             << boundaries;
 
     boundaries.clear();
     boundaries << 0 << 5 << 9 << 15 << 17 << 21 << 28;
-    QTest::newRow("Line") << QString::fromUtf8("Diga-nos qualé a sua opinião") << int(QTextBoundaryFinder::Line)
+    QTest::newRow("data4") << QString::fromUtf8("Diga-nos qualé a sua opinião") << int(QTextBoundaryFinder::Line)
             << boundaries;
 
 }
@@ -344,22 +344,22 @@ void tst_QTextBoundaryFinder::toPreviousBoundary_data()
 
     QList<int> boundaries;
     boundaries << 25 << 24 << 21 << 20 << 17 << 16 << 13 << 12 << 11 << 8 << 7 << 4 << 3 << 0;
-    QTest::newRow("Line") << QString("Aaa bbb ccc. Ddd eee fff.") << int(QTextBoundaryFinder::Word)
+    QTest::newRow("data1") << QString("Aaa bbb ccc. Ddd eee fff.") << int(QTextBoundaryFinder::Word)
             << boundaries;
 
     boundaries.clear();
     boundaries << 25 << 13 << 0;
-    QTest::newRow("Line") << QString("Aaa bbb ccc. Ddd eee fff.") << int(QTextBoundaryFinder::Sentence)
+    QTest::newRow("data2") << QString("Aaa bbb ccc. Ddd eee fff.") << int(QTextBoundaryFinder::Sentence)
             << boundaries;
 
     boundaries.clear();
     boundaries << 25 << 21 << 17 << 13 << 8 << 4 << 0;
-    QTest::newRow("Line") << QString("Aaa bbb ccc. Ddd eee fff.") << int(QTextBoundaryFinder::Line)
+    QTest::newRow("data3") << QString("Aaa bbb ccc. Ddd eee fff.") << int(QTextBoundaryFinder::Line)
             << boundaries;
 
     boundaries.clear();
     boundaries << 28 << 21 << 17 << 15 << 9 << 5 << 0;
-    QTest::newRow("Line") << QString::fromUtf8("Diga-nos qualé a sua opinião") << int(QTextBoundaryFinder::Line)
+    QTest::newRow("data4") << QString::fromUtf8("Diga-nos qualé a sua opinião") << int(QTextBoundaryFinder::Line)
             << boundaries;
 
 }

diff --git a/tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp b/tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp
index 0ce0da0..bd9fa2a 100644 (file)
--- a/tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp
+++ b/tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp
@@ -674,7 +674,7 @@ void tst_QXmlStream::reportSuccess_data() const
     const int len = m_handler.successes.count();
 
     for(int i = 0; i < len; ++i)
-        QTest::newRow(m_handler.successes.at(i).toLatin1().constData()) << false;
+        QTest::newRow(qPrintable(QString("%1. %2").arg(i).arg(m_handler.successes.at(i)))) << false;
 
     if(len == 0)
         QTest::newRow("No test cases succeeded.") << true;