Merge lp:~veebers/autopilot/1.3_generic_proxy_objects_id into lp:autopilot/1.3

[Christopher Lee]

Changes how the proxy objects are created so the inheritance is correct

Changes how the proxy objects are created so the inheritance is correct regardless if it's a generic type or custom emulator.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:341
http://jenkins.qa.ubuntu.com/job/autopilot-1.3-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-armhf-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-1.3-ci/26/rebuild

review: Approve (continuous-integration)

[lp:~veebers/autopilot/1.3_generic_proxy_objects_id]

342. By Christopher Lee on 2013-09-26

Spelling and docstring fixes

343. By Christopher Lee on 2013-09-26

Made fall-through case clearer

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'autopilot/introspection/__init__.py'
--- autopilot/introspection/__init__.py	2013-09-26 04:34:18 +0000
+++ autopilot/introspection/__init__.py	2013-09-26 05:11:36 +0000
@@ -476,10 +476,13 @@
 
     _clear_backends_for_proxy_object(emulator_base)
     clsobj = type(
-        str(cls_name), proxy_bases, dict(_Backend=data_source)
+        # Merge the object hierarchy.
+        str("%sBase" % cls_name), proxy_bases, dict(_Backend=data_source)
     )
 
-    proxy = clsobj.get_root_instance()
+    proxy_class = type(str(cls_name), (clsobj,), {})
+
+    proxy = proxy_class.get_root_instance()
     return proxy
 
 

=== modified file 'autopilot/introspection/dbus.py'
--- autopilot/introspection/dbus.py	2013-09-17 15:57:39 +0000
+++ autopilot/introspection/dbus.py	2013-09-26 05:11:36 +0000
@@ -570,9 +570,15 @@
             get_debug_logger().warning(
                 "Generating introspection instance for type '%s' based on "
                 "generic class.", name)
-            # override the _id attr from cls, since we don't want generated
-            # types to end up in the object registry.
-            class_type = type(str(name), (cls,), {'_id': None})
+            # we want the object to inherit from the custom emulator base, not
+            # the object class that is doing the selecting
+            for base in cls.__bases__:
+                if issubclass(base, CustomEmulatorBase):
+                    base_class = base
+                    break
+            else:
+                base_class = cls
+            class_type = type(str(name), (base_class,), {})
         return class_type(state, path)
 
     @contextmanager

=== modified file 'autopilot/tests/functional/test_introspection_features.py'
--- autopilot/tests/functional/test_introspection_features.py	2013-09-24 23:38:39 +0000
+++ autopilot/tests/functional/test_introspection_features.py	2013-09-26 05:11:36 +0000
@@ -24,7 +24,7 @@
 import subprocess
 import tempfile
 from tempfile import mktemp
-from testtools.matchers import Equals
+from testtools.matchers import Equals, IsInstance, Not
 from textwrap import dedent
 
 from autopilot.matchers import Eventually
@@ -86,6 +86,39 @@
 
         self.assertThat(test_widget.visible, Eventually(Equals(True)))
 
+    def test_selecting_generic_from_custom_is_not_inherited_from_custom(self):
+        """Selecting a generic proxy object from a custom proxy object must not
+        return an object derived of the custom object type.
+
+        """
+        class MouseTestWidget(EmulatorBase):
+            pass
+
+        app = self.start_mock_app(EmulatorBase)
+        mouse_widget = app.select_single(MouseTestWidget)
+
+        child_label = mouse_widget.select_many("QLabel")[0]
+
+        self.assertThat(child_label, Not(IsInstance(MouseTestWidget)))
+
+    def test_selecting_custom_from_generic_is_not_inherited_from_generic(self):
+        """Selecting a custom proxy object from a generic proxy object must
+        return an object that is of the custom type.
+
+        """
+        class MouseTestWidget(EmulatorBase):
+            pass
+
+        app = self.start_mock_app(EmulatorBase)
+        generic_window = app.select_single("QMainWindow")
+
+        mouse_widget = generic_window.select_single(MouseTestWidget)
+
+        self.assertThat(
+            mouse_widget,
+            Not(IsInstance(type(generic_window)))
+        )
+
 
 class QMLCustomEmulatorTestCase(AutopilotTestCase):
     """Test the introspection of a QML application with a custom emulator."""