more descriptive test names

This commit is contained in:
folz 2016-05-04 10:04:09 +02:00
parent 0ec2e3534f
commit 0b55989f0b
1 changed files with 21 additions and 51 deletions

View File

@ -11,25 +11,25 @@ import sys
# - array type only supports old buffer interface
# - array.frombytes is not available, must use deprecated array.fromstring
if sys.version_info[0] < 3:
def __memoryview(obj):
def make_memoryview(obj):
return memoryview(buffer(obj))
def __make_array(f, data):
def make_array(f, data):
a = array(f)
a.fromstring(data)
return a
def __get_data(a):
def get_data(a):
return a.tostring()
else:
__memoryview = memoryview
make_memoryview = memoryview
def __make_array(f, data):
def make_array(f, data):
a = array(f)
a.frombytes(data)
return a
def __get_data(a):
def get_data(a):
return a.tobytes()
@ -37,13 +37,13 @@ def __run_test(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 = __memoryview(original_array)
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)
reconstructed_array = make_array(format, unpacked)
# check that we got the right amount of data
assert len(original_data) == nbytes
@ -57,79 +57,49 @@ def __run_test(format, nbytes, expected_header, expected_prefix, use_bin_type):
assert original_array == reconstructed_array
# -----------
# test fixstr
# -----------
def test_memoryview_byte_fixstr():
def test_fixstr_from_byte():
__run_test('B', 31, b'\xbf', b'', False)
def test_memoryview_float_fixstr():
def test_fixstr_from_float():
__run_test('f', 28, b'\xbc', b'', False)
# ----------
# test str16
# ----------
def test_memoryview_byte_str16():
def test_str16_from_byte():
__run_test('B', 2**8, b'\xda', b'\x01\x00', False)
def test_memoryview_float_str16():
def test_str16_from_float():
__run_test('f', 2**8, b'\xda', b'\x01\x00', False)
# ----------
# test str32
# ----------
def test_memoryview_byte_str32():
def test_str32_from_byte():
__run_test('B', 2**16, b'\xdb', b'\x00\x01\x00\x00', False)
def test_memoryview_float_str32():
def test_str32_from_float():
__run_test('f', 2**16, b'\xdb', b'\x00\x01\x00\x00', False)
# ---------
# test bin8
# ---------
def test_memoryview_byte_bin8():
def test_bin8_from_byte():
__run_test('B', 1, b'\xc4', b'\x01', True)
def test_memoryview_float_bin8():
def test_bin8_from_float():
__run_test('f', 4, b'\xc4', b'\x04', True)
# ----------
# test bin16
# ----------
def test_memoryview_byte_bin16():
def test_bin16_from_byte():
__run_test('B', 2**8, b'\xc5', b'\x01\x00', True)
def test_memoryview_float_bin16():
def test_bin16_from_float():
__run_test('f', 2**8, b'\xc5', b'\x01\x00', True)
# ----------
# test bin32
# ----------
def test_memoryview_byte_bin32():
def test_bin32_from_byte():
__run_test('B', 2**16, b'\xc6', b'\x00\x01\x00\x00', True)
def test_memoryview_float_bin32():
def test_bin32_from_float():
__run_test('f', 2**16, b'\xc6', b'\x00\x01\x00\x00', True)