Merge lp:~thomir-deactivatedaccount/autopilot/trunk-fix-plain-type-reprs into lp:autopilot

[Thomi Richards]

Make proxy object attributes look more pythonic when calling repr(...) or str(...) on them.

Fixes __repr__ and __str__ methods of the marshalled type classes so we hide the underlying dbus type, and make them look more pythonic in test output.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:443
http://jenkins.qa.ubuntu.com/job/autopilot-ci/505/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/231/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/231/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/140/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3377/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3379/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/505/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomir-deactivatedaccount/autopilot/trunk-fix-plain-type-reprs]

444. By Thomi Richards on 2014-02-21

Merged trunk.

445. By Thomi Richards on 2014-02-21

Added missing test for Color unit tests.

446. By Thomi Richards on 2014-02-21

Fix flake8 issues.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:445
http://jenkins.qa.ubuntu.com/job/autopilot-ci/506/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/232/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/232/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/141/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3404/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3406/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/506/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Lee (veebers)]

Within the tests you mention UnicodeDecode but catch a UnicodeEncodeError, is this intentional?
278 + # in Python 2.x, str(u'\2603') *should* raise a UnicodeDecode error:
279 + except UnicodeEncodeError:

review: Needs Information

[lp:~thomir-deactivatedaccount/autopilot/trunk-fix-plain-type-reprs]

447. By Thomi Richards on 2014-02-21

Fix failing tests in Python 3.3.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:446
http://jenkins.qa.ubuntu.com/job/autopilot-ci/507/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/233
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/233/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/233/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/142/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3407
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3002
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3409
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3409/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/507/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomir-deactivatedaccount/autopilot/trunk-fix-plain-type-reprs]

448. By Thomi Richards on 2014-02-21

Fix typo in comment.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:447
http://jenkins.qa.ubuntu.com/job/autopilot-ci/508/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/234
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/234/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/234/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/143/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3408
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3003
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3410
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3410/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/508/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:448
http://jenkins.qa.ubuntu.com/job/autopilot-ci/509/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/235
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/235/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/235/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/144/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3411
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3413
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3413/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/509/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:448
http://jenkins.qa.ubuntu.com/job/autopilot-ci/510/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/236
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/236/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/236/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/145/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3414
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3007
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3416
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3416/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/510/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomir-deactivatedaccount/autopilot/trunk-fix-plain-type-reprs]

449. By Thomi Richards on 2014-02-21

Fix tests failing.

[Christopher Lee (veebers)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/autopilot-ci/512/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/238
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/238/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/238/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/147/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3420
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3423
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3423/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/512/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomir-deactivatedaccount/autopilot/trunk-fix-plain-type-reprs]

450. By Thomi Richards on 2014-02-27

Fix failing test.

=== modified file 'autopilot/introspection/types.py'
--- autopilot/introspection/types.py	2014-01-29 20:48:43 +0000
+++ autopilot/introspection/types.py	2014-02-27 02:00:36 +0000
@@ -46,7 +46,7 @@
 import six
 
 from autopilot.introspection.utilities import translate_state_keys
-from autopilot.utilities import sleep
+from autopilot.utilities import sleep, compatible_repr
 
 
 logger = logging.getLogger(__name__)
@@ -217,68 +217,73 @@
         return _make_plain_type(value, parent=parent, name=name)
 
 
