Clean up tests

diff --git a/serial/test_binary.py b/serial/test_binary.py
index 8bc3811..95652cb 100644 (file)
--- a/serial/test_binary.py
+++ b/serial/test_binary.py
@@ -3,51 +3,45 @@ import unittest
 import binary
 
 EXAMPLE_REPRESENTATIONS = [
 import binary
 
 EXAMPLE_REPRESENTATIONS = [

-    (binary.TAG_NULL, None, b'\x00'),
-    (binary.TAG_TRUE, True, b'\x01'),
-    (binary.TAG_FALSE, False, b'\x02'),
-    (binary.TAG_UINT8, 7, b'\x03\x07'),
-    (binary.TAG_UINT16, 7, b'\x04\x00\x07'),
-    (binary.TAG_UINT32, 7, b'\x05\x00\x00\x00\x07'),
-    (binary.TAG_UINT64, 7, b'\x06\x00\x00\x00\x00\x00\x00\x00\x07'),
-    (binary.TAG_INT8, 7, b'\x10\x07'),
-    (binary.TAG_INT16, 7, b'\x11\x00\x07'),
-    (binary.TAG_INT32, 7, b'\x12\x00\x00\x00\x07'),
-    (binary.TAG_INT64, 7, b'\x13\x00\x00\x00\x00\x00\x00\x00\x07'),
-    (binary.TAG_UINT8, 254, b'\x03\xfe'),
-    (binary.TAG_UINT16, 65534, b'\x04\xff\xfe'),
-    (binary.TAG_UINT32, 4294967294, b'\x05\xff\xff\xff\xfe'),
-    (binary.TAG_UINT64, 18446744073709551614, b'\x06\xff\xff\xff\xff\xff\xff\xff\xfe'),
-    (binary.TAG_INT8, -2, b'\x10\xfe'),
-    (binary.TAG_INT16, -2, b'\x11\xff\xfe'),
-    (binary.TAG_INT32, -2, b'\x12\xff\xff\xff\xfe'),
-    (binary.TAG_INT64, -2, b'\x13\xff\xff\xff\xff\xff\xff\xff\xfe'),
-    (binary.TAG_BINARY, b'\xde\xad\xbe\xef', b'\x20\x00\x00\x00\x04\xde\xad\xbe\xef'),
-    (binary.TAG_UTF8, 'Lol!', b'\x21\x00\x00\x00\x04Lol!'),
-    (binary.TAG_UTF16, 'かわ', b'\x22\x00\x00\x00\x06\xff\xfeK0\x8f0'),
-    (binary.TAG_UTF32, '漢', b'\x23\x00\x00\x00\x08\xff\xfe\x00\x00"o\x00\x00'),
+    (binary.TaggedObject(binary.TAG_NULL, None), b'\x00'),
+    (binary.TaggedObject(binary.TAG_TRUE, True), b'\x01'),
+    (binary.TaggedObject(binary.TAG_FALSE, False), b'\x02'),
+    (binary.TaggedObject(binary.TAG_UINT8, 7), b'\x03\x07'),
+    (binary.TaggedObject(binary.TAG_UINT16, 7), b'\x04\x00\x07'),
+    (binary.TaggedObject(binary.TAG_UINT32, 7), b'\x05\x00\x00\x00\x07'),
+    (binary.TaggedObject(binary.TAG_UINT64, 7), b'\x06\x00\x00\x00\x00\x00\x00\x00\x07'),
+    (binary.TaggedObject(binary.TAG_INT8, 7), b'\x10\x07'),
+    (binary.TaggedObject(binary.TAG_INT16, 7), b'\x11\x00\x07'),
+    (binary.TaggedObject(binary.TAG_INT32, 7), b'\x12\x00\x00\x00\x07'),
+    (binary.TaggedObject(binary.TAG_INT64, 7), b'\x13\x00\x00\x00\x00\x00\x00\x00\x07'),
+    (binary.TaggedObject(binary.TAG_UINT8, 254), b'\x03\xfe'),
+    (binary.TaggedObject(binary.TAG_UINT16, 65534), b'\x04\xff\xfe'),
+    (binary.TaggedObject(binary.TAG_UINT32, 4294967294), b'\x05\xff\xff\xff\xfe'),
+    (binary.TaggedObject(binary.TAG_UINT64, 18446744073709551614), b'\x06\xff\xff\xff\xff\xff\xff\xff\xfe'),
+    (binary.TaggedObject(binary.TAG_INT8, -2), b'\x10\xfe'),
+    (binary.TaggedObject(binary.TAG_INT16, -2), b'\x11\xff\xfe'),
+    (binary.TaggedObject(binary.TAG_INT32, -2), b'\x12\xff\xff\xff\xfe'),
+    (binary.TaggedObject(binary.TAG_INT64, -2), b'\x13\xff\xff\xff\xff\xff\xff\xff\xfe'),
+    (binary.TaggedObject(binary.TAG_BINARY, b'\xde\xad\xbe\xef'), b'\x20\x00\x00\x00\x04\xde\xad\xbe\xef'),
+    (binary.TaggedObject(binary.TAG_UTF8, 'Lol!'), b'\x21\x00\x00\x00\x04Lol!'),
+    (binary.TaggedObject(binary.TAG_UTF16, 'かわ'), b'\x22\x00\x00\x00\x06\xff\xfeK0\x8f0'),
+    (binary.TaggedObject(binary.TAG_UTF32, '漢'), b'\x23\x00\x00\x00\x08\xff\xfe\x00\x00"o\x00\x00'),

 ]
 
 class SerializeTests(unittest.TestCase):
     def test_serialize(self):
 ]
 
 class SerializeTests(unittest.TestCase):
     def test_serialize(self):

-        for tag, instance, representation in EXAMPLE_REPRESENTATIONS:
+        for tagged_object, representation in EXAMPLE_REPRESENTATIONS:

             self.assertEqual(
             self.assertEqual(

-                binary.serialize(binary.TaggedObject(
-                    tag = tag,
-                    instance = instance,
-                )),
+                binary.serialize(tagged_object),

                 representation,
             )
 
 class DeserializeTests(unittest.TestCase):
     def test_deserialize(self):
                 representation,
             )
 
 class DeserializeTests(unittest.TestCase):
     def test_deserialize(self):

-        for tag, instance, representation in EXAMPLE_REPRESENTATIONS:
+        for tagged_object, representation in EXAMPLE_REPRESENTATIONS:

             self.assertEqual(
                 binary.deserialize(representation),
             self.assertEqual(
                 binary.deserialize(representation),

-                binary.TaggedObject(
-                    tag = tag,
-                    instance = instance,
-                ),
+                tagged_object,

             )
 
 unittest.main()
             )
 
 unittest.main()