Eliminate duplicate data row names from corelib autotests.

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

2 files changed, 51 insertions, 51 deletions

diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
index 2ca5df477b..8d451dbff9 100644
--- 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 cbe7da11ad..d27d685f37 100644
--- 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);