+def _get_repr_callable_for_value(value):
+    repr_map = {
+        dbus.Byte: _integer_repr,
+        dbus.Int16: _integer_repr,
+        dbus.Int32: _integer_repr,
+        dbus.UInt16: _integer_repr,
+        dbus.UInt32: _integer_repr,
+        dbus.Int64: _integer_repr,
+        dbus.UInt64: _integer_repr,
+        dbus.String: _text_repr,
+        dbus.ObjectPath: _text_repr,
+        dbus.Signature: _text_repr,
+        dbus.ByteArray: _bytes_repr,
+        dbus.Boolean: _boolean_repr,
+        dbus.Dictionary: _dict_repr,
+        dbus.Double: _float_repr,
+        dbus.Struct: _tuple_repr,
+        dbus.Array: _list_repr,
+    }
+    if not six.PY3:
+        repr_map[dbus.UTF8String] = _bytes_repr
+    return repr_map.get(type(value), None)
+
+
+def _get_str_callable_for_value(value):
+    str_map = {
+        dbus.Boolean: _boolean_str,
+        dbus.Byte: _integer_str,
+    }
+    return str_map.get(type(value), None)
+
+
+@compatible_repr
+def _integer_repr(self):
+    return six.text_type(int(self))
+
+
+def _create_generic_repr(target_type):
+    return compatible_repr(lambda self: repr(target_type(self)))
+
+_bytes_repr = _create_generic_repr(six.binary_type)
+_text_repr = _create_generic_repr(six.text_type)
+_dict_repr = _create_generic_repr(dict)
+_list_repr = _create_generic_repr(list)
+_tuple_repr = _create_generic_repr(tuple)
+_float_repr = _create_generic_repr(float)
+_boolean_repr = _create_generic_repr(bool)
+
+
+def _create_generic_str(target_type):
+    return compatible_repr(lambda self: str(target_type(self)))
+
+
+_boolean_str = _create_generic_str(bool)
+_integer_str = _integer_repr
+
+
 def _make_plain_type(value, parent=None, name=None):
-    def repr(self):
-        # Convert our value to the pythonic type,and call __repr__ on it.
-        # At the moment we switch based on our type, which is less than ideal.
-        if six.PY3:
-            long_type = int
-        else:
-            long_type = long
-        dbus_integer_types = (
-            dbus.Byte,
-            dbus.Int16,
-            dbus.Int32,
-            dbus.UInt16,
-            dbus.UInt32,
-        )
-
-        dbus_string_types = (
-            dbus.String,
-            dbus.ObjectPath,
-            dbus.Signature,
-        )
-
-        # no UTFString in python 3.
-        if six.PY3:
-            dbus_binary_types = (
-                dbus.ByteArray,
-            )
-        else:
-            dbus_binary_types = (
-                dbus.ByteArray,
-                dbus.UTF8String,
-            )
-
-        if isinstance(self, dbus_integer_types):
-            return int(self).__repr__()
-        elif isinstance(self, (dbus.Int64, dbus.UInt64)):
-            # Python 2 integer landling is... odd. The maximum integer size
-            # changes depending on platform, so maybe we can get away with
-            # using an int, in which case we should:
-            if not six.PY3 and self <= six.MAXSIZE:
-                return int(self).__repr__()
-            return long_type(self).__repr__()
-        elif isinstance(self, dbus_string_types):
-            return six.text_type(self).__repr__()
-        elif isinstance(self, dbus.Boolean):
-            return bool(self).__repr__()
-        elif isinstance(self, dbus_binary_types):
-            return six.binary_type(self).__repr__()
-        elif isinstance(self, dbus.Dictionary):
-            return dict(self).__repr__()
-        elif isinstance(self, dbus.Double):
-            return float(self).__repr__()
-        elif isinstance(self, dbus.Struct):
-            return tuple(self).__repr__()
-        elif isinstance(self, dbus.Array):
-            return list(self).__repr__()
-        else:
-            return super(type(self), self).__repr__()
-
     new_type_name = type(value).__name__
     new_type_bases = (type(value), PlainType)
-    new_type_dict = dict(parent=parent, name=name, __repr__=repr)
+    new_type_dict = dict(parent=parent, name=name)
+    repr_callable = _get_repr_callable_for_value(value)
+    if repr_callable:
+        new_type_dict['__repr__'] = repr_callable
+    str_callable = _get_str_callable_for_value(value)
+    if str_callable:
+        new_type_dict['__str__'] = str_callable
     new_type = type(new_type_name, new_type_bases, new_type_dict)
     return new_type(value)
 
@@ -375,6 +380,11 @@
     def height(self):
         return self[3]
 
+    @compatible_repr
+    def __repr__(self):
+        coords = u', '.join((str(c) for c in self))
+        return u'Rectangle(%s)' % (coords)
+
 
 class Point(_array_packed_type(2)):
 
