X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_field.py;h=2f855e8bf44484ec5ee5b158615f862bae995c18;hb=76276a81e72d967979674fdc0a646b42d8d6033e;hp=174ae2d9ca9d44839099d795dd2d43fd3d34e892;hpb=a07f15cb06a96ad0f76c2d97979fc6bd9fa81894;p=babeltrace.git

diff --git a/tests/bindings/python/bt2/test_field.py b/tests/bindings/python/bt2/test_field.py
index 174ae2d9..2f855e8b 100644
--- a/tests/bindings/python/bt2/test_field.py
+++ b/tests/bindings/python/bt2/test_field.py
@@ -24,7 +24,7 @@ import copy
 import itertools
 import collections
 import bt2
-from utils import get_default_trace_class
+from utils import get_default_trace_class, TestOutputPortMessageIterator
 
 
 _COMP_BINOPS = (operator.eq, operator.ne)
@@ -63,6 +63,50 @@ def _create_field(tc, field_class):
     return packet.context_field[field_name]
 
 
+# Create a const field of the given field class.
+#
+# The field is part of a dummy stream, itself part of a dummy trace created
+# from trace class `tc`.
+
+
+def _create_const_field(tc, field_class, field_value_setter_fn):
+    field_name = 'const field'
+
+    class MyIter(bt2._UserMessageIterator):
+        def __init__(self, config, self_port_output):
+            nonlocal field_class
+            nonlocal field_value_setter_fn
+            stream = _create_stream(tc, [(field_name, field_class)])
+            packet = stream.create_packet()
+
+            field_value_setter_fn(packet.context_field[field_name])
+
+            self._msgs = [
+                self._create_stream_beginning_message(stream),
+                self._create_packet_beginning_message(packet),
+            ]
+
+        def __next__(self):
+            if len(self._msgs) == 0:
+                raise StopIteration
+
+            return self._msgs.pop(0)
+
+    class MySrc(bt2._UserSourceComponent, message_iterator_class=MyIter):
+        def __init__(self, config, params, obj):
+            self._add_output_port('out', params)
+
+    graph = bt2.Graph()
+    src_comp = graph.add_component(MySrc, 'my_source', None)
+    msg_iter = TestOutputPortMessageIterator(graph, src_comp.output_ports['out'])
+
+    # Ignore first message, stream beginning
+    _ = next(msg_iter)
+    packet_beg_msg = next(msg_iter)
+
+    return packet_beg_msg.packet.context_field[field_name]
+
+
 # Create a field of type string.
 #
 # The field is part of a dummy stream, itself part of a dummy trace created
@@ -126,6 +170,52 @@ def _create_struct_array_field(tc, length):
     return packet.context_field[field_name]
 
 
+class BitArrayFieldTestCase(unittest.TestCase):
+    def _create_field(self):
+        return _create_field(self._tc, self._tc.create_bit_array_field_class(24))
+
+    def setUp(self):
+        self._tc = get_default_trace_class()
+        self._def_value = 15497
+        self._def = self._create_field()
+        self._def.value_as_integer = self._def_value
+        self._def_new_value = 101542
+
+    def test_assign_invalid_type(self):
+        with self.assertRaises(TypeError):
+            self._def.value_as_integer = 'onze'
+
+    def test_assign(self):
+        self._def.value_as_integer = 199
+        self.assertEqual(self._def.value_as_integer, 199)
+
+    def test_assign_masked(self):
+        self._def.value_as_integer = 0xE1549BB
+        self.assertEqual(self._def.value_as_integer, 0xE1549BB & ((1 << 24) - 1))
+
+    def test_eq(self):
+        other = self._create_field()
+        other.value_as_integer = self._def_value
+        self.assertEqual(self._def, other)
+
+    def test_ne_same_type(self):
+        other = self._create_field()
+        other.value_as_integer = self._def_value - 1
+        self.assertNotEqual(self._def, other)
+
+    def test_ne_diff_type(self):
+        self.assertNotEqual(self._def, self._def_value)
+
+    def test_len(self):
+        self.assertEqual(len(self._def), 24)
+
+    def test_str(self):
+        self.assertEqual(str(self._def), str(self._def_value))
+
+    def test_repr(self):
+        self.assertEqual(repr(self._def), repr(self._def_value))
+
+
 # Base class for numeric field test cases.
 #
 # To be compatible with this base class, a derived class must, in its
