From c7221d3ce40f07ce702d732b72978de315b6b194 Mon Sep 17 00:00:00 2001
From: Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Date: Fri, 29 Oct 2010 17:10:54 +0200
Subject: Refactor tst_QScriptValue::instanceOf

The test was divided into two separate cases, it should reduce
maintenance costs.

Reviewed-by: Kent Hansen
---
 tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 13 +++++++++----
 tests/auto/qscriptvalue/tst_qscriptvalue.h   |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index 5de0116..c7f496b 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -1599,6 +1599,15 @@ void tst_QScriptValue::toRegExp()
     QVERIFY(eng.undefinedValue().toRegExp().isEmpty());
 }
 
+void tst_QScriptValue::instanceOf_twoEngines()
+{
+    QScriptEngine eng;
+    QScriptValue obj = eng.newObject();
+    QScriptEngine otherEngine;
+    QTest::ignoreMessage(QtWarningMsg, "QScriptValue::instanceof: cannot perform operation on a value created in a different engine");
+    QCOMPARE(obj.instanceOf(otherEngine.globalObject().property("Object")), false);
+}
+
 void tst_QScriptValue::instanceOf()
 {
     QScriptEngine eng;
@@ -1629,10 +1638,6 @@ void tst_QScriptValue::instanceOf()
     QCOMPARE(arr.instanceOf(eng.evaluate("QObject")), false);
 
     QCOMPARE(QScriptValue().instanceOf(arr), false);
-
-    QScriptEngine otherEngine;
-    QTest::ignoreMessage(QtWarningMsg, "QScriptValue::instanceof: cannot perform operation on a value created in a different engine");
-    QCOMPARE(obj.instanceOf(otherEngine.globalObject().property("Object")), false);
 }
 
 void tst_QScriptValue::isArray_data()
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.h b/tests/auto/qscriptvalue/tst_qscriptvalue.h
index 782fb67..977b3a5 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.h
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.h
@@ -94,6 +94,7 @@ private slots:
     void toQObject();
     void toDateTime();
     void toRegExp();
+    void instanceOf_twoEngines();
     void instanceOf();
     void isArray_data();
     void isArray();
-- 
cgit v0.12