@@ -412,6 +422,10 @@
     def y(self):
         return self[1]
 
+    @compatible_repr
+    def __repr__(self):
+        return u'Point(%d, %d)' % (self.x, self.y)
+
 
 class Size(_array_packed_type(2)):
 
@@ -457,6 +471,10 @@
     def height(self):
         return self[1]
 
+    @compatible_repr
+    def __repr__(self):
+        return u'Size(%d, %d)' % (self.w, self.h)
+
 
 class Color(_array_packed_type(4)):
 
@@ -506,6 +524,15 @@
     def alpha(self):
         return self[3]
 
+    @compatible_repr
+    def __repr__(self):
+        return u'Color(%d, %d, %d, %d)' % (
+            self.red,
+            self.green,
+            self.blue,
+            self.alpha
+        )
+
 
 class DateTime(_array_packed_type(1)):
 
@@ -603,6 +630,17 @@
             return other == self._cached_dt
         return super(DateTime, self).__eq__(other)
 
+    @compatible_repr
+    def __repr__(self):
+        return u'DateTime(%d-%02d-%02d %02d:%02d:%02d)' % (
+            self.year,
+            self.month,
+            self.day,
+            self.hour,
+            self.minute,
+            self.second
+        )
+
 
 class Time(_array_packed_type(4)):
 
@@ -683,6 +721,15 @@
             return other == self._cached_time
         return super(Time, self).__eq__(other)
 
+    @compatible_repr
+    def __repr__(self):
+        return u'Time(%02d:%02d:%02d.%03d)' % (
+            self.hour,
+            self.minute,
+            self.second,
+            self.millisecond
+        )
+
 
 class Point3D(_array_packed_type(3)):
 
@@ -725,3 +772,11 @@
     @property
     def z(self):
         return self[2]
+
+    @compatible_repr
+    def __repr__(self):
+        return u'Point3D(%d, %d, %d)' % (
+            self.x,
+            self.y,
+            self.z,
+        )

=== modified file 'autopilot/tests/unit/test_types.py'
--- autopilot/tests/unit/test_types.py	2013-12-10 20:05:38 +0000
+++ autopilot/tests/unit/test_types.py	2014-02-27 02:00:36 +0000
@@ -38,8 +38,20 @@
     Size,
     Time,
     ValueType,
+    _integer_repr,
+    _boolean_repr,
+    _text_repr,
+    _bytes_repr,
+    _dict_repr,
+    _list_repr,
+    _float_repr,
+    _tuple_repr,
+    _get_repr_callable_for_value,
+    _boolean_str,
+    _integer_str,
 )
 from autopilot.introspection.dbus import DBusIntrospectionObject
+from autopilot.utilities import compatible_repr
 
 
 class PlainTypeTests(TestWithScenarios, TestCase):
@@ -81,7 +93,21 @@
         """repr for PlainType must be the same as the pythonic type."""
         p = PlainType(self.t(self.v))
 
-        self.assertThat(repr(p), Equals(repr(self.v)))
+        expected = repr(self.v)
+        expected = expected.rstrip('L')
+        self.assertThat(repr(p), Equals(expected))
+
+    def test_str(self):
+        """str(p) for PlainType must be the same as the pythonic type."""
+        p = PlainType(self.t(self.v))
+        try:
+            expected = str(self.v)
+            observed = str(p)
+            self.assertEqual(expected, observed)
+        # in Python 2.x, str(u'\2603') *should* raise a UnicodeEncode error:
+        except UnicodeEncodeError:
+            if not six.PY2:
+                raise
 
     def test_wait_for_raises_RuntimeError(self):
         """The wait_for method must raise a RuntimeError if it's called."""
@@ -131,6 +157,15 @@
 
         self.assertThat(r1, Equals(r2))
 