@@ -570,6 +660,18 @@ class _TestNumericField:
     def test_str_op(self):
         self.assertEqual(str(self._def), str(self._def_value))
 
+    def test_hash_op(self):
+        with self.assertRaises(TypeError):
+            hash(self._def)
+
+    def test_const_hash_op(self):
+        self.assertEqual(hash(self._def_const), hash(self._def_value))
+
+    def test_const_hash_dict(self):
+        my_dict = {}
+        my_dict[self._def_const] = 'my_value'
+        self.assertEqual(my_dict[self._def_value], 'my_value')
+
     def test_eq_none(self):
         # Ignore this lint error:
         #   E711 comparison to None should be 'if cond is None:'
@@ -1078,6 +1180,10 @@ def _inject_numeric_testing_methods(cls):
 
 
 class BoolFieldTestCase(_TestNumericField, unittest.TestCase):
+    @staticmethod
+    def _const_value_setter(field):
+        field.value = True
+
     def _create_fc(self, tc):
         return tc.create_bool_field_class()
 
@@ -1086,8 +1192,15 @@ class BoolFieldTestCase(_TestNumericField, unittest.TestCase):
         self._def = _create_field(self._tc, self._create_fc(self._tc))
         self._def.value = True
         self._def_value = True
+        self._def_const = _create_const_field(
+            self._tc, self._tc.create_bool_field_class(), self._const_value_setter
+        )
         self._def_new_value = False
 
+    def test_classes(self):
+        self.assertIs(type(self._def), bt2._BoolField)
+        self.assertIs(type(self._def_const), bt2._BoolFieldConst)
+
     def test_assign_true(self):
         raw = True
         self._def.value = raw
@@ -1171,12 +1284,35 @@ class _TestIntegerFieldCommon(_TestNumericField):
         field.value = (2 ** 53) + 1
         self.assertEqual(field, raw)
 
-    def test_assign_uint_invalid_neg(self):
-        uint_fc = self._tc.create_unsigned_integer_field_class(32)
+    def test_assign_uint_out_of_range(self):
+        uint_fc = self._tc.create_unsigned_integer_field_class(8)
         field = _create_field(self._tc, uint_fc)
 
-        with self.assertRaises(ValueError):
-            field.value = -23
+        with self.assertRaises(ValueError) as ctx:
+            field.value = 256
+        self.assertEqual(
+            str(ctx.exception), 'Value 256 is outside valid range [0, 255]'
+        )
+
+        with self.assertRaises(ValueError) as ctx:
+            field.value = -1
+        self.assertEqual(str(ctx.exception), 'Value -1 is outside valid range [0, 255]')
+
+    def test_assign_int_out_of_range(self):
+        int_fc = self._tc.create_signed_integer_field_class(8)
+        field = _create_field(self._tc, int_fc)
+
+        with self.assertRaises(ValueError) as ctx:
+            field.value = 128
+        self.assertEqual(
+            str(ctx.exception), 'Value 128 is outside valid range [-128, 127]'
+        )
+
+        with self.assertRaises(ValueError) as ctx:
+            field.value = -129
+        self.assertEqual(
+            str(ctx.exception), 'Value -129 is outside valid range [-128, 127]'
+        )
 
     def test_str_op(self):
         self.assertEqual(str(self._def), str(self._def_value))
@@ -1186,6 +1322,10 @@ _inject_numeric_testing_methods(_TestIntegerFieldCommon)
 
 
 class SignedIntegerFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase):
+    @staticmethod
+    def _const_value_setter(field):
+        field.value = 17
+
     def _create_fc(self, tc):
         return tc.create_signed_integer_field_class(25)
 
