Refactor tst_QScriptValue::isArray

The test should _data function. It should be easier to maintain that
code.

Reviewed-by: Kent Hansen

2 files changed, 22 insertions, 9 deletions

diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index e5af792..eee2a6e 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -1635,17 +1635,29 @@ void tst_QScriptValue::instanceOf()
     QCOMPARE(obj.instanceOf(otherEngine.globalObject().property("Object")), false);
 }
 
+void tst_QScriptValue::isArray_data()
+{
+    newEngine();
+
+    QTest::addColumn<QScriptValue>("value");
+    QTest::addColumn<bool>("array");
+
+    QTest::newRow("[]") << engine->evaluate("[]") << true;
+    QTest::newRow("{}") << engine->evaluate("{}") << false;
+    QTest::newRow("globalObject") << engine->globalObject() << false;
+    QTest::newRow("invalid") << QScriptValue() << false;
+    QTest::newRow("number") << QScriptValue(123) << false;
+    QTest::newRow("bool") << QScriptValue(false) << false;
+    QTest::newRow("null") << engine->nullValue() << false;
+    QTest::newRow("undefined") << engine->undefinedValue() << false;
+}
+
 void tst_QScriptValue::isArray()
 {
-    QScriptEngine eng;
-    QVERIFY(eng.evaluate("[]").isArray());
-    QVERIFY(!eng.evaluate("{}").isArray());
-    QVERIFY(!eng.globalObject().isArray());
-    QVERIFY(!QScriptValue().isArray());
-    QVERIFY(!QScriptValue(123).isArray());
-    QVERIFY(!QScriptValue(false).isArray());
-    QVERIFY(!eng.nullValue().isArray());
-    QVERIFY(!eng.undefinedValue().isArray());
+    QFETCH(QScriptValue, value);
+    QFETCH(bool, array);
+
+    QCOMPARE(value.isArray(), array);
 }
 
 void tst_QScriptValue::isDate()
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.h b/tests/auto/qscriptvalue/tst_qscriptvalue.h
index 7eb4f04..ad6ca8d 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.h
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.h
@@ -95,6 +95,7 @@ private slots:
     void toDateTime();
     void toRegExp();
     void instanceOf();
+    void isArray_data();
     void isArray();
     void isDate();
     void isError();