+    def test_repr(self):
+        expected = repr_type("Rectangle(1, 2, 3, 4)")
+        observed = repr(Rectangle(1, 2, 3, 4))
+        self.assertEqual(expected, observed)
+
+    def test_repr_equals_str(self):
+        r = Rectangle(1, 2, 3, 4)
+        self.assertEqual(repr(r), str(r))
+
 
 class PointTypeTests(TestCase):
 
@@ -162,6 +197,15 @@
 
         self.assertThat(p1, Equals(p2))
 
+    def test_repr(self):
+        expected = repr_type('Point(1, 2)')
+        observed = repr(Point(1, 2))
+        self.assertEqual(expected, observed)
+
+    def test_repr_equals_str(self):
+        p = Point(1, 2)
+        self.assertEqual(repr(p), str(p))
+
 
 class SizeTypeTests(TestCase):
 
@@ -195,6 +239,15 @@
 
         self.assertThat(s1, Equals(s2))
 
+    def test_repr(self):
+        expected = repr_type('Size(1, 2)')
+        observed = repr(Size(1, 2))
+        self.assertEqual(expected, observed)
+
+    def test_repr_equals_str(self):
+        s = Size(3, 4)
+        self.assertEqual(repr(s), str(s))
+
 
 class ColorTypeTests(TestCase):
 
@@ -230,6 +283,15 @@
 
         self.assertThat(c1, Equals(c2))
 
+    def test_repr(self):
+        expected = repr_type('Color(1, 2, 3, 4)')
+        observed = repr(Color(1, 2, 3, 4))
+        self.assertEqual(expected, observed)
+
+    def test_repr_equals_str(self):
+        c = Color(255, 255, 255, 0)
+        self.assertEqual(repr(c), str(c))
+
 
 class DateTimeTests(TestCase):
 
@@ -278,6 +340,16 @@
 
         self.assertThat(dt1.datetime, IsInstance(datetime))
 
+    def test_repr(self):
+        dt = DateTime(1377209927)
+        expected = repr_type('DateTime(2013-08-22 22:18:47)')
+        observed = repr(dt)
+        self.assertEqual(expected, observed)
+
+    def test_repr_equals_str(self):
+        dt = DateTime(1377209927)
+        self.assertEqual(repr(dt), str(dt))
+
 
 class TimeTests(TestCase):
 
@@ -322,6 +394,15 @@
 
         self.assertThat(dt1.time, IsInstance(time))
 
+    def test_repr(self):
+        expected = repr_type('Time(01:02:03.004)')
+        observed = repr(Time(1, 2, 3, 4))
+        self.assertEqual(expected, observed)
+
+    def test_repr_equals_str(self):
+        t = Time(2, 3, 4, 5)
+        self.assertEqual(repr(t), str(t))
+
 
 class Point3DTypeTests(TestCase):
 
@@ -367,6 +448,15 @@
 
         self.assertThat(p1, NotEquals(p2))
 
+    def test_repr(self):
+        expected = repr_type('Point3D(1, 2, 3)')
+        observed = repr(Point3D(1, 2, 3))
+        self.assertEqual(expected, observed)
+
+    def test_repr_equals_str(self):
+        p3d = Point3D(1, 2, 3)
+        self.assertEqual(repr(p3d), str(p3d))
+
 
 class CreateValueInstanceTests(TestCase):
 
@@ -693,3 +783,128 @@
             "foo",
             "Cannot create attribute, no data supplied"
         )