@@ -1196,10 +1336,17 @@ class SignedIntegerFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase):
         self._def = _create_field(self._tc, self._create_fc(self._tc))
         self._def.value = 17
         self._def_value = 17
+        self._def_const = _create_const_field(
+            self._tc, self._create_fc(self._tc), self._const_value_setter
+        )
         self._def_new_value = -101
 
 
 class SignedEnumerationFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase):
+    @staticmethod
+    def _const_value_setter(field):
+        field.value = 17
+
     def _create_fc(self, tc):
         fc = tc.create_signed_enumeration_field_class(32)
         fc.add_mapping('something', bt2.SignedIntegerRangeSet([(17, 17)]))
@@ -1217,6 +1364,9 @@ class SignedEnumerationFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase)
         self._def = _create_field(self._tc, self._create_fc(self._tc))
         self._def.value = 17
         self._def_value = 17
+        self._def_const = _create_const_field(
+            self._tc, self._create_fc(self._tc), self._const_value_setter
+        )
         self._def_new_value = -101
 
     def test_str_op(self):
@@ -1240,14 +1390,119 @@ class SignedEnumerationFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase)
         self.assertEqual(labels, ['something', 'whole range', 'zip'])
 
 
-class RealFieldTestCase(_TestNumericField, unittest.TestCase):
+class SingleRealFieldTestCase(_TestNumericField, unittest.TestCase):
+    @staticmethod
+    def _const_value_setter(field):
+        field.value = 52.0
+
     def _create_fc(self, tc):
-        return tc.create_real_field_class()
+        return tc.create_single_precision_real_field_class()
 
     def setUp(self):
         self._tc = get_default_trace_class()
         self._field = _create_field(self._tc, self._create_fc(self._tc))
         self._def = _create_field(self._tc, self._create_fc(self._tc))
+        self._def_const = _create_const_field(
+            self._tc,
+            self._tc.create_single_precision_real_field_class(),
+            self._const_value_setter,
+        )
+        self._def.value = 52.0
+        self._def_value = 52.0
+        self._def_new_value = -17.0
+
+    def _test_invalid_op(self, cb):
+        with self.assertRaises(TypeError):
+            cb()
+
+    def test_assign_true(self):
+        self._def.value = True
+        self.assertTrue(self._def)
+
+    def test_assign_false(self):
+        self._def.value = False
+        self.assertFalse(self._def)
+
+    def test_assign_pos_int(self):
+        raw = 477
+        self._def.value = raw
+        self.assertEqual(self._def, float(raw))
+
+    def test_assign_neg_int(self):
+        raw = -13
+        self._def.value = raw
+        self.assertEqual(self._def, float(raw))
+
+    def test_assign_int_field(self):
+        int_fc = self._tc.create_signed_integer_field_class(32)
+        int_field = _create_field(self._tc, int_fc)
+        raw = 999
+        int_field.value = raw
+        self._def.value = int_field
+        self.assertEqual(self._def, float(raw))
+
+    def test_assign_float(self):
+        raw = -19.23
+        self._def.value = raw
+        # It's expected to have some lost of precision because of the field
+        # that is in single precision.
+        self.assertEqual(round(self._def, 5), raw)
+
+    def test_assign_float_field(self):
+        field = _create_field(self._tc, self._create_fc(self._tc))
+        raw = 101.32
+        field.value = raw
+        self._def.value = field
+        # It's expected to have some lost of precision because of the field
+        # that is in single precision.
+        self.assertEqual(round(self._def, 5), raw)
+
+    def test_assign_invalid_type(self):
+        with self.assertRaises(TypeError):
+            self._def.value = 'yes'
+
+    def test_invalid_lshift(self):
+        self._test_invalid_op(lambda: self._def << 23)
+
+    def test_invalid_rshift(self):
+        self._test_invalid_op(lambda: self._def >> 23)
+
+    def test_invalid_and(self):
+        self._test_invalid_op(lambda: self._def & 23)
+
+    def test_invalid_or(self):
+        self._test_invalid_op(lambda: self._def | 23)
+
+    def test_invalid_xor(self):
+        self._test_invalid_op(lambda: self._def ^ 23)
+
+    def test_invalid_invert(self):
+        self._test_invalid_op(lambda: ~self._def)
+
+    def test_str_op(self):
+        self.assertEqual(str(round(self._def, 5)), str(self._def_value))
+
+
+_inject_numeric_testing_methods(SingleRealFieldTestCase)
+
+
+class DoubleRealFieldTestCase(_TestNumericField, unittest.TestCase):
+    @staticmethod
+    def _const_value_setter(field):
+        field.value = 52.7
+
+    def _create_fc(self, tc):
+        return tc.create_double_precision_real_field_class()
+
+    def setUp(self):
+        self._tc = get_default_trace_class()
+        self._field = _create_field(self._tc, self._create_fc(self._tc))
+        self._def = _create_field(self._tc, self._create_fc(self._tc))
+        self._def_const = _create_const_field(
+            self._tc,
+            self._tc.create_double_precision_real_field_class(),
+            self._const_value_setter,
+        )
         self._def.value = 52.7
         self._def_value = 52.7
         self._def_new_value = -17.164857
