Merge lp:~veebers/autopilot-qt/backout-latest-change into lp:autopilot-qt

[Christopher Lee]

Backing out recent change that introduces issues on devices.

Backing out recent change that introduces issues on devices.

[Christopher Lee (veebers)]

review: Approve

[Christopher Lee (veebers)]

Backing out this change as it introduced issues on the devices (and I'm pretty sure can be linked to this bug:https://bugs.launchpad.net/autopilot/+bug/1273956 and https://bugs.launchpad.net/unity8/+bug/1273720).

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'driver/qtnode.cpp'
--- driver/qtnode.cpp	2014-01-16 22:22:22 +0000
+++ driver/qtnode.cpp	2014-01-30 07:11:35 +0000
@@ -180,11 +180,12 @@
                 children.push_back(std::make_shared<QtNode>(childItem, shared_from_this()));
             }
         }
-    } 
-    foreach (QObject *child, object_->children())
-    {
-        if (child->parent() == object_)
-            children.push_back(std::make_shared<QtNode>(child, shared_from_this()));
+    } else {
+        foreach (QObject *child, object_->children())
+        {
+            if (child->parent() == object_)
+                children.push_back(std::make_shared<QtNode>(child, shared_from_this()));
+        }
     }
 
 #else

=== modified file 'tests/autopilot/libautopilot_qt/emulators/main_window_qt4.py'
--- tests/autopilot/libautopilot_qt/emulators/main_window_qt4.py	2014-01-17 01:01:50 +0000
+++ tests/autopilot/libautopilot_qt/emulators/main_window_qt4.py	2014-01-30 07:11:35 +0000
@@ -55,6 +55,3 @@
         if mousearea is None:
             logger.error("*** select_single(\"QDeclarativeMouseArea\") failed ***")
         return mousearea
-
-    def get_non_visual_component(self):
-        return self.app.select_single(objectName="listModelTest")

=== modified file 'tests/autopilot/libautopilot_qt/emulators/main_window_qt5.py'
--- tests/autopilot/libautopilot_qt/emulators/main_window_qt5.py	2014-01-17 01:01:50 +0000
+++ tests/autopilot/libautopilot_qt/emulators/main_window_qt5.py	2014-01-30 07:11:35 +0000
@@ -55,7 +55,3 @@
         if mousearea is None:
             logger.error("*** select_single(\"QQuickMouseArea\") failed ***")
         return mousearea
-
-    def get_non_visual_component(self):
-        return self.app.select_single(objectName="listModelTest")
-

=== modified file 'tests/autopilot/libautopilot_qt/tests/test_main.py'
--- tests/autopilot/libautopilot_qt/tests/test_main.py	2014-01-17 01:01:50 +0000
+++ tests/autopilot/libautopilot_qt/tests/test_main.py	2014-01-30 07:11:35 +0000
@@ -34,10 +34,6 @@
         rectangle = self.main_window.get_test_rectangle_by_child_search()
         self.assertThat(rectangle, NotEquals(None))
 
-    def test_find_nonvisual_component(self):
-        component = self.main_window.get_non_visual_component()
-        self.assertThat(component, NotEquals(None))
-
 
 class TestProperties(AutopilotQtTestCase):
 
@@ -65,8 +61,8 @@
         self.assertThat(rectangle.color, Equals([0, 0, 255, 255]))
 
         mousearea = self.main_window.get_test_mousearea()
-        self.mouse.move_to_object(mousearea)
-        self.mouse.click()
+        self.pointing_device.move_to_object(mousearea)
+        self.pointing_device.click()
 
         self.assertThat(rectangle.color, Eventually(Equals([255, 0, 0, 255])))
 

=== modified file 'tests/autopilot/testapp/qt4.qml'
--- tests/autopilot/testapp/qt4.qml	2014-01-17 01:01:50 +0000
+++ tests/autopilot/testapp/qt4.qml	2014-01-30 07:11:35 +0000
@@ -56,8 +56,4 @@
 
         onClicked: rect.color = "red"
     }
-
-    ListModel {
-        objectName: "listModelTest"
-    }
 }

=== modified file 'tests/autopilot/testapp/qt5.qml'
--- tests/autopilot/testapp/qt5.qml	2014-01-17 01:01:50 +0000
+++ tests/autopilot/testapp/qt5.qml	2014-01-30 07:11:35 +0000
@@ -56,8 +56,4 @@
 
         onClicked: rect.color = "red"
     }
-
-    ListModel {
-        objectName: "listModelTest"
-    }
 }