From ed8735a5cc5eea3c0107e0d0a95447ba6fc11d19 Mon Sep 17 00:00:00 2001 From: Sascha Kolewa Date: Mon, 20 Dec 2010 17:43:06 +0100 Subject: Added object comparison to TestCase QML class --- tests/qmlauto/selftests/tst_compareObjects.qml | 33 ++++++++++++++++++++++++++ tests/qmlauto/tst_compare.qml | 12 ---------- 2 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 tests/qmlauto/selftests/tst_compareObjects.qml delete mode 100644 tests/qmlauto/tst_compare.qml (limited to 'tests') diff --git a/tests/qmlauto/selftests/tst_compareObjects.qml b/tests/qmlauto/selftests/tst_compareObjects.qml new file mode 100644 index 0000000..84fe3fe --- /dev/null +++ b/tests/qmlauto/selftests/tst_compareObjects.qml @@ -0,0 +1,33 @@ +import Qt 4.7 +import QtQuickTest 1.0 + +TestCase { + name: "SelfTests_CompareObjects" + + function test_qtest_internalCompareObjects() { + var testObj11 = {a: 1, b: "foo", c: true}; + var testObj12 = {a: 1, b: "foo", c: true}; + var testObj21 = {a: 1, b: "foo", c: true, d: testObj11}; + var testObj22 = {a: 1, b: "foo", c: true, d: testObj11}; + var testObj23 = {a: 1, b: "foo", c: true, d: testObj12}; + + compare(qtest_compareInternalObjects(testObj11, testObj11), true, "Object identity"); + compare(qtest_compareInternalObjects(testObj11, testObj12), true, "Object equality"); + compare(qtest_compareInternalObjects(testObj21, testObj21), true, "Nested object identity"); + compare(qtest_compareInternalObjects(testObj21, testObj22), true, "Nested object equality"); + compare(qtest_compareInternalObjects(testObj21, testObj23), true, "Deep nested object equality"); + } + + function test_qtest_internalCompareObjects_differentObjects() { + var testObj11 = {a: 1, b: "foo", c: true}; + var testObj12 = {a: 2, b: "foo", c: true}; + var testObj13 = {a: 1, b: "bar", c: true}; + var testObj14 = {a: 1, b: "foo", c: false}; + + compare(qtest_compareInternalObjects(testObj11, testObj12), false, "Different number"); + compare(qtest_compareInternalObjects(testObj11, testObj13), false, "Different string"); + compare(qtest_compareInternalObjects(testObj11, testObj14), false, "Different boolean"); + } + + +} diff --git a/tests/qmlauto/tst_compare.qml b/tests/qmlauto/tst_compare.qml deleted file mode 100644 index 579ca41..0000000 --- a/tests/qmlauto/tst_compare.qml +++ /dev/null @@ -1,12 +0,0 @@ -import Qt 4.7 -import QtQuickTest 1.0 - -TestCase { - function test_compare_objects() { - var testObj1 = {a: 1, b: "foo", c: true}; - compare(testObj1, testObj1, "Object identity"); - - var testObj2 = {a: 1, b: "foo", c: true}; - compare(testObj1, testObj2, "Object equality"); - } -} -- cgit v1.2.3