@@ -1320,14 +1575,21 @@ class RealFieldTestCase(_TestNumericField, unittest.TestCase):
         self.assertEqual(str(self._def), str(self._def_value))
 
 
-_inject_numeric_testing_methods(RealFieldTestCase)
+_inject_numeric_testing_methods(DoubleRealFieldTestCase)
 
 
 class StringFieldTestCase(unittest.TestCase):
+    @staticmethod
+    def _const_value_setter(field):
+        field.value = 'Hello, World!'
+
     def setUp(self):
         self._tc = get_default_trace_class()
         self._def_value = 'Hello, World!'
         self._def = _create_string_field(self._tc)
+        self._def_const = _create_const_field(
+            self._tc, self._tc.create_string_field_class(), self._const_value_setter
+        )
         self._def.value = self._def_value
         self._def_new_value = 'Yes!'
 
@@ -1344,6 +1606,9 @@ class StringFieldTestCase(unittest.TestCase):
     def test_eq(self):
         self.assertEqual(self._def, self._def_value)
 
+    def test_const_eq(self):
+        self.assertEqual(self._def_const, self._def_value)
+
     def test_not_eq(self):
         self.assertNotEqual(self._def, 23)
 
@@ -1407,12 +1672,21 @@ class StringFieldTestCase(unittest.TestCase):
     def test_getitem(self):
         self.assertEqual(self._def[5], self._def_value[5])
 
+    def test_const_getitem(self):
+        self.assertEqual(self._def_const[5], self._def_value[5])
+
     def test_append_str(self):
         to_append = 'meow meow meow'
         self._def += to_append
         self._def_value += to_append
         self.assertEqual(self._def, self._def_value)
 
+    def test_const_append_str(self):
+        to_append = 'meow meow meow'
+        with self.assertRaises(TypeError):
+            self._def_const += to_append
+        self.assertEqual(self._def_const, self._def_value)
+
     def test_append_string_field(self):
         field = _create_string_field(self._tc)
         to_append = 'meow meow meow'
@@ -1421,6 +1695,18 @@ class StringFieldTestCase(unittest.TestCase):
         self._def_value += to_append
         self.assertEqual(self._def, self._def_value)
 
+    def test_hash_op(self):
+        with self.assertRaises(TypeError):
+            hash(self._def)
+
+    def test_const_hash_op(self):
+        self.assertEqual(hash(self._def_const), hash(self._def_value))
+
+    def test_const_hash_dict(self):
+        my_dict = {}
+        my_dict[self._def_const] = 'my_value'
+        self.assertEqual(my_dict[self._def_value], 'my_value')
+
 
 class _TestArrayFieldCommon:
     def _modify_def(self):
@@ -1440,6 +1726,11 @@ class _TestArrayFieldCommon:
         self.assertIs(type(field), bt2._SignedIntegerField)
         self.assertEqual(field, 1847)
 
