Add file and lineno parameters to warn() method

Change-Id: I1ddfd4793a26a16bf85b72c50d84080cd0b26a87
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index fd04c786a2..432f96ccf1 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -271,8 +271,8 @@ Item {
     }
 
     function compare(actual, expected, msg) {
-        var act = qtest_formatValue(actual)
-        var exp = qtest_formatValue(expected)
+        var act = testCase.qtest_formatValue(actual)
+        var exp = testCase.qtest_formatValue(expected)
 
         var success = qtest_compareInternal(actual, expected)
         if (msg === undefined) {
@@ -297,8 +297,8 @@ Item {
             i += 50
         }
         var actual = obj[prop]
-        var act = qtest_formatValue(actual)
-        var exp = qtest_formatValue(value)
+        var act = testCase.qtest_formatValue(actual)
+        var exp = testCase.qtest_formatValue(value)
         var success = qtest_compareInternal(actual, value)
         if (!qtest_results.compare(success, "property " + prop, act, exp, util.callerFile(), util.callerLine()))
             throw new Error("QtQuickTest::fail")
@@ -348,7 +348,7 @@ Item {
     function warn(msg) {
         if (msg === undefined)
             msg = ""
-        qtest_results.warn(msg);
+        qtest_results.warn(msg, util.callerFile(), util.callerLine());
     }
 
     function ignoreWarning(msg) {
@@ -619,7 +619,8 @@ Item {
                         qtest_results.dataTag = ""
                     }
                     if (!haveData)
-                        qtest_results.warn("no data supplied for " + prop + "() by " + datafunc + "()")
+                        qtest_results.warn("no data supplied for " + prop + "() by " + datafunc + "()"
+                                           , util.callerFile(), util.callerLine());
                     qtest_results.clearTestTable()
                 }
             } else if (isBenchmark) {