enum_ft = bt2.EnumerationFieldType(int_ft)
self.assertEqual(enum_ft.integer_field_type.addr, int_ft.addr)
- def test_append_mapping_simple(self):
- self._ft.append_mapping('hello', 24)
+ def test_add_mapping_simple(self):
+ self._ft.add_mapping('hello', 24)
mapping = self._ft[0]
self.assertEqual(mapping.name, 'hello')
self.assertEqual(mapping.lower, 24)
self.assertEqual(mapping.upper, 24)
- def test_append_mapping_simple_kwargs(self):
- self._ft.append_mapping(name='hello', lower=17, upper=23)
+ def test_add_mapping_simple_kwargs(self):
+ self._ft.add_mapping(name='hello', lower=17, upper=23)
mapping = self._ft[0]
self.assertEqual(mapping.name, 'hello')
self.assertEqual(mapping.lower, 17)
self.assertEqual(mapping.upper, 23)
- def test_append_mapping_range(self):
- self._ft.append_mapping('hello', 21, 199)
+ def test_add_mapping_range(self):
+ self._ft.add_mapping('hello', 21, 199)
mapping = self._ft[0]
self.assertEqual(mapping.name, 'hello')
self.assertEqual(mapping.lower, 21)
self.assertEqual(mapping.upper, 199)
- def test_append_mapping_invalid_name(self):
+ def test_add_mapping_invalid_name(self):
with self.assertRaises(TypeError):
- self._ft.append_mapping(17, 21, 199)
+ self._ft.add_mapping(17, 21, 199)
- def test_append_mapping_invalid_signedness_lower(self):
+ def test_add_mapping_invalid_signedness_lower(self):
with self.assertRaises(ValueError):
- self._ft.append_mapping('hello', -21, 199)
+ self._ft.add_mapping('hello', -21, 199)
- def test_append_mapping_invalid_signedness_upper(self):
+ def test_add_mapping_invalid_signedness_upper(self):
with self.assertRaises(ValueError):
- self._ft.append_mapping('hello', 21, -199)
+ self._ft.add_mapping('hello', 21, -199)
- def test_append_mapping_simple_signed(self):
+ def test_add_mapping_simple_signed(self):
self._ft.is_signed = True
- self._ft.append_mapping('hello', -24)
+ self._ft.add_mapping('hello', -24)
mapping = self._ft[0]
self.assertEqual(mapping.name, 'hello')
self.assertEqual(mapping.lower, -24)
self.assertEqual(mapping.upper, -24)
- def test_append_mapping_range_signed(self):
+ def test_add_mapping_range_signed(self):
self._ft.is_signed = True
- self._ft.append_mapping('hello', -21, 199)
+ self._ft.add_mapping('hello', -21, 199)
mapping = self._ft[0]
self.assertEqual(mapping.name, 'hello')
self.assertEqual(mapping.lower, -21)
def test_iadd(self):
enum_ft = bt2.EnumerationFieldType(size=16)
- enum_ft.append_mapping('c', 4, 5)
- enum_ft.append_mapping('d', 6, 18)
- enum_ft.append_mapping('e', 20, 27)
- self._ft.append_mapping('a', 0, 2)
- self._ft.append_mapping('b', 3)
+ enum_ft.add_mapping('c', 4, 5)
+ enum_ft.add_mapping('d', 6, 18)
+ enum_ft.add_mapping('e', 20, 27)
+ self._ft.add_mapping('a', 0, 2)
+ self._ft.add_mapping('b', 3)
self._ft += enum_ft
self.assertEqual(self._ft[0].name, 'a')
self.assertEqual(self._ft[0].lower, 0)
def test_bool_op(self):
self.assertFalse(self._ft)
- self._ft.append_mapping('a', 0)
+ self._ft.add_mapping('a', 0)
self.assertTrue(self._ft)
def test_len(self):
- self._ft.append_mapping('a', 0)
- self._ft.append_mapping('b', 1)
- self._ft.append_mapping('c', 2)
+ self._ft.add_mapping('a', 0)
+ self._ft.add_mapping('b', 1)
+ self._ft.add_mapping('c', 2)
self.assertEqual(len(self._ft), 3)
def test_getitem(self):
- self._ft.append_mapping('a', 0)
- self._ft.append_mapping('b', 1, 3)
- self._ft.append_mapping('c', 5)
+ self._ft.add_mapping('a', 0)
+ self._ft.add_mapping('b', 1, 3)
+ self._ft.add_mapping('c', 5)
mapping = self._ft[1]
self.assertEqual(mapping.name, 'b')
self.assertEqual(mapping.lower, 1)
)
for mapping in mappings:
- self._ft.append_mapping(*mapping)
+ self._ft.add_mapping(*mapping)
for ft_mapping, mapping in zip(self._ft, mappings):
self.assertEqual(ft_mapping.name, mapping[0])
def test_mapping_eq(self):
enum1 = bt2.EnumerationFieldType(size=32)
enum2 = bt2.EnumerationFieldType(size=16)
- enum1.append_mapping('b', 1, 3)
- enum2.append_mapping('b', 1, 3)
+ enum1.add_mapping('b', 1, 3)
+ enum2.add_mapping('b', 1, 3)
self.assertEqual(enum1[0], enum2[0])
def test_mapping_eq_invalid(self):
enum1 = bt2.EnumerationFieldType(size=32)
- enum1.append_mapping('b', 1, 3)
+ enum1.add_mapping('b', 1, 3)
self.assertNotEqual(enum1[0], 23)
def _test_find_by_name(self, ft):
- ft.append_mapping('a', 0)
- ft.append_mapping('b', 1, 3)
- ft.append_mapping('a', 5)
- ft.append_mapping('a', 17, 144)
- ft.append_mapping('C', 5)
+ ft.add_mapping('a', 0)
+ ft.add_mapping('b', 1, 3)
+ ft.add_mapping('a', 5)
+ ft.add_mapping('a', 17, 144)
+ ft.add_mapping('C', 5)
mapping_iter = ft.mappings_by_name('a')
mappings = list(mapping_iter)
a0 = False
self._test_find_by_name(bt2.EnumerationFieldType(size=8))
def _test_find_by_value(self, ft):
- ft.append_mapping('a', 0)
- ft.append_mapping('b', 1, 3)
- ft.append_mapping('c', 5, 19)
- ft.append_mapping('d', 8, 15)
- ft.append_mapping('e', 10, 21)
- ft.append_mapping('f', 0)
- ft.append_mapping('g', 14)
+ ft.add_mapping('a', 0)
+ ft.add_mapping('b', 1, 3)
+ ft.add_mapping('c', 5, 19)
+ ft.add_mapping('d', 8, 15)
+ ft.add_mapping('e', 10, 21)
+ ft.add_mapping('f', 0)
+ ft.add_mapping('g', 14)
mapping_iter = ft.mappings_by_value(14)
mappings = list(mapping_iter)
c = False
self._test_find_by_value(bt2.EnumerationFieldType(size=8))
def test_create_field(self):
- self._ft.append_mapping('c', 4, 5)
+ self._ft.add_mapping('c', 4, 5)
field = self._ft()
self.assertIsInstance(field, bt2.fields._EnumerationField)
def test_create_field_init(self):
- self._ft.append_mapping('c', 4, 5)
+ self._ft.add_mapping('c', 4, 5)
field = self._ft(4)
self.assertEqual(field, 4)
class EnumerationFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase):
def setUp(self):
self._ft = bt2.EnumerationFieldType(size=32, is_signed=True)
- self._ft.append_mapping('whole range', -(2 ** 31), (2 ** 31) - 1)
- self._ft.append_mapping('something', 17)
- self._ft.append_mapping('speaker', 12, 16)
- self._ft.append_mapping('can', 18, 2540)
- self._ft.append_mapping('zip', -45, 1001)
+ self._ft.add_mapping('whole range', -(2 ** 31), (2 ** 31) - 1)
+ self._ft.add_mapping('something', 17)
+ self._ft.add_mapping('speaker', 12, 16)
+ self._ft.add_mapping('can', 18, 2540)
+ self._ft.add_mapping('zip', -45, 1001)
self._def = self._ft()
self._def.value = 17
self._def_value = 17
class VariantFieldTestCase(_TestCopySimple, unittest.TestCase):
def setUp(self):
self._tag_ft = bt2.EnumerationFieldType(size=32)
- self._tag_ft.append_mapping('corner', 23)
- self._tag_ft.append_mapping('zoom', 17, 20)
- self._tag_ft.append_mapping('mellotron', 1001)
- self._tag_ft.append_mapping('giorgio', 2000, 3000)
+ self._tag_ft.add_mapping('corner', 23)
+ self._tag_ft.add_mapping('zoom', 17, 20)
+ self._tag_ft.add_mapping('mellotron', 1001)
+ self._tag_ft.add_mapping('giorgio', 2000, 3000)
self._ft0 = bt2.IntegerFieldType(32, is_signed=True)
self._ft1 = bt2.StringFieldType()
self._ft2 = bt2.FloatingPointNumberFieldType()
def test_eq(self):
tag_ft = bt2.EnumerationFieldType(size=32)
- tag_ft.append_mapping('corner', 23)
- tag_ft.append_mapping('zoom', 17, 20)
- tag_ft.append_mapping('mellotron', 1001)
- tag_ft.append_mapping('giorgio', 2000, 3000)
+ tag_ft.add_mapping('corner', 23)
+ tag_ft.add_mapping('zoom', 17, 20)
+ tag_ft.add_mapping('mellotron', 1001)
+ tag_ft.add_mapping('giorgio', 2000, 3000)
ft0 = bt2.IntegerFieldType(32, is_signed=True)
ft1 = bt2.StringFieldType()
ft2 = bt2.FloatingPointNumberFieldType()