+    def test_const_getitem(self):
+        field = self._def_const[1]
+        self.assertIs(type(field), bt2._SignedIntegerFieldConst)
+        self.assertEqual(field, 1847)
+
     def test_eq(self):
         field = _create_int_array_field(self._tc, 3)
         field[0] = 45
@@ -1504,10 +1795,18 @@ class _TestArrayFieldCommon:
         with self.assertRaises(IndexError):
             self._def[len(self._def)] = 134679
 
+    def test_const_setitem(self):
+        with self.assertRaises(TypeError):
+            self._def_const[0] = 134679
+
     def test_iter(self):
         for field, value in zip(self._def, (45, 1847, 1948754)):
             self.assertEqual(field, value)
 
+    def test_const_iter(self):
+        for field, value in zip(self._def_const, (45, 1847, 1948754)):
+            self.assertEqual(field, value)
+
     def test_value_int_field(self):
         values = [45646, 145, 12145]
         self._def.value = values
@@ -1553,6 +1852,10 @@ class _TestArrayFieldCommon:
 
 
 class StaticArrayFieldTestCase(_TestArrayFieldCommon, unittest.TestCase):
+    @staticmethod
+    def _const_value_setter(field):
+        field.value = [45, 1847, 1948754]
+
     def setUp(self):
         self._tc = get_default_trace_class()
         self._def = _create_int_array_field(self._tc, 3)
@@ -1560,6 +1863,13 @@ class StaticArrayFieldTestCase(_TestArrayFieldCommon, unittest.TestCase):
         self._def[1] = 1847
         self._def[2] = 1948754
         self._def_value = [45, 1847, 1948754]
+        self._def_const = _create_const_field(
+            self._tc,
+            self._tc.create_static_array_field_class(
+                self._tc.create_signed_integer_field_class(32), 3
+            ),
+            self._const_value_setter,
+        )
 
     def test_value_wrong_len(self):
         values = [45, 1847]
@@ -1568,6 +1878,10 @@ class StaticArrayFieldTestCase(_TestArrayFieldCommon, unittest.TestCase):
 
 
 class DynamicArrayFieldTestCase(_TestArrayFieldCommon, unittest.TestCase):
+    @staticmethod
+    def _const_value_setter(field):
+        field.value = [45, 1847, 1948754]
+
     def setUp(self):
         self._tc = get_default_trace_class()
         self._def = _create_dynamic_array(self._tc)
@@ -1575,6 +1889,13 @@ class DynamicArrayFieldTestCase(_TestArrayFieldCommon, unittest.TestCase):
         self._def[1] = 1847
         self._def[2] = 1948754
         self._def_value = [45, 1847, 1948754]
+        self._def_const = _create_const_field(
+            self._tc,
+            self._tc.create_dynamic_array_field_class(
+                self._tc.create_signed_integer_field_class(32)
+            ),
+            self._const_value_setter,
+        )
 
     def test_value_resize(self):
         new_values = [1, 2, 3, 4]
@@ -1586,12 +1907,28 @@ class DynamicArrayFieldTestCase(_TestArrayFieldCommon, unittest.TestCase):
         self._def[3] = 0
         self.assertEqual(len(self._def), 4)
 
+    def test_const_set_length(self):
+        with self.assertRaises(AttributeError):
+            self._def_const.length = 4
+        self.assertEqual(len(self._def), 3)
+
     def test_set_invalid_length(self):
         with self.assertRaises(TypeError):
             self._def.length = 'cheval'
 
 
 class StructureFieldTestCase(unittest.TestCase):
+    @staticmethod
+    def _const_value_setter(field):
+        field.value = {
+            'A': -1872,
+            'B': 'salut',
+            'C': 17.5,
+            'D': 16497,
+            'E': {},
+            'F': {'F_1': 52},
+        }
+
     def _create_fc(self, tc):
         fc = tc.create_structure_field_class()
         fc.append_member('A', self._fc0_fn())
