Merge lp:~mzanetti/ubuntu-sdk-tutorials/use-ubuntutestcase into lp:ubuntu-sdk-tutorials

[Michael Zanetti]

drop helpers.js in favor of UbuntuTestCase

[Nicholas Skaggs (nskaggs)]

review: Approve

=== removed file 'getting-started/CurrencyConverter/tests/qmltests/helpers.js'
--- getting-started/CurrencyConverter/tests/qmltests/helpers.js	2013-06-27 20:13:51 +0000
+++ getting-started/CurrencyConverter/tests/qmltests/helpers.js	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-.pragma library
-
-// Find an object with the given name recursively, starting
-// at the given object "obj"
-function findChild(obj,objectName) {
-    for (var i in obj.children) {
-        var child = obj.children[i];
-        if (child.objectName === objectName) return child;
-        var subChild = findChild(child,objectName);
-        if (subChild !== undefined) return subChild;
-    }
-    return undefined;
-}
-

=== modified file 'getting-started/CurrencyConverter/tests/qmltests/tst_CurrencyConverter.qml'
--- getting-started/CurrencyConverter/tests/qmltests/tst_CurrencyConverter.qml	2013-06-27 20:53:37 +0000
+++ getting-started/CurrencyConverter/tests/qmltests/tst_CurrencyConverter.qml	2014-03-05 13:40:43 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1 // we need units.gu() here
-import QtTest 1.0 // for TestCase
-import "helpers.js" as Helpers
+import QtTest 1.0 // for TestCase, compare() etc
+import Ubuntu.Test 0.1 // for UbuntuTestCase, findChild() etc
 import "../../"
 
 // Part 2 (read tst_currency.qml first if you haven't)
@@ -26,7 +26,7 @@
 
 
     // Here comes the TestCase
-    TestCase {
+    UbuntuTestCase {
         id: currentyConverterTest
         name: "CurrencyConverter"
 
@@ -41,15 +41,15 @@
             // get the activity indicator and wait for it to stop running.
             // As we wait for everything to be built up with "when: windowShowd" above,
             // we can safely assume loading has started already.
-            var activityIndicator = Helpers.findChild(currencyConverter, "activityIndicator")
+            var activityIndicator = findChild(currencyConverter, "activityIndicator")
             tryCompare(activityIndicator, "running", false)
         }
 
 
         // Lets test if the clear button works
         function test_clearButton() {
-            var inputFrom = Helpers.findChild(currencyConverter, "inputFrom")
-            var inputTo = Helpers.findChild(currencyConverter, "inputTo")
+            var inputFrom = findChild(currencyConverter, "inputFrom")
+            var inputTo = findChild(currencyConverter, "inputTo")
 
             // Click in the middle of the inputFrom TextField to focus it
             mouseClick(inputFrom, inputFrom.width / 2, inputFrom.height / 2)
@@ -60,7 +60,7 @@
             // Now the field should contain the value 0.05 because 0.0 is already in there in the beginning
             tryCompare(inputFrom, "text", "0.05", "Input field \"From:\" does does not contain the value 0.05")
 
-            var clearBtn = Helpers.findChild(currencyConverter, "clearBtn")
+            var clearBtn = findChild(currencyConverter, "clearBtn")
             mouseClick(clearBtn, clearBtn.width / 2, clearBtn.height / 2)
             
             // Now the field should be set back to "0.0"
@@ -82,8 +82,8 @@
         // The test function will be called for each data set and "data" contains
         // one row of the set.
         function test_convert(data) {
-            var inputFrom = Helpers.findChild(currencyConverter, "inputFrom")
-            var inputTo = Helpers.findChild(currencyConverter, "inputTo")
+            var inputFrom = findChild(currencyConverter, "inputFrom")
+            var inputTo = findChild(currencyConverter, "inputTo")
 
             // Click in the middle of the inputFrom TextField to focus it
             mouseClick(inputFrom, inputFrom.width / 2, inputFrom.height / 2)

=== modified file 'getting-started/CurrencyConverter/tests/qmltests/tst_convert.qml'
--- getting-started/CurrencyConverter/tests/qmltests/tst_convert.qml	2013-06-27 20:57:19 +0000
+++ getting-started/CurrencyConverter/tests/qmltests/tst_convert.qml	2014-03-05 13:40:43 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import QtTest 1.0
-import "helpers.js" as Helpers
+import Ubuntu.Test 0.1
 import "../.."
 import QtQuick.XmlListModel 2.0
 
@@ -11,7 +11,7 @@
 // You can run this test with:
 // qmltestrunner -input tst_convert.qml
 
-TestCase {
+UbuntuTestCase {
     name: "convert"
 
     // The element we want to test. As we are not painting
@@ -27,7 +27,7 @@
         // Get the activityIndicator from the page and wait for it start running.
         // That means, the rates are being downloaded from the internet."
         // tryCompare() waits for up to 5 seconds for it to happen
-        var activityIndicator = Helpers.findChild(currencyConverter, "activityIndicator")
+        var activityIndicator = findChild(currencyConverter, "activityIndicator")
         tryCompare(activityIndicator, "running", true)
 
         // Now that we know that the rates are being downloaded, wait for the activityIndicator to stop.