From e27c07389bcf8b6c5cc1c356a3ee1759045270a8 Mon Sep 17 00:00:00 2001
From: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
Date: Fri, 8 Jul 2016 11:27:50 +0300
Subject: [PATCH] QString: adapt chop() auto test as data-driven test

Thiago Macieira asked to do that.

Change-Id: I9a07dad7ff2bfebc2f863e0e9f151aab66450bcf
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 .../corelib/tools/qstring/tst_qstring.cpp     | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
index 601987086d..3bacf5d942 100644
--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
@@ -482,6 +482,7 @@ private slots:
     void sprintf();
     void fill();
     void truncate();
+    void chop_data();
     void chop();
     void constructor();
     void constructorQByteArray_data();
@@ -1222,29 +1223,29 @@ void tst_QString::truncate()
 
 }
 
-void tst_QString::chop()
+void tst_QString::chop_data()
 {
+    QTest::addColumn<QString>("input");
+    QTest::addColumn<int>("count" );
+    QTest::addColumn<QString>("result");
+
     const QString original("abcd");
 
-    QString str = original;
-    str.chop(1);
-    QCOMPARE(str, QLatin1String("abc"));
+    QTest::newRow("data0") << original << 1 << QString("abc");
+    QTest::newRow("data1") << original << 0 << original;
+    QTest::newRow("data2") << original << -1 << original;
+    QTest::newRow("data3") << original << original.size() << QString();
+    QTest::newRow("data4") << original << 1000  << QString();
+}
 
-    str = original;
-    str.chop(0);
-    QCOMPARE(str, original);
+void tst_QString::chop()
+{
+    QFETCH(QString, input);
+    QFETCH(int, count);
+    QFETCH(QString, result);
 
-    str = original;
-    str.chop(-1);
-    QCOMPARE(str, original);
-
-    str = original;
-    str.chop(original.size());
-    QVERIFY(str.isEmpty());
-
-    str = original;
-    str.chop(1000);
-    QVERIFY(str.isEmpty());
+    input.chop(count);
+    QCOMPARE(input, result);
 }
 
 void tst_QString::fill()