@@ -1608,7 +1945,7 @@ class StructureFieldTestCase(unittest.TestCase):
         self._tc = get_default_trace_class()
         self._fc0_fn = self._tc.create_signed_integer_field_class
         self._fc1_fn = self._tc.create_string_field_class
-        self._fc2_fn = self._tc.create_real_field_class
+        self._fc2_fn = self._tc.create_double_precision_real_field_class
         self._fc3_fn = self._tc.create_signed_integer_field_class
         self._fc4_fn = self._tc.create_structure_field_class
         self._fc5_fn = self._tc.create_structure_field_class
@@ -1631,6 +1968,10 @@ class StructureFieldTestCase(unittest.TestCase):
             'F': {'F_1': 52},
         }
 
+        self._def_const = _create_const_field(
+            self._tc, self._create_fc(self._tc), self._const_value_setter
+        )
+
     def _modify_def(self):
         self._def['B'] = 'hola'
 
@@ -1645,9 +1986,56 @@ class StructureFieldTestCase(unittest.TestCase):
         self.assertEqual(len(self._def), len(self._def_value))
 
     def test_getitem(self):
-        field = self._def['A']
-        self.assertIs(type(field), bt2._SignedIntegerField)
-        self.assertEqual(field, -1872)
+        field1 = self._def['A']
+        field2 = self._def['B']
+        field3 = self._def['C']
+        field4 = self._def['D']
+        field5 = self._def['E']
+        field6 = self._def['F']
+
+        self.assertIs(type(field1), bt2._SignedIntegerField)
+        self.assertEqual(field1, -1872)
+
+        self.assertIs(type(field2), bt2._StringField)
+        self.assertEqual(field2, 'salut')
+
+        self.assertIs(type(field3), bt2._DoublePrecisionRealField)
+        self.assertEqual(field3, 17.5)
+
+        self.assertIs(type(field4), bt2._SignedIntegerField)
+        self.assertEqual(field4, 16497)
+
+        self.assertIs(type(field5), bt2._StructureField)
+        self.assertEqual(field5, {})
+
+        self.assertIs(type(field6), bt2._StructureField)
+        self.assertEqual(field6, {'F_1': 52})
+
+    def test_const_getitem(self):
+        field1 = self._def_const['A']
+        field2 = self._def_const['B']
+        field3 = self._def_const['C']
+        field4 = self._def_const['D']
+        field5 = self._def_const['E']
+        field6 = self._def_const['F']
+
+        self.assertIs(type(field1), bt2._SignedIntegerFieldConst)
+        self.assertEqual(field1, -1872)
+
+        self.assertIs(type(field2), bt2._StringFieldConst)
+        self.assertEqual(field2, 'salut')
+
+        self.assertIs(type(field3), bt2._DoublePrecisionRealFieldConst)
+        self.assertEqual(field3, 17.5)
+
+        self.assertIs(type(field4), bt2._SignedIntegerFieldConst)
+        self.assertEqual(field4, 16497)
+
+        self.assertIs(type(field5), bt2._StructureFieldConst)
+        self.assertEqual(field5, {})
+
+        self.assertIs(type(field6), bt2._StructureFieldConst)
+        self.assertEqual(field6, {'F_1': 52})
 
     def test_member_at_index_out_of_bounds_after(self):
         with self.assertRaises(IndexError):
@@ -1663,6 +2051,16 @@ class StructureFieldTestCase(unittest.TestCase):
         field['F'] = {'F_1': 52}
         self.assertEqual(self._def, field)
 
+    def test_const_eq(self):
+        field = _create_field(self._tc, self._create_fc(self._tc))
+        field['A'] = -1872
+        field['B'] = 'salut'
+        field['C'] = 17.5
+        field['D'] = 16497
+        field['E'] = {}
+        field['F'] = {'F_1': 52}
+        self.assertEqual(self._def_const, field)
+
     def test_eq_invalid_type(self):
         self.assertNotEqual(self._def, 23)
 
@@ -1726,6 +2124,10 @@ class StructureFieldTestCase(unittest.TestCase):
         self._def['C'] = -18.47
         self.assertEqual(self._def['C'], -18.47)
 