+
+
+class TypeReprTests(TestCase):
+
+    def test_integer_repr(self):
+        expected = repr_type('42')
+        observed = _integer_repr(42)
+        self.assertEqual(expected, observed)
+
+    def test_dbus_int_types_all_work(self):
+        expected = repr_type('42')
+        int_types = (
+            dbus.Byte,
+            dbus.Int16,
+            dbus.Int32,
+            dbus.UInt16,
+            dbus.UInt32,
+            dbus.Int64,
+            dbus.UInt64,
+        )
+        for t in int_types:
+            observed = _integer_repr(t(42))
+            self.assertEqual(expected, observed)
+
+    def test_get_repr_gets_integer_repr_for_all_integer_types(self):
+        int_types = (
+            dbus.Byte,
+            dbus.Int16,
+            dbus.Int32,
+            dbus.UInt16,
+            dbus.UInt32,
+            dbus.Int64,
+            dbus.UInt64,
+        )
+        for t in int_types:
+            observed = _get_repr_callable_for_value(t(42))
+            self.assertEqual(_integer_repr, observed)
+
+    def test_boolean_repr_true(self):
+        expected = repr_type('True')
+        for values in (True, dbus.Boolean(True)):
+            observed = _boolean_repr(True)
+            self.assertEqual(expected, observed)
+
+    def test_boolean_repr_false(self):
+        expected = repr_type('False')
+        for values in (False, dbus.Boolean(False)):
+            observed = _boolean_repr(False)
+            self.assertEqual(expected, observed)
+
+    def test_get_repr_gets_boolean_repr_for_dbus_boolean_type(self):
+        observed = _get_repr_callable_for_value(dbus.Boolean(False))
+        self.assertEqual(_boolean_repr, observed)
+
+    def test_text_repr_handles_dbus_string(self):
+        unicode_text = u"plɹoʍ ollǝɥ"
+        observed = _text_repr(dbus.String(unicode_text))
+        self.assertEqual(repr(unicode_text), observed)
+
+    def test_text_repr_handles_dbus_object_path(self):
+        path = u"/path/to/some/object"
+        observed = _text_repr(dbus.ObjectPath(path))
+        self.assertEqual(repr(path), observed)
+
+    def test_binry_repr_handles_dbys_byte_array(self):
+        data = b'Some bytes'
+        observed = _bytes_repr(dbus.ByteArray(data))
+        self.assertEqual(repr(data), observed)
+
+    def test_get_repr_gets_bytes_repr_for_dbus_byte_array(self):
+        observed = _get_repr_callable_for_value(dbus.ByteArray(b''))
+        self.assertEqual(_bytes_repr, observed)
+
+    def test_dict_repr_handles_dbus_dictionary(self):
+        token = dict(foo='bar')
+        observed = _dict_repr(dbus.Dictionary(token))
+        self.assertEqual(repr(token), observed)
+
+    def test_get_repr_gets_dict_repr_on_dbus_dictionary(self):
+        observed = _get_repr_callable_for_value(dbus.Dictionary(dict()))
+        self.assertEqual(_dict_repr, observed)
+
+    def test_float_repr_handles_dbus_double(self):
+        token = 1.2345
+        observed = _float_repr(token)
+        self.assertEqual(repr(token), observed)
+
+    def test_get_repr_gets_float_repr_on_dbus_double(self):
+        observed = _get_repr_callable_for_value(dbus.Double(0.0))
+        self.assertEqual(_float_repr, observed)
+
+    def test_tuple_repr_handles_dbus_struct(self):
+        data = (1, 2, 3)
+        observed = _tuple_repr(dbus.Struct(data))
+        self.assertEqual(repr(data), observed)
+
+    def test_get_repr_gets_tuple_repr_on_dbus_struct(self):
+        observed = _get_repr_callable_for_value(dbus.Struct([1]))
+        self.assertEqual(_tuple_repr, observed)
+
+    def test_list_repr_handles_dbus_array(self):
+        data = [1, 2, 3]
+        observed = _list_repr(dbus.Array(data))
+        self.assertEqual(repr(data), observed)
+
+    def test_get_repr_gets_list_repr_on_dbus_array(self):
+        observed = _get_repr_callable_for_value(dbus.Array([1]))
+        self.assertEqual(_list_repr, observed)
+
+
+class TypeStrTests(TestCase):
+
+    def test_boolean_str_handles_dbus_boolean(self):
+        observed = _boolean_str(dbus.Boolean(False))
+        self.assertEqual(str(False), observed)
+
+    def test_integer_str_handles_dbus_byte(self):
+        observed = _integer_str(dbus.Byte(14))
+        self.assertEqual(str(14), observed)
+
+
+def repr_type(value):
+    """Convert a text or bytes object into the appropriate return type for
+    the __repr__ method."""
+    return compatible_repr(lambda: value)()