X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_field.py;h=db6404455cfc26609384341e35828b1fe031bbb5;hb=26fc5aedf;hp=97d5a4f3a87aea789a35e5677417537effb9e47f;hpb=c4239792c6758f579fb9482ddccf336f1bbf26c4;p=babeltrace.git diff --git a/tests/bindings/python/bt2/test_field.py b/tests/bindings/python/bt2/test_field.py index 97d5a4f3..db640445 100644 --- a/tests/bindings/python/bt2/test_field.py +++ b/tests/bindings/python/bt2/test_field.py @@ -1,25 +1,30 @@ +# +# Copyright (C) 2019 EfficiOS Inc. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; only version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# + from functools import partial, partialmethod import operator import unittest -import numbers import math import copy import itertools +import collections import bt2 - - -class _TestCopySimple: - def test_copy(self): - cpy = copy.copy(self._def) - self.assertIsNot(cpy, self._def) - self.assertNotEqual(cpy.addr, self._def.addr) - self.assertEqual(cpy, self._def) - - def test_deepcopy(self): - cpy = copy.deepcopy(self._def) - self.assertIsNot(cpy, self._def) - self.assertNotEqual(cpy.addr, self._def.addr) - self.assertEqual(cpy, self._def) +from utils import get_default_trace_class _COMP_BINOPS = ( @@ -28,59 +33,179 @@ _COMP_BINOPS = ( ) -class _TestNumericField(_TestCopySimple): +# Create and return a stream with the field classes part of its stream packet +# context. +# +# The stream is part of a dummy trace created from trace class `tc`. + +def _create_stream(tc, ctx_field_classes): + packet_context_fc = tc.create_structure_field_class() + for name, fc in ctx_field_classes: + packet_context_fc.append_member(name, fc) + + trace = tc() + stream_class = tc.create_stream_class(packet_context_field_class=packet_context_fc, + supports_packets=True) + + stream = trace.create_stream(stream_class) + return stream + + +# Create a 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_field(tc, field_class): + field_name = 'field' + stream = _create_stream(tc, [(field_name, field_class)]) + packet = stream.create_packet() + return 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 +# from trace class `tc`. It is made out of a dummy string field class. + +def _create_string_field(tc): + field_name = 'string_field' + stream = _create_stream(tc, [(field_name, tc.create_string_field_class())]) + packet = stream.create_packet() + return packet.context_field[field_name] + + +# Create a field of type static array of ints. +# +# The field is part of a dummy stream, itself part of a dummy trace created +# from trace class `tc`. It is made out of a dummy static array field class, +# with a dummy integer field class as element class. + +def _create_int_array_field(tc, length): + elem_fc = tc.create_signed_integer_field_class(32) + fc = tc.create_static_array_field_class(elem_fc, length) + field_name = 'int_array' + stream = _create_stream(tc, [(field_name, fc)]) + packet = stream.create_packet() + return packet.context_field[field_name] + + +# Create a field of type dynamic array of ints. +# +# The field is part of a dummy stream, itself part of a dummy trace created +# from trace class `tc`. It is made out of a dummy static array field class, +# with a dummy integer field class as element and length classes. + +def _create_dynamic_array(tc): + elem_fc = tc.create_signed_integer_field_class(32) + len_fc = tc.create_signed_integer_field_class(32) + fc = tc.create_dynamic_array_field_class(elem_fc) + field_name = 'int_dyn_array' + stream = _create_stream(tc, [('thelength', len_fc), (field_name, fc)]) + packet = stream.create_packet() + packet.context_field[field_name].length = 3 + return packet.context_field[field_name] + + +# Create a field of type array of (empty) structures. +# +# The field is part of a dummy stream, itself part of a dummy trace created +# from trace class `tc`. It is made out of a dummy static array field class, +# with a dummy struct field class as element class. + +def _create_struct_array_field(tc, length): + elem_fc = tc.create_structure_field_class() + fc = tc.create_static_array_field_class(elem_fc, length) + field_name = 'struct_array' + stream = _create_stream(tc, [(field_name, fc)]) + packet = stream.create_packet() + return packet.context_field[field_name] + + +# Base class for numeric field test cases. +# +# To be compatible with this base class, a derived class must, in its +# setUp() method: +# +# * Set `self._def` to a field object with an arbitrary value. +# * Set `self._def_value` to the equivalent value of `self._def`. +class _TestNumericField: + # Tries the binary operation `op`: + # + # 1. Between `self._def`, which is a field object, and `rhs`. + # 2. Between `self._def_value`, which is the raw value of + # `self._def`, and `rhs`. + # + # Returns the results of 1. and 2. + # + # If there's an exception while performing 1. or 2., asserts that + # both operations raised exceptions, that both exceptions have the + # same type, and returns `None` for both results. def _binop(self, op, rhs): - rexc = None - rvexc = None + type_rexc = None + type_rvexc = None comp_value = rhs - if isinstance(rhs, (bt2.field._IntegerField, bt2.field._FloatingPointNumberField)): - comp_value = copy.copy(rhs) - + # try with field object try: r = op(self._def, rhs) except Exception as e: - rexc = e + type_rexc = type(e) + # try with value try: rv = op(self._def_value, comp_value) except Exception as e: - rvexc = e + type_rvexc = type(e) - if rexc is not None or rvexc is not None: + if type_rexc is not None or type_rvexc is not None: # at least one of the operations raised an exception: in # this case both operations should have raised the same # type of exception (division by zero, bit shift with a # floating point number operand, etc.) - self.assertIs(type(rexc), type(rvexc)) + self.assertIs(type_rexc, type_rvexc) return None, None return r, rv + # Tries the unary operation `op`: + # + # 1. On `self._def`, which is a field object. + # 2. On `self._def_value`, which is the value of `self._def`. + # + # Returns the results of 1. and 2. + # + # If there's an exception while performing 1. or 2., asserts that + # both operations raised exceptions, that both exceptions have the + # same type, and returns `None` for both results. def _unaryop(self, op): - rexc = None - rvexc = None + type_rexc = None + type_rvexc = None + # try with field object try: r = op(self._def) except Exception as e: - rexc = e + type_rexc = type(e) + # try with value try: rv = op(self._def_value) except Exception as e: - rvexc = e + type_rvexc = type(e) - if rexc is not None or rvexc is not None: + if type_rexc is not None or type_rvexc is not None: # at least one of the operations raised an exception: in # this case both operations should have raised the same # type of exception (division by zero, bit shift with a # floating point number operand, etc.) - self.assertIs(type(rexc), type(rvexc)) + self.assertIs(type_rexc, type_rvexc) return None, None return r, rv + # Tests that the unary operation `op` gives results with the same + # type for both `self._def` and `self._def_value`. def _test_unaryop_type(self, op): r, rv = self._unaryop(op) @@ -89,6 +214,9 @@ class _TestNumericField(_TestCopySimple): self.assertIsInstance(r, type(rv)) + # Tests that the unary operation `op` gives results with the same + # value for both `self._def` and `self._def_value`. This uses the + # __eq__() operator of `self._def`. def _test_unaryop_value(self, op): r, rv = self._unaryop(op) @@ -97,16 +225,22 @@ class _TestNumericField(_TestCopySimple): self.assertEqual(r, rv) + # Tests that the unary operation `op`, when applied to `self._def`, + # does not change its underlying BT object address. def _test_unaryop_addr_same(self, op): addr_before = self._def.addr self._unaryop(op) self.assertEqual(self._def.addr, addr_before) + # Tests that the unary operation `op`, when applied to `self._def`, + # does not change its value. def _test_unaryop_value_same(self, op): value_before = copy.copy(self._def_value) self._unaryop(op) self.assertEqual(self._def, value_before) + # Tests that the binary operation `op` gives results with the same + # type for both `self._def` and `self._def_value`. def _test_binop_type(self, op, rhs): r, rv = self._binop(op, rhs) @@ -119,6 +253,9 @@ class _TestNumericField(_TestCopySimple): else: self.assertIsInstance(r, type(rv)) + # Tests that the binary operation `op` gives results with the same + # value for both `self._def` and `self._def_value`. This uses the + # __eq__() operator of `self._def`. def _test_binop_value(self, op, rhs): r, rv = self._binop(op, rhs) @@ -127,16 +264,36 @@ class _TestNumericField(_TestCopySimple): self.assertEqual(r, rv) + # Tests that the binary operation `op`, when applied to `self._def`, + # does not change its underlying BT object address. def _test_binop_lhs_addr_same(self, op, rhs): addr_before = self._def.addr r, rv = self._binop(op, rhs) self.assertEqual(self._def.addr, addr_before) + # Tests that the binary operation `op`, when applied to `self._def`, + # does not change its value. + @unittest.skip('copy is not implemented') def _test_binop_lhs_value_same(self, op, rhs): value_before = copy.copy(self._def) r, rv = self._binop(op, rhs) self.assertEqual(self._def, value_before) + # The methods below which take the `test_cb` and/or `op` parameters + # are meant to be used with one of the _test_binop_*() functions + # above as `test_cb` and a binary operator function as `op`. + # + # For example: + # + # self._test_binop_rhs_pos_int(self._test_binop_value, + # operator.add) + # + # This tests that a numeric field object added to a positive integer + # value gives a result with the expected value. + # + # `vint` and `vfloat` mean a signed integer value object and a real + # value object. + def _test_binop_invalid_unknown(self, op): if op in _COMP_BINOPS: self.skipTest('not testing') @@ -154,54 +311,6 @@ class _TestNumericField(_TestCopySimple): with self.assertRaises(TypeError): op(self._def, None) - def _test_ibinop_value(self, op, rhs): - r, rv = self._binop(op, rhs) - - if r is None: - return - - # The inplace operators are special for field objects because - # they do not return a new, immutable object like it's the case - # for Python numbers. In Python, `a += 2`, where `a` is a number - # object, assigns a new number object reference to `a`, dropping - # the old reference. Since BT's field objects are mutable, we - # modify their internal value with the inplace operators. This - # means however that we can lose data in the process, for - # example: - # - # int_value_obj += 3.3 - # - # Here, if `int_value_obj` is a Python `int` with the value 2, - # it would be a `float` object after this, holding the value - # 5.3. In our case, if `int_value_obj` is an integer field - # object, 3.3 is converted to an `int` object (3) and added to - # the current value of `int_value_obj`, so after this the value - # of the object is 5. This does not compare to 5.3, which is - # why we also use the `int()` type here. - if isinstance(self._def, bt2.field._IntegerField): - rv = int(rv) - - self.assertEqual(r, rv) - - def _test_ibinop_type(self, op, rhs): - r, rv = self._binop(op, rhs) - - if r is None: - return - - self.assertIs(r, self._def) - - def _test_ibinop_invalid_unknown(self, op): - class A: - pass - - with self.assertRaises(TypeError): - op(self._def, A()) - - def _test_ibinop_invalid_none(self, op): - with self.assertRaises(TypeError): - op(self._def, None) - def _test_binop_rhs_false(self, test_cb, op): test_cb(op, False) @@ -244,6 +353,12 @@ class _TestNumericField(_TestCopySimple): def _test_binop_rhs_zero_vfloat(self, test_cb, op): test_cb(op, bt2.create_value(0.0)) + def _test_binop_rhs_complex(self, test_cb, op): + test_cb(op, -23+19j) + + def _test_binop_rhs_zero_complex(self, test_cb, op): + test_cb(op, 0j) + def _test_binop_type_false(self, op): self._test_binop_rhs_false(self._test_binop_type, op) @@ -286,6 +401,12 @@ class _TestNumericField(_TestCopySimple): def _test_binop_type_zero_vfloat(self, op): self._test_binop_rhs_zero_vfloat(self._test_binop_type, op) + def _test_binop_type_complex(self, op): + self._test_binop_rhs_complex(self._test_binop_type, op) + + def _test_binop_type_zero_complex(self, op): + self._test_binop_rhs_zero_complex(self._test_binop_type, op) + def _test_binop_value_false(self, op): self._test_binop_rhs_false(self._test_binop_value, op) @@ -328,6 +449,12 @@ class _TestNumericField(_TestCopySimple): def _test_binop_value_zero_vfloat(self, op): self._test_binop_rhs_zero_vfloat(self._test_binop_value, op) + def _test_binop_value_complex(self, op): + self._test_binop_rhs_complex(self._test_binop_value, op) + + def _test_binop_value_zero_complex(self, op): + self._test_binop_rhs_zero_complex(self._test_binop_value, op) + def _test_binop_lhs_addr_same_false(self, op): self._test_binop_rhs_false(self._test_binop_lhs_addr_same, op) @@ -370,6 +497,12 @@ class _TestNumericField(_TestCopySimple): def _test_binop_lhs_addr_same_zero_vfloat(self, op): self._test_binop_rhs_zero_vfloat(self._test_binop_lhs_addr_same, op) + def _test_binop_lhs_addr_same_complex(self, op): + self._test_binop_rhs_complex(self._test_binop_lhs_addr_same, op) + + def _test_binop_lhs_addr_same_zero_complex(self, op): + self._test_binop_rhs_zero_complex(self._test_binop_lhs_addr_same, op) + def _test_binop_lhs_value_same_false(self, op): self._test_binop_rhs_false(self._test_binop_lhs_value_same, op) @@ -412,89 +545,11 @@ class _TestNumericField(_TestCopySimple): def _test_binop_lhs_value_same_zero_vfloat(self, op): self._test_binop_rhs_zero_vfloat(self._test_binop_lhs_value_same, op) - def _test_ibinop_type_false(self, op): - self._test_binop_rhs_false(self._test_ibinop_type, op) - - def _test_ibinop_type_true(self, op): - self._test_binop_rhs_true(self._test_ibinop_type, op) - - def _test_ibinop_type_pos_int(self, op): - self._test_binop_rhs_pos_int(self._test_ibinop_type, op) + def _test_binop_lhs_value_same_complex(self, op): + self._test_binop_rhs_complex(self._test_binop_lhs_value_same, op) - def _test_ibinop_type_neg_int(self, op): - self._test_binop_rhs_neg_int(self._test_ibinop_type, op) - - def _test_ibinop_type_zero_int(self, op): - self._test_binop_rhs_zero_int(self._test_ibinop_type, op) - - def _test_ibinop_type_pos_vint(self, op): - self._test_binop_rhs_pos_vint(self._test_ibinop_type, op) - - def _test_ibinop_type_neg_vint(self, op): - self._test_binop_rhs_neg_vint(self._test_ibinop_type, op) - - def _test_ibinop_type_zero_vint(self, op): - self._test_binop_rhs_zero_vint(self._test_ibinop_type, op) - - def _test_ibinop_type_pos_float(self, op): - self._test_binop_rhs_pos_float(self._test_ibinop_type, op) - - def _test_ibinop_type_neg_float(self, op): - self._test_binop_rhs_neg_float(self._test_ibinop_type, op) - - def _test_ibinop_type_zero_float(self, op): - self._test_binop_rhs_zero_float(self._test_ibinop_type, op) - - def _test_ibinop_type_pos_vfloat(self, op): - self._test_binop_rhs_pos_vfloat(self._test_ibinop_type, op) - - def _test_ibinop_type_neg_vfloat(self, op): - self._test_binop_rhs_neg_vfloat(self._test_ibinop_type, op) - - def _test_ibinop_type_zero_vfloat(self, op): - self._test_binop_rhs_zero_vfloat(self._test_ibinop_type, op) - - def _test_ibinop_value_false(self, op): - self._test_binop_rhs_false(self._test_ibinop_value, op) - - def _test_ibinop_value_true(self, op): - self._test_binop_rhs_true(self._test_ibinop_value, op) - - def _test_ibinop_value_pos_int(self, op): - self._test_binop_rhs_pos_int(self._test_ibinop_value, op) - - def _test_ibinop_value_neg_int(self, op): - self._test_binop_rhs_neg_int(self._test_ibinop_value, op) - - def _test_ibinop_value_zero_int(self, op): - self._test_binop_rhs_zero_int(self._test_ibinop_value, op) - - def _test_ibinop_value_pos_vint(self, op): - self._test_binop_rhs_pos_vint(self._test_ibinop_value, op) - - def _test_ibinop_value_neg_vint(self, op): - self._test_binop_rhs_neg_vint(self._test_ibinop_value, op) - - def _test_ibinop_value_zero_vint(self, op): - self._test_binop_rhs_zero_vint(self._test_ibinop_value, op) - - def _test_ibinop_value_pos_float(self, op): - self._test_binop_rhs_pos_float(self._test_ibinop_value, op) - - def _test_ibinop_value_neg_float(self, op): - self._test_binop_rhs_neg_float(self._test_ibinop_value, op) - - def _test_ibinop_value_zero_float(self, op): - self._test_binop_rhs_zero_float(self._test_ibinop_value, op) - - def _test_ibinop_value_pos_vfloat(self, op): - self._test_binop_rhs_pos_vfloat(self._test_ibinop_value, op) - - def _test_ibinop_value_neg_vfloat(self, op): - self._test_binop_rhs_neg_vfloat(self._test_ibinop_value, op) - - def _test_ibinop_value_zero_vfloat(self, op): - self._test_binop_rhs_zero_vfloat(self._test_ibinop_value, op) + def _test_binop_lhs_value_same_zero_complex(self, op): + self._test_binop_rhs_zero_complex(self._test_binop_lhs_value_same, op) def test_bool_op(self): self.assertEqual(bool(self._def), bool(self._def_value)) @@ -512,29 +567,23 @@ class _TestNumericField(_TestCopySimple): self.assertEqual(str(self._def), str(self._def_value)) def test_eq_none(self): - self.assertFalse(self._def == None) + # Ignore this lint error: + # E711 comparison to None should be 'if cond is None:' + # since this is what we want to test (even though not good practice). + self.assertFalse(self._def == None) # noqa: E711 def test_ne_none(self): - self.assertTrue(self._def != None) - - def test_is_set(self): - raw = self._def_value - field = self._fc() - self.assertFalse(field.is_set) - field.value = raw - self.assertTrue(field.is_set) - - def test_reset(self): - raw = self._def_value - field = self._fc() - field.value = raw - self.assertTrue(field.is_set) - field.reset() - self.assertFalse(field.is_set) - other = self._fc() - self.assertEqual(other, field) + # Ignore this lint error: + # E711 comparison to None should be 'if cond is not None:' + # since this is what we want to test (even though not good practice). + self.assertTrue(self._def != None) # noqa: E711 +# This is a list of binary operators used for +# _inject_numeric_testing_methods(). +# +# Each entry is a pair of binary operator name (used as part of the +# created testing method's name) and operator function. _BINOPS = ( ('lt', operator.lt), ('le', operator.le), @@ -569,22 +618,11 @@ _BINOPS = ( ) -_IBINOPS = ( - ('iadd', operator.iadd), - ('iand', operator.iand), - ('ifloordiv', operator.ifloordiv), - ('ilshift', operator.ilshift), - ('imod', operator.imod), - ('imul', operator.imul), - ('ior', operator.ior), - ('ipow', operator.ipow), - ('irshift', operator.irshift), - ('isub', operator.isub), - ('itruediv', operator.itruediv), - ('ixor', operator.ixor), -) - - +# This is a list of unary operators used for +# _inject_numeric_testing_methods(). +# +# Each entry is a pair of unary operator name (used as part of the +# created testing method's name) and operator function. _UNARYOPS = ( ('neg', operator.neg), ('pos', operator.pos), @@ -601,13 +639,24 @@ _UNARYOPS = ( ) +# This function injects a bunch of testing methods to a numeric +# field test case. +# +# It is meant to be used like this: +# +# _inject_numeric_testing_methods(MyNumericFieldTestCase) +# +# This function injects: +# +# * One testing method for each _TestNumericField._test_binop_*() +# method, for each binary operator in the _BINOPS tuple. +# +# * One testing method for each _TestNumericField._test_unaryop*() +# method, for each unary operator in the _UNARYOPS tuple. def _inject_numeric_testing_methods(cls): def test_binop_name(suffix): return 'test_binop_{}_{}'.format(name, suffix) - def test_ibinop_name(suffix): - return 'test_ibinop_{}_{}'.format(name, suffix) - def test_unaryop_name(suffix): return 'test_unaryop_{}_{}'.format(name, suffix) @@ -671,6 +720,14 @@ def _inject_numeric_testing_methods(cls): setattr(cls, test_binop_name('lhs_addr_same_zero_vfloat'), partialmethod(_TestNumericField._test_binop_lhs_addr_same_zero_vfloat, op=binop)) setattr(cls, test_binop_name('lhs_value_same_zero_float'), partialmethod(_TestNumericField._test_binop_lhs_value_same_zero_float, op=binop)) setattr(cls, test_binop_name('lhs_value_same_zero_vfloat'), partialmethod(_TestNumericField._test_binop_lhs_value_same_zero_vfloat, op=binop)) + setattr(cls, test_binop_name('type_complex'), partialmethod(_TestNumericField._test_binop_type_complex, op=binop)) + setattr(cls, test_binop_name('type_zero_complex'), partialmethod(_TestNumericField._test_binop_type_zero_complex, op=binop)) + setattr(cls, test_binop_name('value_complex'), partialmethod(_TestNumericField._test_binop_value_complex, op=binop)) + setattr(cls, test_binop_name('value_zero_complex'), partialmethod(_TestNumericField._test_binop_value_zero_complex, op=binop)) + setattr(cls, test_binop_name('lhs_addr_same_complex'), partialmethod(_TestNumericField._test_binop_lhs_addr_same_complex, op=binop)) + setattr(cls, test_binop_name('lhs_addr_same_zero_complex'), partialmethod(_TestNumericField._test_binop_lhs_addr_same_zero_complex, op=binop)) + setattr(cls, test_binop_name('lhs_value_same_complex'), partialmethod(_TestNumericField._test_binop_lhs_value_same_complex, op=binop)) + setattr(cls, test_binop_name('lhs_value_same_zero_complex'), partialmethod(_TestNumericField._test_binop_lhs_value_same_zero_complex, op=binop)) # inject testing methods for each unary operation for name, unaryop in _UNARYOPS: @@ -679,39 +736,6 @@ def _inject_numeric_testing_methods(cls): setattr(cls, test_unaryop_name('addr_same'), partialmethod(_TestNumericField._test_unaryop_addr_same, op=unaryop)) setattr(cls, test_unaryop_name('value_same'), partialmethod(_TestNumericField._test_unaryop_value_same, op=unaryop)) - # inject testing methods for each inplace binary operation - for name, ibinop in _IBINOPS: - setattr(cls, test_ibinop_name('invalid_unknown'), partialmethod(_TestNumericField._test_ibinop_invalid_unknown, op=ibinop)) - setattr(cls, test_ibinop_name('invalid_none'), partialmethod(_TestNumericField._test_ibinop_invalid_none, op=ibinop)) - setattr(cls, test_ibinop_name('type_true'), partialmethod(_TestNumericField._test_ibinop_type_true, op=ibinop)) - setattr(cls, test_ibinop_name('value_true'), partialmethod(_TestNumericField._test_ibinop_value_true, op=ibinop)) - setattr(cls, test_ibinop_name('type_pos_int'), partialmethod(_TestNumericField._test_ibinop_type_pos_int, op=ibinop)) - setattr(cls, test_ibinop_name('type_pos_vint'), partialmethod(_TestNumericField._test_ibinop_type_pos_vint, op=ibinop)) - setattr(cls, test_ibinop_name('value_pos_int'), partialmethod(_TestNumericField._test_ibinop_value_pos_int, op=ibinop)) - setattr(cls, test_ibinop_name('value_pos_vint'), partialmethod(_TestNumericField._test_ibinop_value_pos_vint, op=ibinop)) - setattr(cls, test_ibinop_name('type_neg_int'), partialmethod(_TestNumericField._test_ibinop_type_neg_int, op=ibinop)) - setattr(cls, test_ibinop_name('type_neg_vint'), partialmethod(_TestNumericField._test_ibinop_type_neg_vint, op=ibinop)) - setattr(cls, test_ibinop_name('value_neg_int'), partialmethod(_TestNumericField._test_ibinop_value_neg_int, op=ibinop)) - setattr(cls, test_ibinop_name('value_neg_vint'), partialmethod(_TestNumericField._test_ibinop_value_neg_vint, op=ibinop)) - setattr(cls, test_ibinop_name('type_false'), partialmethod(_TestNumericField._test_ibinop_type_false, op=ibinop)) - setattr(cls, test_ibinop_name('value_false'), partialmethod(_TestNumericField._test_ibinop_value_false, op=ibinop)) - setattr(cls, test_ibinop_name('type_zero_int'), partialmethod(_TestNumericField._test_ibinop_type_zero_int, op=ibinop)) - setattr(cls, test_ibinop_name('type_zero_vint'), partialmethod(_TestNumericField._test_ibinop_type_zero_vint, op=ibinop)) - setattr(cls, test_ibinop_name('value_zero_int'), partialmethod(_TestNumericField._test_ibinop_value_zero_int, op=ibinop)) - setattr(cls, test_ibinop_name('value_zero_vint'), partialmethod(_TestNumericField._test_ibinop_value_zero_vint, op=ibinop)) - setattr(cls, test_ibinop_name('type_pos_float'), partialmethod(_TestNumericField._test_ibinop_type_pos_float, op=ibinop)) - setattr(cls, test_ibinop_name('type_neg_float'), partialmethod(_TestNumericField._test_ibinop_type_neg_float, op=ibinop)) - setattr(cls, test_ibinop_name('type_pos_vfloat'), partialmethod(_TestNumericField._test_ibinop_type_pos_vfloat, op=ibinop)) - setattr(cls, test_ibinop_name('type_neg_vfloat'), partialmethod(_TestNumericField._test_ibinop_type_neg_vfloat, op=ibinop)) - setattr(cls, test_ibinop_name('value_pos_float'), partialmethod(_TestNumericField._test_ibinop_value_pos_float, op=ibinop)) - setattr(cls, test_ibinop_name('value_neg_float'), partialmethod(_TestNumericField._test_ibinop_value_neg_float, op=ibinop)) - setattr(cls, test_ibinop_name('value_pos_vfloat'), partialmethod(_TestNumericField._test_ibinop_value_pos_vfloat, op=ibinop)) - setattr(cls, test_ibinop_name('value_neg_vfloat'), partialmethod(_TestNumericField._test_ibinop_value_neg_vfloat, op=ibinop)) - setattr(cls, test_ibinop_name('type_zero_float'), partialmethod(_TestNumericField._test_ibinop_type_zero_float, op=ibinop)) - setattr(cls, test_ibinop_name('type_zero_vfloat'), partialmethod(_TestNumericField._test_ibinop_type_zero_vfloat, op=ibinop)) - setattr(cls, test_ibinop_name('value_zero_float'), partialmethod(_TestNumericField._test_ibinop_value_zero_float, op=ibinop)) - setattr(cls, test_ibinop_name('value_zero_vfloat'), partialmethod(_TestNumericField._test_ibinop_value_zero_vfloat, op=ibinop)) - class _TestIntegerFieldCommon(_TestNumericField): def test_assign_true(self): @@ -736,30 +760,34 @@ class _TestIntegerFieldCommon(_TestNumericField): def test_assign_int_field(self): raw = 999 - field = self._fc() + field = _create_field(self._tc, self._create_fc(self._tc)) field.value = raw self._def.value = field self.assertEqual(self._def, raw) - def test_assign_float(self): - raw = 123.456 - self._def.value = raw - self.assertEqual(self._def, int(raw)) - def test_assign_invalid_type(self): with self.assertRaises(TypeError): self._def.value = 'yes' def test_assign_uint(self): - fc = bt2.IntegerFieldClass(size=32, is_signed=False) - field = fc() + uint_fc = self._tc.create_unsigned_integer_field_class(32) + field = _create_field(self._tc, uint_fc) raw = 1777 field.value = 1777 self.assertEqual(field, raw) + def test_assign_big_uint(self): + uint_fc = self._tc.create_unsigned_integer_field_class(64) + field = _create_field(self._tc, uint_fc) + # Larger than the IEEE 754 double-precision exact representation of + # integers. + raw = (2**53) + 1 + field.value = (2**53) + 1 + self.assertEqual(field, raw) + def test_assign_uint_invalid_neg(self): - fc = bt2.IntegerFieldClass(size=32, is_signed=False) - field = fc() + uint_fc = self._tc.create_unsigned_integer_field_class(32) + field = _create_field(self._tc, uint_fc) with self.assertRaises(ValueError): field.value = -23 @@ -767,66 +795,42 @@ class _TestIntegerFieldCommon(_TestNumericField): def test_str_op(self): self.assertEqual(str(self._def), str(self._def_value)) - def test_str_op_unset(self): - self.assertEqual(str(self._fc()), 'Unset') - _inject_numeric_testing_methods(_TestIntegerFieldCommon) -@unittest.skip("this is broken") -class IntegerFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase): +class SignedIntegerFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase): + def _create_fc(self, tc): + return tc.create_signed_integer_field_class(25) + def setUp(self): - self._fc = bt2.IntegerFieldClass(25, is_signed=True) - self._field = self._fc() - self._def = self._fc() + self._tc = get_default_trace_class() + self._field = _create_field(self._tc, self._create_fc(self._tc)) + self._field.value = 17 + self._def = _create_field(self._tc, self._create_fc(self._tc)) self._def.value = 17 self._def_value = 17 self._def_new_value = -101 - def tearDown(self): - del self._fc - del self._field - del self._def +class SignedEnumerationFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase): + def _create_fc(self, tc): + fc = tc.create_signed_enumeration_field_class(32) + fc.map_range('something', 17) + fc.map_range('speaker', 12, 16) + fc.map_range('can', 18, 2540) + fc.map_range('whole range', -(2 ** 31), (2 ** 31) - 1) + fc.map_range('zip', -45, 1001) + return fc -@unittest.skip("this is broken") -class EnumerationFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase): def setUp(self): - self._fc = bt2.EnumerationFieldClass(size=32, is_signed=True) - self._fc.add_mapping('whole range', -(2 ** 31), (2 ** 31) - 1) - self._fc.add_mapping('something', 17) - self._fc.add_mapping('speaker', 12, 16) - self._fc.add_mapping('can', 18, 2540) - self._fc.add_mapping('zip', -45, 1001) - self._def = self._fc() + 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.value = 17 self._def_value = 17 self._def_new_value = -101 - def tearDown(self): - del self._fc - del self._def - - def test_mappings(self): - mappings = ( - ('whole range', -(2 ** 31), (2 ** 31) - 1), - ('something', 17, 17), - ('zip', -45, 1001), - ) - - total = 0 - index_set = set() - - for fm in self._def.mappings: - total += 1 - for index, mapping in enumerate(mappings): - if fm.name == mapping[0] and fm.lower == mapping[1] and fm.upper == mapping[2]: - index_set.add(index) - - self.assertEqual(total, 3) - self.assertTrue(0 in index_set and 1 in index_set and 2 in index_set) - def test_str_op(self): expected_string_found = False s = str(self._def) @@ -834,8 +838,8 @@ class EnumerationFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase): # Establish all permutations of the three expected matches since # the order in which mappings are enumerated is not explicitly part of # the API. - for p in itertools.permutations(["'whole range'", "'something'", - "'zip'"]): + for p in itertools.permutations(['whole range', 'something', + 'zip']): candidate = '{} ({})'.format(self._def_value, ', '.join(p)) if candidate == s: expected_string_found = True @@ -843,25 +847,24 @@ class EnumerationFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase): self.assertTrue(expected_string_found) - def test_str_op_unset(self): - self.assertEqual(str(self._fc()), 'Unset') + def test_labels(self): + self._field.value = 17 + labels = sorted(self._field.labels) + self.assertEqual(labels, ['something', 'whole range', 'zip']) + +class RealFieldTestCase(_TestNumericField, unittest.TestCase): + def _create_fc(self, tc): + return tc.create_real_field_class() -@unittest.skip("this is broken") -class FloatingPointNumberFieldTestCase(_TestNumericField, unittest.TestCase): def setUp(self): - self._fc = bt2.FloatingPointNumberFieldClass() - self._field = self._fc() - self._def = self._fc() + 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.value = 52.7 self._def_value = 52.7 self._def_new_value = -17.164857 - def tearDown(self): - del self._fc - del self._field - del self._def - def _test_invalid_op(self, cb): with self.assertRaises(TypeError): cb() @@ -885,11 +888,11 @@ class FloatingPointNumberFieldTestCase(_TestNumericField, unittest.TestCase): self.assertEqual(self._def, float(raw)) def test_assign_int_field(self): - fc = bt2.IntegerFieldClass(32) - field = fc() + int_fc = self._tc.create_signed_integer_field_class(32) + int_field = _create_field(self._tc, int_fc) raw = 999 - field.value = raw - self._def.value = field + int_field.value = raw + self._def.value = int_field self.assertEqual(self._def, float(raw)) def test_assign_float(self): @@ -898,8 +901,7 @@ class FloatingPointNumberFieldTestCase(_TestNumericField, unittest.TestCase): self.assertEqual(self._def, raw) def test_assign_float_field(self): - fc = bt2.FloatingPointNumberFieldClass(32) - field = fc() + field = _create_field(self._tc, self._create_fc(self._tc)) raw = 101.32 field.value = raw self._def.value = field @@ -930,32 +932,24 @@ class FloatingPointNumberFieldTestCase(_TestNumericField, unittest.TestCase): def test_str_op(self): self.assertEqual(str(self._def), str(self._def_value)) - def test_str_op_unset(self): - self.assertEqual(str(self._fc()), 'Unset') -_inject_numeric_testing_methods(FloatingPointNumberFieldTestCase) +_inject_numeric_testing_methods(RealFieldTestCase) -@unittest.skip("this is broken") -class StringFieldTestCase(_TestCopySimple, unittest.TestCase): +class StringFieldTestCase(unittest.TestCase): def setUp(self): - self._fc = bt2.StringFieldClass() + self._tc = get_default_trace_class() self._def_value = 'Hello, World!' - self._def = self._fc() + self._def = _create_string_field(self._tc) self._def.value = self._def_value self._def_new_value = 'Yes!' - def tearDown(self): - del self._fc - del self._def - def test_assign_int(self): with self.assertRaises(TypeError): self._def.value = 283 def test_assign_string_field(self): - fc = bt2.StringFieldClass() - field = fc() + field = _create_string_field(self._tc) raw = 'zorg' field.value = raw self.assertEqual(field, raw) @@ -963,54 +957,54 @@ class StringFieldTestCase(_TestCopySimple, unittest.TestCase): def test_eq(self): self.assertEqual(self._def, self._def_value) - def test_eq(self): + def test_not_eq(self): self.assertNotEqual(self._def, 23) def test_lt_vstring(self): - s1 = self._fc() + s1 = _create_string_field(self._tc) s1.value = 'allo' - s2 = self._fc() + s2 = _create_string_field(self._tc) s2.value = 'bateau' self.assertLess(s1, s2) def test_lt_string(self): - s1 = self._fc() + s1 = _create_string_field(self._tc) s1.value = 'allo' self.assertLess(s1, 'bateau') def test_le_vstring(self): - s1 = self._fc() + s1 = _create_string_field(self._tc) s1.value = 'allo' - s2 = self._fc() + s2 = _create_string_field(self._tc) s2.value = 'bateau' self.assertLessEqual(s1, s2) def test_le_string(self): - s1 = self._fc() + s1 = _create_string_field(self._tc) s1.value = 'allo' self.assertLessEqual(s1, 'bateau') def test_gt_vstring(self): - s1 = self._fc() + s1 = _create_string_field(self._tc) s1.value = 'allo' - s2 = self._fc() + s2 = _create_string_field(self._tc) s2.value = 'bateau' self.assertGreater(s2, s1) def test_gt_string(self): - s1 = self._fc() + s1 = _create_string_field(self._tc) s1.value = 'allo' self.assertGreater('bateau', s1) def test_ge_vstring(self): - s1 = self._fc() + s1 = _create_string_field(self._tc) s1.value = 'allo' - s2 = self._fc() + s2 = _create_string_field(self._tc) s2.value = 'bateau' self.assertGreaterEqual(s2, s1) def test_ge_string(self): - s1 = self._fc() + s1 = _create_string_field(self._tc) s1.value = 'allo' self.assertGreaterEqual('bateau', s1) @@ -1020,9 +1014,6 @@ class StringFieldTestCase(_TestCopySimple, unittest.TestCase): def test_str_op(self): self.assertEqual(str(self._def), str(self._def_value)) - def test_str_op_unset(self): - self.assertEqual(str(self._fc()), 'Unset') - def test_len(self): self.assertEqual(len(self._def), len(self._def_value)) @@ -1036,33 +1027,15 @@ class StringFieldTestCase(_TestCopySimple, unittest.TestCase): self.assertEqual(self._def, self._def_value) def test_append_string_field(self): - fc = bt2.StringFieldClass() - field = fc() + field = _create_string_field(self._tc) to_append = 'meow meow meow' field.value = to_append self._def += field self._def_value += to_append self.assertEqual(self._def, self._def_value) - def test_is_set(self): - raw = self._def_value - field = self._fc() - self.assertFalse(field.is_set) - field.value = raw - self.assertTrue(field.is_set) - - def test_reset(self): - raw = self._def_value - field = self._fc() - field.value = raw - self.assertTrue(field.is_set) - field.reset() - self.assertFalse(field.is_set) - other = self._fc() - self.assertEqual(other, field) - -class _TestArraySequenceFieldCommon(_TestCopySimple): +class _TestArrayFieldCommon: def _modify_def(self): self._def[2] = 23 @@ -1072,14 +1045,16 @@ class _TestArraySequenceFieldCommon(_TestCopySimple): def test_len(self): self.assertEqual(len(self._def), 3) + def test_length(self): + self.assertEqual(self._def.length, 3) + def test_getitem(self): field = self._def[1] - self.assertIs(type(field), bt2.field._IntegerField) + self.assertIs(type(field), bt2.field._SignedIntegerField) self.assertEqual(field, 1847) def test_eq(self): - fc = bt2.ArrayFieldClass(self._elem_fc, 3) - field = fc() + field = _create_int_array_field(self._tc, 3) field[0] = 45 field[1] = 1847 field[2] = 1948754 @@ -1089,36 +1064,40 @@ class _TestArraySequenceFieldCommon(_TestCopySimple): self.assertNotEqual(self._def, 23) def test_eq_diff_len(self): - fc = bt2.ArrayFieldClass(self._elem_fc, 2) - field = fc() + field = _create_int_array_field(self._tc, 2) field[0] = 45 field[1] = 1847 self.assertNotEqual(self._def, field) def test_eq_diff_content_same_len(self): - fc = bt2.ArrayFieldClass(self._elem_fc, 3) - field = fc() + field = _create_int_array_field(self._tc, 3) field[0] = 45 field[1] = 1846 field[2] = 1948754 self.assertNotEqual(self._def, field) + def test_eq_non_sequence_iterable(self): + dct = collections.OrderedDict([(1, 2), (3, 4), (5, 6)]) + field = _create_int_array_field(self._tc, 3) + field[0] = 1 + field[1] = 3 + field[2] = 5 + self.assertEqual(field, list(dct.keys())) + self.assertNotEqual(field, dct) + def test_setitem(self): self._def[2] = 24 self.assertEqual(self._def[2], 24) def test_setitem_int_field(self): - int_field = self._elem_fc() + int_fc = self._tc.create_signed_integer_field_class(32) + int_field = _create_field(self._tc, int_fc) int_field.value = 19487 self._def[1] = int_field self.assertEqual(self._def[1], 19487) def test_setitem_non_basic_field(self): - elem_fc = bt2.StructureFieldClass() - array_fc = bt2.ArrayFieldClass(elem_fc, 3) - elem_field = elem_fc() - array_field = array_fc() - + array_field = _create_struct_array_field(self._tc, 2) with self.assertRaises(TypeError): array_field[1] = 23 @@ -1147,18 +1126,6 @@ class _TestArraySequenceFieldCommon(_TestCopySimple): self._def.value = values self.assertEqual(values, self._def) - def test_value_unset(self): - values = [45646, None, 12145] - self._def.value = values - self.assertFalse(self._def[1].is_set) - - def test_value_rollback(self): - values = [45, 1847, 1948754] - # value is out of range, should not affect those we set previously - with self.assertRaises(bt2.Error): - self._def[2].value = 2**60 - self.assertEqual(values, self._def) - def test_value_check_sequence(self): values = 42 with self.assertRaises(TypeError): @@ -1170,13 +1137,15 @@ class _TestArraySequenceFieldCommon(_TestCopySimple): self._def.value = values def test_value_complex_type(self): - struct_fc = bt2.StructureFieldClass() - int_fc = bt2.IntegerFieldClass(32) - str_fc = bt2.StringFieldClass() - struct_fc.append_field(field_class=int_fc, name='an_int') - struct_fc.append_field(field_class=str_fc, name='a_string') - struct_fc.append_field(field_class=int_fc, name='another_int') - array_fc = bt2.ArrayFieldClass(struct_fc, 3) + struct_fc = self._tc.create_structure_field_class() + int_fc = self._tc.create_signed_integer_field_class(32) + another_int_fc = self._tc.create_signed_integer_field_class(32) + str_fc = self._tc.create_string_field_class() + struct_fc.append_member(field_class=int_fc, name='an_int') + struct_fc.append_member(field_class=str_fc, name='a_string') + struct_fc.append_member(field_class=another_int_fc, name='another_int') + array_fc = self._tc.create_static_array_field_class(struct_fc, 3) + stream = _create_stream(self._tc, [('array_field', array_fc)]) values = [ { 'an_int': 42, @@ -1195,129 +1164,99 @@ class _TestArraySequenceFieldCommon(_TestCopySimple): }, ] - array = array_fc() + array = stream.create_packet().context_field['array_field'] array.value = values self.assertEqual(values, array) values[0]['an_int'] = 'a string' with self.assertRaises(TypeError): array.value = values - def test_is_set(self): - raw = self._def_value - field = self._fc() - self.assertFalse(field.is_set) - field.value = raw - self.assertTrue(field.is_set) - - def test_reset(self): - raw = self._def_value - field = self._fc() - field.value = raw - self.assertTrue(field.is_set) - field.reset() - self.assertFalse(field.is_set) - other = self._fc() - self.assertEqual(other, field) - def test_str_op(self): s = str(self._def) expected_string = '[{}]'.format(', '.join( [repr(v) for v in self._def_value])) self.assertEqual(expected_string, s) - def test_str_op_unset(self): - self.assertEqual(str(self._fc()), 'Unset') - -@unittest.skip("this is broken") -class ArrayFieldTestCase(_TestArraySequenceFieldCommon, unittest.TestCase): +class StaticArrayFieldTestCase(_TestArrayFieldCommon, unittest.TestCase): def setUp(self): - self._elem_fc = bt2.IntegerFieldClass(32) - self._fc = bt2.ArrayFieldClass(self._elem_fc, 3) - self._def = self._fc() + self._tc = get_default_trace_class() + self._def = _create_int_array_field(self._tc, 3) self._def[0] = 45 self._def[1] = 1847 self._def[2] = 1948754 self._def_value = [45, 1847, 1948754] - def tearDown(self): - del self._elem_fc - del self._fc - del self._def - def test_value_wrong_len(self): values = [45, 1847] with self.assertRaises(ValueError): self._def.value = values -@unittest.skip("this is broken") -class SequenceFieldTestCase(_TestArraySequenceFieldCommon, unittest.TestCase): +class DynamicArrayFieldTestCase(_TestArrayFieldCommon, unittest.TestCase): def setUp(self): - self._elem_fc = bt2.IntegerFieldClass(32) - self._fc = bt2.SequenceFieldClass(self._elem_fc, 'the.length') - self._def = self._fc() - self._length_field = self._elem_fc(3) - self._def.length_field = self._length_field + self._tc = get_default_trace_class() + self._def = _create_dynamic_array(self._tc) self._def[0] = 45 self._def[1] = 1847 self._def[2] = 1948754 self._def_value = [45, 1847, 1948754] - def tearDown(self): - del self._elem_fc - del self._fc - del self._def - del self._length_field - def test_value_resize(self): new_values = [1, 2, 3, 4] self._def.value = new_values self.assertCountEqual(self._def, new_values) - def test_value_resize_rollback(self): - with self.assertRaises(TypeError): - self._def.value = [1, 2, 3, 'unexpected string'] - self.assertEqual(self._def, self._def_value) + def test_set_length(self): + self._def.length = 4 + self._def[3] = 0 + self.assertEqual(len(self._def), 4) - self._def.reset() + def test_set_invalid_length(self): with self.assertRaises(TypeError): - self._def.value = [1, 2, 3, 'unexpected string'] - self.assertFalse(self._def.is_set) - + self._def.length = 'cheval' + + +class StructureFieldTestCase(unittest.TestCase): + def _create_fc(self, tc): + fc = tc.create_structure_field_class() + fc.append_member('A', self._fc0_fn()) + fc.append_member('B', self._fc1_fn()) + fc.append_member('C', self._fc2_fn()) + fc.append_member('D', self._fc3_fn()) + fc.append_member('E', self._fc4_fn()) + fc5 = self._fc5_fn() + fc5.append_member('F_1', self._fc5_inner_fn()) + fc.append_member('F', fc5) + return fc -@unittest.skip("this is broken") -class StructureFieldTestCase(_TestCopySimple, unittest.TestCase): def setUp(self): - self._fc0 = bt2.IntegerFieldClass(32, is_signed=True) - self._fc1 = bt2.StringFieldClass() - self._fc2 = bt2.FloatingPointNumberFieldClass() - self._fc3 = bt2.IntegerFieldClass(17) - self._fc = bt2.StructureFieldClass() - self._fc.append_field('A', self._fc0) - self._fc.append_field('B', self._fc1) - self._fc.append_field('C', self._fc2) - self._fc.append_field('D', self._fc3) - self._def = self._fc() + 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._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 + self._fc5_inner_fn = self._tc.create_signed_integer_field_class + + self._fc = self._create_fc(self._tc) + self._def = _create_field(self._tc, self._fc) self._def['A'] = -1872 self._def['B'] = 'salut' self._def['C'] = 17.5 self._def['D'] = 16497 + self._def['E'] = {} + self._def['F'] = {'F_1': 52} self._def_value = { 'A': -1872, 'B': 'salut', 'C': 17.5, - 'D': 16497 + 'D': 16497, + 'E': {}, + 'F': {'F_1': 52} } - def tearDown(self): - del self._fc0 - del self._fc1 - del self._fc2 - del self._fc3 - del self._fc - del self._def - def _modify_def(self): self._def['B'] = 'hola' @@ -1325,73 +1264,88 @@ class StructureFieldTestCase(_TestCopySimple, unittest.TestCase): self.assertTrue(self._def) def test_bool_op_false(self): - fc = bt2.StructureFieldClass() - field = fc() + field = self._def['E'] self.assertFalse(field) def test_len(self): - self.assertEqual(len(self._def), 4) + self.assertEqual(len(self._def), len(self._def_value)) def test_getitem(self): field = self._def['A'] - self.assertIs(type(field), bt2.field._IntegerField) + self.assertIs(type(field), bt2.field._SignedIntegerField) self.assertEqual(field, -1872) - def test_at_index_out_of_bounds_after(self): + def test_member_at_index_out_of_bounds_after(self): with self.assertRaises(IndexError): - self._def.at_index(len(self._fc)) + self._def.member_at_index(len(self._def_value)) def test_eq(self): - fc = bt2.StructureFieldClass() - fc.append_field('A', self._fc0) - fc.append_field('B', self._fc1) - fc.append_field('C', self._fc2) - fc.append_field('D', self._fc3) - field = fc() + 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, field) def test_eq_invalid_type(self): self.assertNotEqual(self._def, 23) def test_eq_diff_len(self): - fc = bt2.StructureFieldClass() - fc.append_field('A', self._fc0) - fc.append_field('B', self._fc1) - fc.append_field('C', self._fc2) - field = fc() + fc = self._tc.create_structure_field_class() + fc.append_member('A', self._fc0_fn()) + fc.append_member('B', self._fc1_fn()) + fc.append_member('C', self._fc2_fn()) + + field = _create_field(self._tc, fc) field['A'] = -1872 field['B'] = 'salut' field['C'] = 17.5 self.assertNotEqual(self._def, field) + def test_eq_diff_keys(self): + fc = self._tc.create_structure_field_class() + fc.append_member('U', self._fc0_fn()) + fc.append_member('V', self._fc1_fn()) + fc.append_member('W', self._fc2_fn()) + fc.append_member('X', self._fc3_fn()) + fc.append_member('Y', self._fc4_fn()) + fc.append_member('Z', self._fc5_fn()) + field = _create_field(self._tc, fc) + field['U'] = -1871 + field['V'] = "gerry" + field['W'] = 18.19 + field['X'] = 16497 + field['Y'] = {} + field['Z'] = {} + self.assertNotEqual(self._def, field) + def test_eq_diff_content_same_len(self): - fc = bt2.StructureFieldClass() - fc.append_field('A', self._fc0) - fc.append_field('B', self._fc1) - fc.append_field('C', self._fc2) - fc.append_field('D', self._fc3) - field = fc() + field = _create_field(self._tc, self._create_fc(self._tc)) field['A'] = -1872 field['B'] = 'salut' field['C'] = 17.4 field['D'] = 16497 + field['E'] = {} + field['F'] = {'F_1': 0} self.assertNotEqual(self._def, field) def test_eq_same_content_diff_keys(self): - fc = bt2.StructureFieldClass() - fc.append_field('A', self._fc0) - fc.append_field('B', self._fc1) - fc.append_field('E', self._fc2) - fc.append_field('D', self._fc3) - field = fc() + fc = self._tc.create_structure_field_class() + fc.append_member('A', self._fc0_fn()) + fc.append_member('B', self._fc1_fn()) + fc.append_member('E', self._fc2_fn()) + fc.append_member('D', self._fc3_fn()) + fc.append_member('C', self._fc4_fn()) + fc.append_member('F', self._fc5_fn()) + field = _create_field(self._tc, fc) field['A'] = -1872 field['B'] = 'salut' - field['E'] = 17.4 + field['E'] = 17.5 field['D'] = 16497 + field['C'] = {} + field['F'] = {} self.assertNotEqual(self._def, field) def test_setitem(self): @@ -1399,18 +1353,17 @@ class StructureFieldTestCase(_TestCopySimple, unittest.TestCase): self.assertEqual(self._def['C'], -18.47) def test_setitem_int_field(self): - int_fc = bt2.IntegerFieldClass(16) - int_field = int_fc() + int_fc = self._tc.create_signed_integer_field_class(32) + int_field = _create_field(self._tc, int_fc) int_field.value = 19487 self._def['D'] = int_field self.assertEqual(self._def['D'], 19487) def test_setitem_non_basic_field(self): - elem_fc = bt2.StructureFieldClass() - elem_field = elem_fc() - struct_fc = bt2.StructureFieldClass() - struct_fc.append_field('A', elem_fc) - struct_field = struct_fc() + elem_fc = self._tc.create_structure_field_class() + struct_fc = self._tc.create_structure_field_class() + struct_fc.append_member('A', elem_fc) + struct_field = _create_field(self._tc, struct_fc) # Will fail on access to .items() of the value with self.assertRaises(AttributeError): @@ -1428,8 +1381,8 @@ class StructureFieldTestCase(_TestCopySimple, unittest.TestCase): with self.assertRaises(KeyError): self._def['hi'] = 134679 - def test_at_index(self): - self.assertEqual(self._def.at_index(1), 'salut') + def test_member_at_index(self): + self.assertEqual(self._def.member_at_index(1), 'salut') def test_iter(self): orig_values = { @@ -1437,6 +1390,8 @@ class StructureFieldTestCase(_TestCopySimple, unittest.TestCase): 'B': 'salut', 'C': 17.5, 'D': 16497, + 'E': {}, + 'F': {'F_1': 52} } for vkey, vval in self._def.items(): @@ -1449,23 +1404,26 @@ class StructureFieldTestCase(_TestCopySimple, unittest.TestCase): 'B': 'salut', 'C': 17.5, 'D': 16497, + 'E': {}, + 'F': {'F_1': 52} } self.assertEqual(self._def, orig_values) def test_set_value(self): - int_fc = bt2.IntegerFieldClass(32) - str_fc = bt2.StringFieldClass() - struct_fc = bt2.StructureFieldClass() - struct_fc.append_field(field_class=int_fc, name='an_int') - struct_fc.append_field(field_class=str_fc, name='a_string') - struct_fc.append_field(field_class=int_fc, name='another_int') + int_fc = self._tc.create_signed_integer_field_class(32) + another_int_fc = self._tc.create_signed_integer_field_class(32) + str_fc = self._tc.create_string_field_class() + struct_fc = self._tc.create_structure_field_class() + struct_fc.append_member(field_class=int_fc, name='an_int') + struct_fc.append_member(field_class=str_fc, name='a_string') + struct_fc.append_member(field_class=another_int_fc, name='another_int') values = { 'an_int': 42, 'a_string': 'hello', 'another_int': 66 } - struct = struct_fc() + struct = _create_field(self._tc, struct_fc) struct.value = values self.assertEqual(values, struct) @@ -1479,62 +1437,6 @@ class StructureFieldTestCase(_TestCopySimple, unittest.TestCase): with self.assertRaises(KeyError): struct.value = unknown_key_values - def test_value_rollback(self): - int_fc = bt2.IntegerFieldClass(32) - str_fc = bt2.StringFieldClass() - struct_fc = bt2.StructureFieldClass() - struct_fc.append_field(field_class=int_fc, name='an_int') - struct_fc.append_field(field_class=str_fc, name='a_string') - struct_fc.append_field(field_class=int_fc, name='another_int') - values = { - 'an_int': 42, - 'a_string': 'hello', - 'another_int': 66 - } - - def test_is_set(self): - values = { - 'an_int': 42, - 'a_string': 'hello', - 'another_int': 66 - } - - int_fc = bt2.IntegerFieldClass(32) - str_fc = bt2.StringFieldClass() - struct_fc = bt2.StructureFieldClass() - struct_fc.append_field(field_class=int_fc, name='an_int') - struct_fc.append_field(field_class=str_fc, name='a_string') - struct_fc.append_field(field_class=int_fc, name='another_int') - - struct = struct_fc() - self.assertFalse(struct.is_set) - struct.value = values - self.assertTrue(struct.is_set) - - struct = struct_fc() - struct['an_int'].value = 42 - self.assertFalse(struct.is_set) - - def test_reset(self): - values = { - 'an_int': 42, - 'a_string': 'hello', - 'another_int': 66 - } - - int_fc = bt2.IntegerFieldClass(32) - str_fc = bt2.StringFieldClass() - struct_fc = bt2.StructureFieldClass() - struct_fc.append_field(field_class=int_fc, name='an_int') - struct_fc.append_field(field_class=str_fc, name='a_string') - struct_fc.append_field(field_class=int_fc, name='another_int') - - struct = struct_fc() - struct.value = values - self.assertTrue(struct.is_set) - struct.reset() - self.assertEqual(struct_fc(), struct) - def test_str_op(self): expected_string_found = False s = str(self._def) @@ -1550,126 +1452,99 @@ class StructureFieldTestCase(_TestCopySimple, unittest.TestCase): self.assertTrue(expected_string_found) - def test_str_op_unset(self): - self.assertEqual(str(self._fc()), 'Unset') +class VariantFieldTestCase(unittest.TestCase): + def _create_fc(self, tc): + selector_fc = tc.create_signed_enumeration_field_class(field_value_range=32) + selector_fc.map_range('corner', 23) + selector_fc.map_range('zoom', 17, 20) + selector_fc.map_range('mellotron', 1001) + selector_fc.map_range('giorgio', 2000, 3000) + + ft0 = tc.create_signed_integer_field_class(32) + ft1 = tc.create_string_field_class() + ft2 = tc.create_real_field_class() + ft3 = tc.create_signed_integer_field_class(17) + + fc = tc.create_variant_field_class() + fc.append_option('corner', ft0) + fc.append_option('zoom', ft1) + fc.append_option('mellotron', ft2) + fc.append_option('giorgio', ft3) + fc.selector_field_class = selector_fc + + top_fc = tc.create_structure_field_class() + top_fc.append_member('selector_field', selector_fc) + top_fc.append_member('variant_field', fc) + return top_fc -@unittest.skip("this is broken") -class VariantFieldTestCase(_TestCopySimple, unittest.TestCase): def setUp(self): - self._tag_fc = bt2.EnumerationFieldClass(size=32) - self._tag_fc.add_mapping('corner', 23) - self._tag_fc.add_mapping('zoom', 17, 20) - self._tag_fc.add_mapping('mellotron', 1001) - self._tag_fc.add_mapping('giorgio', 2000, 3000) - self._fc0 = bt2.IntegerFieldClass(32, is_signed=True) - self._fc1 = bt2.StringFieldClass() - self._fc2 = bt2.FloatingPointNumberFieldClass() - self._fc3 = bt2.IntegerFieldClass(17) - self._fc = bt2.VariantFieldClass('salut', self._tag_fc) - self._fc.append_field('corner', self._fc0) - self._fc.append_field('zoom', self._fc1) - self._fc.append_field('mellotron', self._fc2) - self._fc.append_field('giorgio', self._fc3) - self._def = self._fc() - - def tearDown(self): - del self._tag_fc - del self._fc0 - del self._fc1 - del self._fc2 - del self._fc3 - del self._fc - del self._def + self._tc = get_default_trace_class() + fld = _create_field(self._tc, self._create_fc(self._tc)) + self._def = fld['variant_field'] - def test_bool_op_true(self): - tag_field = self._tag_fc(1001) - self._def.field(tag_field).value = -17.34 - self.assertTrue(self._def) + def test_bool_op(self): + self._def.selected_option_index = 2 + self._def.value = -17.34 + with self.assertRaises(NotImplementedError): + bool(self._def) - def test_bool_op_false(self): - self.assertFalse(self._def) + def test_selected_option_index(self): + self._def.selected_option_index = 2 + self.assertEqual(self._def.selected_option_index, 2) + + def test_selected_option(self): + self._def.selected_option_index = 2 + self._def.value = -17.34 + self.assertEqual(self._def.selected_option, -17.34) - def test_tag_field_none(self): - self.assertIsNone(self._def.tag_field) - - def test_tag_field(self): - tag_field = self._tag_fc(2800) - self._def.field(tag_field).value = 1847 - self.assertEqual(self._def.tag_field, tag_field) - self.assertEqual(self._def.tag_field.addr, tag_field.addr) - - def test_selected_field_none(self): - self.assertIsNone(self._def.selected_field) - - def test_selected_field(self): - var_field1 = self._fc() - tag_field1 = self._tag_fc(1001) - var_field1.field(tag_field1).value = -17.34 - self.assertEqual(var_field1.field(), -17.34) - self.assertEqual(var_field1.selected_field, -17.34) - var_field2 = self._fc() - tag_field2 = self._tag_fc(2500) - var_field2.field(tag_field2).value = 1921 - self.assertEqual(var_field2.field(), 1921) - self.assertEqual(var_field2.selected_field, 1921) + self._def.selected_option_index = 3 + self._def.value = 1921 + self.assertEqual(self._def.selected_option, 1921) def test_eq(self): - tag_fc = bt2.EnumerationFieldClass(size=32) - tag_fc.add_mapping('corner', 23) - tag_fc.add_mapping('zoom', 17, 20) - tag_fc.add_mapping('mellotron', 1001) - tag_fc.add_mapping('giorgio', 2000, 3000) - fc0 = bt2.IntegerFieldClass(32, is_signed=True) - fc1 = bt2.StringFieldClass() - fc2 = bt2.FloatingPointNumberFieldClass() - fc3 = bt2.IntegerFieldClass(17) - fc = bt2.VariantFieldClass('salut', tag_fc) - fc.append_field('corner', fc0) - fc.append_field('zoom', fc1) - fc.append_field('mellotron', fc2) - fc.append_field('giorgio', fc3) - field = fc() - field_tag = tag_fc(23) - def_tag = self._tag_fc(23) - field.field(field_tag).value = 1774 - self._def.field(def_tag).value = 1774 + field = _create_field(self._tc, self._create_fc(self._tc)) + field = field['variant_field'] + field.selected_option_index = 0 + field.value = 1774 + self._def.selected_option_index = 0 + self._def.value = 1774 self.assertEqual(self._def, field) def test_eq_invalid_type(self): + self._def.selected_option_index = 1 + self._def.value = 'gerry' self.assertNotEqual(self._def, 23) - def test_is_set(self): - self.assertFalse(self._def.is_set) - tag_field = self._tag_fc(2800) - self._def.field(tag_field).value = 684 - self.assertTrue(self._def.is_set) - - def test_reset(self): - tag_field = self._tag_fc(2800) - self._def.field(tag_field).value = 684 - self._def.reset() - self.assertFalse(self._def.is_set) - self.assertIsNone(self._def.selected_field) - self.assertIsNone(self._def.tag_field) - def test_str_op_int(self): - v = self._fc() - v.field(self._tag_fc(23)).value = 42 - f = self._fc0(42) - self.assertEqual(str(f), str(v)) + field = _create_field(self._tc, self._create_fc(self._tc)) + field = field['variant_field'] + field.selected_option_index = 0 + field.value = 1774 + other_field = _create_field(self._tc, self._create_fc(self._tc)) + other_field = other_field['variant_field'] + other_field.selected_option_index = 0 + other_field.value = 1774 + self.assertEqual(str(field), str(other_field)) def test_str_op_str(self): - v = self._fc() - v.field(self._tag_fc(18)).value = 'some test string' - f = self._fc1('some test string') - self.assertEqual(str(f), str(v)) - - def test_str_op_flt(self): - v = self._fc() - v.field(self._tag_fc(1001)).value = 14.4245 - f = self._fc2(14.4245) - self.assertEqual(str(f), str(v)) - - def test_str_op_unset(self): - self.assertEqual(str(self._fc()), 'Unset') + field = _create_field(self._tc, self._create_fc(self._tc)) + field = field['variant_field'] + field.selected_option_index = 1 + field.value = 'un beau grand bateau' + other_field = _create_field(self._tc, self._create_fc(self._tc)) + other_field = other_field['variant_field'] + other_field.selected_option_index = 1 + other_field.value = 'un beau grand bateau' + self.assertEqual(str(field), str(other_field)) + + def test_str_op_float(self): + field = _create_field(self._tc, self._create_fc(self._tc)) + field = field['variant_field'] + field.selected_option_index = 2 + field.value = 14.4245 + other_field = _create_field(self._tc, self._create_fc(self._tc)) + other_field = other_field['variant_field'] + other_field.selected_option_index = 2 + other_field.value = 14.4245 + self.assertEqual(str(field), str(other_field))