+    def test_const_setitem(self):
+        with self.assertRaises(TypeError):
+            self._def_const['A'] = 134679
+
     def test_setitem_int_field(self):
         int_fc = self._tc.create_signed_integer_field_class(32)
         int_field = _create_field(self._tc, int_fc)
@@ -1758,6 +2160,9 @@ class StructureFieldTestCase(unittest.TestCase):
     def test_member_at_index(self):
         self.assertEqual(self._def.member_at_index(1), 'salut')
 
+    def test_const_member_at_index(self):
+        self.assertEqual(self._def_const.member_at_index(1), 'salut')
+
     def test_iter(self):
         orig_values = {
             'A': -1872,
@@ -1823,11 +2228,117 @@ class StructureFieldTestCase(unittest.TestCase):
         self.assertTrue(expected_string_found)
 
 
+class OptionFieldTestCase(unittest.TestCase):
+    @staticmethod
+    def _const_value_setter(field):
+        field.value = {'opt_field': 'hiboux'}
+
+    def _create_fc(self, tc):
+        fc = tc.create_option_field_class(tc.create_string_field_class())
+        top_fc = tc.create_structure_field_class()
+        top_fc.append_member('opt_field', fc)
+        return top_fc
+
+    def setUp(self):
+        self._tc = get_default_trace_class()
+        fld = _create_field(self._tc, self._create_fc(self._tc))
+        self._def = fld['opt_field']
+        self._def_value = 'hiboux'
+        self._def_const = _create_const_field(
+            self._tc, self._create_fc(self._tc), self._const_value_setter
+        )['opt_field']
+
+    def test_value_prop(self):
+        self._def.value = 'hiboux'
+        self.assertEqual(self._def.field, 'hiboux')
+        self.assertIs(type(self._def), bt2._OptionField)
+        self.assertIs(type(self._def.field), bt2._StringField)
+        self.assertTrue(self._def.has_field)
+
+    def test_const_value_prop(self):
+        self.assertEqual(self._def_const.field, 'hiboux')
+        self.assertIs(type(self._def_const), bt2._OptionFieldConst)
+        self.assertIs(type(self._def_const.field), bt2._StringFieldConst)
+        self.assertTrue(self._def_const.has_field)
+
+    def test_has_field_prop_true(self):
+        self._def.has_field = True
+        self.assertTrue(self._def.has_field)
+
+    def test_has_field_prop_false(self):
+        self._def.has_field = False
+        self.assertFalse(self._def.has_field)
+
+    def test_bool_op_true(self):
+        self._def.value = 'allo'
+        self.assertTrue(self._def)
+
+    def test_bool_op_false(self):
+        self._def.has_field = False
+        self.assertFalse(self._def)
+
+    def test_field_prop_existing(self):
+        self._def.value = 'meow'
+        field = self._def.field
+        self.assertEqual(field, 'meow')
+
+    def test_field_prop_none(self):
+        self._def.has_field = False
+        field = self._def.field
+        self.assertIsNone(field)
+
+    def test_const_field_prop(self):
+        with self.assertRaises(AttributeError):
+            self._def_const.has_field = False
+
+        self.assertEqual(self._def_const, self._def_value)
+        self.assertTrue(self._def_const.has_field)
+
+    def test_field_prop_existing_then_none(self):
+        self._def.value = 'meow'
+        field = self._def.field
+        self.assertEqual(field, 'meow')
+        self._def.has_field = False
+        field = self._def.field
+        self.assertIsNone(field)
+
+    def test_eq(self):
+        field = _create_field(self._tc, self._create_fc(self._tc))
+        field = field['opt_field']
+        field.value = 'walk'
+        self._def.value = 'walk'
+        self.assertEqual(self._def, field)
+
+    def test_const_eq(self):
+        field = _create_field(self._tc, self._create_fc(self._tc))
+        field = field['opt_field']
+        field.value = 'hiboux'
+        self.assertEqual(self._def_const, field)
+        self.assertEqual(self._def_const, self._def_value)
+
+    def test_eq_invalid_type(self):
+        self._def.value = 'gerry'
+        self.assertNotEqual(self._def, 23)
+
+    def test_str_op(self):
+        self._def.value = 'marcel'
+        self.assertEqual(str(self._def), str(self._def.field))
+
+    def test_repr_op(self):
+        self._def.value = 'mireille'
+        self.assertEqual(repr(self._def), repr(self._def.field))
+
+
 class VariantFieldTestCase(unittest.TestCase):
+    @staticmethod
+    def _const_value_setter(field):
+        field.selected_option_index = 3
+        field.value = 1334
+
     def _create_fc(self, tc):
         ft0 = tc.create_signed_integer_field_class(32)
         ft1 = tc.create_string_field_class()
-        ft2 = tc.create_real_field_class()
+        ft2 = tc.create_double_precision_real_field_class()
         ft3 = tc.create_signed_integer_field_class(17)
         fc = tc.create_variant_field_class()
         fc.append_option('corner', ft0)
@@ -1843,6 +2354,15 @@ class VariantFieldTestCase(unittest.TestCase):
         fld = _create_field(self._tc, self._create_fc(self._tc))
         self._def = fld['variant_field']
 
+        self._def_value = 1334
+        self._def_selected_index = 3
+        const_fc = self._create_fc(self._tc)['variant_field']
+
+        fld_const = _create_const_field(
+            self._tc, const_fc.field_class, self._const_value_setter
+        )
+        self._def_const = fld_const
+
     def test_bool_op(self):
         self._def.selected_option_index = 2
         self._def.value = -17.34
@@ -1853,14 +2373,35 @@ class VariantFieldTestCase(unittest.TestCase):
         self._def.selected_option_index = 2
         self.assertEqual(self._def.selected_option_index, 2)
 
+    def test_selected_option_index_above_range(self):
+        with self.assertRaises(IndexError):
+            self._def.selected_option_index = 4
+
+    def test_selected_option_index_below_range(self):
+        with self.assertRaises(IndexError):
+            self._def.selected_option_index = -1
+
+    def test_const_selected_option_index(self):
+        with self.assertRaises(AttributeError):
+            self._def_const.selected_option_index = 2
+        self.assertEqual(self._def_const.selected_option_index, 3)
+
     def test_selected_option(self):
         self._def.selected_option_index = 2
         self._def.value = -17.34
         self.assertEqual(self._def.selected_option, -17.34)
+        self.assertEqual(type(self._def.selected_option), bt2._DoublePrecisionRealField)
 
         self._def.selected_option_index = 3
         self._def.value = 1921
         self.assertEqual(self._def.selected_option, 1921)
+        self.assertEqual(type(self._def.selected_option), bt2._SignedIntegerField)
+
+    def test_const_selected_option(self):
+        self.assertEqual(self._def_const.selected_option, 1334)
+        self.assertEqual(
+            type(self._def_const.selected_option), bt2._SignedIntegerFieldConst
+        )
 
     def test_eq(self):
         field = _create_field(self._tc, self._create_fc(self._tc))
@@ -1871,6 +2412,16 @@ class VariantFieldTestCase(unittest.TestCase):
         self._def.value = 1774
         self.assertEqual(self._def, field)
 
+    def test_const_eq(self):
+        field = _create_field(self._tc, self._create_fc(self._tc))
+        field = field['variant_field']
+        field.selected_option_index = 3
+        field.value = 1334
+        self.assertEqual(self._def_const, field)
+
+    def test_len(self):
+        self.assertEqual(len(self._def), 4)
+
     def test_eq_invalid_type(self):
         self._def.selected_option_index = 1
         self._def.value = 'gerry'
@@ -1908,3 +2459,7 @@ class VariantFieldTestCase(unittest.TestCase):
         other_field.selected_option_index = 2
         other_field.value = 14.4245
         self.assertEqual(str(field), str(other_field))
+
+
+if __name__ == '__main__':
+    unittest.main()