1 files changed, 106 insertions, 6 deletions
diff --git a/test/test_memoryview.py b/test/test_memoryview.py
index aed5069..f6d74ed 100644
--- a/test/test_memoryview.py
+++ b/test/test_memoryview.py
@@ -1,12 +1,112 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-
+from array import array
 from msgpack import packb, unpackb
+import sys
+
+
+# For Python < 3:
+#  - array type only supports old buffer interface
+#  - array.frombytes is not available, must use deprecated array.fromstring
+if sys.version_info[0] < 3:
+    def make_memoryview(obj):
+        return memoryview(buffer(obj))
+
+    def make_array(f, data):
+        a = array(f)
+        a.fromstring(data)
+        return a
+
+    def get_data(a):
+        return a.tostring()
+else:
+    make_memoryview = memoryview
+
+    def make_array(f, data):
+        a = array(f)
+        a.frombytes(data)
+        return a
+
+    def get_data(a):
+        return a.tobytes()
+
+
+def _runtest(format, nbytes, expected_header, expected_prefix, use_bin_type):
+    # create a new array
+    original_array = array(format)
+    original_array.fromlist([255] * (nbytes // original_array.itemsize))
+    original_data = get_data(original_array)
+    view = make_memoryview(original_array)
+
+    # pack, unpack, and reconstruct array
+    packed = packb(view, use_bin_type=use_bin_type)
+    unpacked = unpackb(packed)
+    reconstructed_array = make_array(format, unpacked)
+
+    # check that we got the right amount of data
+    assert len(original_data) == nbytes
+    # check packed header
+    assert packed[:1] == expected_header
+    # check packed length prefix, if any
+    assert packed[1:1+len(expected_prefix)] == expected_prefix
+    # check packed data
+    assert packed[1+len(expected_prefix):] == original_data
+    # check array unpacked correctly
+    assert original_array == reconstructed_array
+
+
+def test_fixstr_from_byte():
+    _runtest('B', 1, b'\xa1', b'', False)
+    _runtest('B', 31, b'\xbf', b'', False)
+
+
+def test_fixstr_from_float():
+    _runtest('f', 4, b'\xa4', b'', False)
+    _runtest('f', 28, b'\xbc', b'', False)
+
+
+def test_str16_from_byte():
+    _runtest('B', 2**8, b'\xda', b'\x01\x00', False)
+    _runtest('B', 2**16-1, b'\xda', b'\xff\xff', False)
+
+
+def test_str16_from_float():
+    _runtest('f', 2**8, b'\xda', b'\x01\x00', False)
+    _runtest('f', 2**16-4, b'\xda', b'\xff\xfc', False)
+
+
+def test_str32_from_byte():
+    _runtest('B', 2**16, b'\xdb', b'\x00\x01\x00\x00', False)
+
+
+def test_str32_from_float():
+    _runtest('f', 2**16, b'\xdb', b'\x00\x01\x00\x00', False)
+
+
+def test_bin8_from_byte():
+    _runtest('B', 1, b'\xc4', b'\x01', True)
+    _runtest('B', 2**8-1, b'\xc4', b'\xff', True)
+
+
+def test_bin8_from_float():
+    _runtest('f', 4, b'\xc4', b'\x04', True)
+    _runtest('f', 2**8-4, b'\xc4', b'\xfc', True)
+
+
+def test_bin16_from_byte():
+    _runtest('B', 2**8, b'\xc5', b'\x01\x00', True)
+    _runtest('B', 2**16-1, b'\xc5', b'\xff\xff', True)
+
+
+def test_bin16_from_float():
+    _runtest('f', 2**8, b'\xc5', b'\x01\x00', True)
+    _runtest('f', 2**16-4, b'\xc5', b'\xff\xfc', True)
+
+
+def test_bin32_from_byte():
+    _runtest('B', 2**16, b'\xc6', b'\x00\x01\x00\x00', True)
 
 
-def test_pack_memoryview():
-    data = bytearray(range(256))
-    view = memoryview(data)
-    unpacked = unpackb(packb(view))
-    assert data == unpacked
+def test_bin32_from_float():
+    _runtest('f', 2**16, b'\xc6', b'\x00\x01\x00\x00', True)