diff options
| author | Sascha Kolewa <sascha.kolewa@nokia.com> | 2010-12-20 16:26:28 +0100 |
|---|---|---|
| committer | Sascha Kolewa <sascha.kolewa@nokia.com> | 2010-12-20 16:26:28 +0100 |
| commit | 7497c2f9161991f5ec1ef25101788f8ca0f2bdce (patch) | |
| tree | fbc13c4632737912f7a06f06b71284ee8a4c62c3 /tests | |
| parent | fc40195166040af252146dcea627c590e8f101e0 (diff) | |
| parent | 276354547cedabe3b41795793f3f94387f15a7ac (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/research/qtest-qml into Extend_compare_for_objects_and_arrays
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qmlauto/selftests/tst_selftests.qml | 3 | ||||
| -rw-r--r-- | tests/qmlexample/tst_basic.qml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/qmlauto/selftests/tst_selftests.qml b/tests/qmlauto/selftests/tst_selftests.qml index c26250d..bcf53b9 100644 --- a/tests/qmlauto/selftests/tst_selftests.qml +++ b/tests/qmlauto/selftests/tst_selftests.qml @@ -52,6 +52,7 @@ TestCase { property string failmsg: "cleaned" property string actual: "" property string expected: "" + property variant functionsToRun: [] function fail(msg, file, line) { failmsg = msg @@ -208,7 +209,7 @@ TestCase { testCase.compare("abcdef", 42) } catch (e) { compare(e.message, "QtQuickTest::fail") - compare(functions.failmsg, "") + compare(functions.failmsg, "Compared values are not the same") compare(functions.actual, "abcdef") compare(functions.expected, "42") caught = true diff --git a/tests/qmlexample/tst_basic.qml b/tests/qmlexample/tst_basic.qml index d905d9b..07d5a9d 100644 --- a/tests/qmlexample/tst_basic.qml +++ b/tests/qmlexample/tst_basic.qml @@ -58,7 +58,7 @@ TestCase { } function test_expecting() { - expectFail("this is the fail we wanted") + expectFail("", "this is the fail we wanted") verify(false) } |