Increase range of getSetScriptClass test.

Few bound QScriptValue instances were added to the test.

Reviewed-by: Kent Hansen

2 files changed, 22 insertions, 7 deletions

diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index 4232aff..e5af792 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -56,7 +56,8 @@ tst_QScriptValue::tst_QScriptValue()
 
 tst_QScriptValue::~tst_QScriptValue()
 {
-    delete engine;
+    if (engine)
+        delete engine;
 }
 
 void tst_QScriptValue::ctor_invalid()
@@ -2278,8 +2279,9 @@ public:
     TestScriptClass(QScriptEngine *engine) : QScriptClass(engine) {}
 };
 
-void tst_QScriptValue::getSetScriptClass_nonObjects_data()
+void tst_QScriptValue::getSetScriptClass_emptyClass_data()
 {
+    newEngine();
     QTest::addColumn<QScriptValue>("value");
 
     QTest::newRow("invalid") << QScriptValue();
@@ -2288,9 +2290,18 @@ void tst_QScriptValue::getSetScriptClass_nonObjects_data()
     QTest::newRow("bool") << QScriptValue(false);
     QTest::newRow("null") << QScriptValue(QScriptValue::NullValue);
     QTest::newRow("undefined") << QScriptValue(QScriptValue::UndefinedValue);
+
+    QTest::newRow("number") << QScriptValue(engine, 123);
+    QTest::newRow("string") << QScriptValue(engine, "pong");
+    QTest::newRow("bool") << QScriptValue(engine, true);
+    QTest::newRow("null") << QScriptValue(engine->nullValue());
+    QTest::newRow("undefined") << QScriptValue(engine->undefinedValue());
+    QTest::newRow("object") << QScriptValue(engine->newObject());
+    QTest::newRow("date") << QScriptValue(engine->evaluate("new Date()"));
+    QTest::newRow("qobject") << QScriptValue(engine->newQObject(this));
 }
 
-void tst_QScriptValue::getSetScriptClass_nonObjects()
+void tst_QScriptValue::getSetScriptClass_emptyClass()
 {
     QFETCH(QScriptValue, value);
     QCOMPARE(value.scriptClass(), (QScriptClass*)0);
@@ -2303,7 +2314,6 @@ void tst_QScriptValue::getSetScriptClass_JSObjectFromCpp()
     // object created in C++ (newObject())
     {
         QScriptValue obj = eng.newObject();
-        QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
         obj.setScriptClass(&testClass);
         QCOMPARE(obj.scriptClass(), (QScriptClass*)&testClass);
         obj.setScriptClass(0);
@@ -2355,7 +2365,6 @@ void tst_QScriptValue::getSetScriptClass_QObject()
     {
         QScriptValue obj = eng.newQObject(this);
         QVERIFY(obj.isQObject());
-        QCOMPARE(obj.scriptClass(), (QScriptClass*)0);
         obj.setScriptClass(&testClass);
         QCOMPARE(obj.scriptClass(), (QScriptClass*)&testClass);
         QVERIFY(obj.isObject());
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.h b/tests/auto/qscriptvalue/tst_qscriptvalue.h
index d196ea5..7eb4f04 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.h
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.h
@@ -109,8 +109,8 @@ private slots:
     void getSetProperty();
     void arrayElementGetterSetter();
     void getSetData();
-    void getSetScriptClass_nonObjects_data();
-    void getSetScriptClass_nonObjects();
+    void getSetScriptClass_emptyClass_data();
+    void getSetScriptClass_emptyClass();
     void getSetScriptClass_JSObjectFromCpp();
     void getSetScriptClass_JSObjectFromJS();
     void getSetScriptClass_QVariant();
@@ -128,6 +128,12 @@ private slots:
     void nestedObjectToVariant();
 
 private:
+    void newEngine()
+    {
+        if (engine)
+            delete engine;
+        engine = new QScriptEngine();
+    }
     QScriptEngine *engine;
 };