X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_field.py;h=6815715e8e8184e3d690fd940c5ce5cb93927632;hp=2f855e8bf44484ec5ee5b158615f862bae995c18;hb=768f9bcbf4b5acd09dda85ab32c0ea30d8826136;hpb=fe4df857056b4a03898f1031f136359ce733b0f5 diff --git a/tests/bindings/python/bt2/test_field.py b/tests/bindings/python/bt2/test_field.py index 2f855e8b..6815715e 100644 --- a/tests/bindings/python/bt2/test_field.py +++ b/tests/bindings/python/bt2/test_field.py @@ -1,20 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # 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 @@ -24,7 +11,7 @@ import copy import itertools import collections import bt2 -from utils import get_default_trace_class, TestOutputPortMessageIterator +from utils import get_default_trace_class, create_const_field _COMP_BINOPS = (operator.eq, operator.ne) @@ -63,50 +50,6 @@ 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 @@ -367,9 +310,8 @@ class _TestNumericField: # 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) + value_before = copy.copy(self._def_value) r, rv = self._binop(op, rhs) self.assertEqual(self._def, value_before) @@ -388,22 +330,31 @@ class _TestNumericField: # `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') - + def _test_binop_unknown(self, op): class A: pass - with self.assertRaises(TypeError): - op(self._def, A()) - - def _test_binop_invalid_none(self, op): - if op in _COMP_BINOPS: - self.skipTest('not testing') - - with self.assertRaises(TypeError): - op(self._def, None) + # Operators == and != are defined when comparing the field to an + # arbitrary object. + if op is operator.eq: + self.assertIs(op(self._def, A()), False) + elif op is operator.ne: + self.assertIs(op(self._def, A()), True) + else: + # But not other operators. + with self.assertRaises(TypeError): + op(self._def, A()) + + def _test_binop_none(self, op): + # Operators == and != are defined when comparing the field to None. + if op is operator.eq: + self.assertIs(op(self._def, None), False) + elif op is operator.ne: + self.assertIs(op(self._def, None), True) + else: + # But not other operators. + with self.assertRaises(TypeError): + op(self._def, None) def _test_binop_rhs_false(self, test_cb, op): test_cb(op, False) @@ -770,13 +721,13 @@ def _inject_numeric_testing_methods(cls): for name, binop in _BINOPS: setattr( cls, - test_binop_name('invalid_unknown'), - partialmethod(_TestNumericField._test_binop_invalid_unknown, op=binop), + test_binop_name('unknown'), + partialmethod(_TestNumericField._test_binop_unknown, op=binop), ) setattr( cls, - test_binop_name('invalid_none'), - partialmethod(_TestNumericField._test_binop_invalid_none, op=binop), + test_binop_name('none'), + partialmethod(_TestNumericField._test_binop_none, op=binop), ) setattr( cls, @@ -1192,7 +1143,7 @@ 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._def_const = create_const_field( self._tc, self._tc.create_bool_field_class(), self._const_value_setter ) self._def_new_value = False @@ -1280,8 +1231,8 @@ class _TestIntegerFieldCommon(_TestNumericField): 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 + raw = (2**53) + 1 + field.value = (2**53) + 1 self.assertEqual(field, raw) def test_assign_uint_out_of_range(self): @@ -1336,7 +1287,7 @@ 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._def_const = create_const_field( self._tc, self._create_fc(self._tc), self._const_value_setter ) self._def_new_value = -101 @@ -1353,7 +1304,7 @@ class SignedEnumerationFieldTestCase(_TestIntegerFieldCommon, unittest.TestCase) fc.add_mapping('speaker', bt2.SignedIntegerRangeSet([(12, 16)])) fc.add_mapping('can', bt2.SignedIntegerRangeSet([(18, 2540)])) fc.add_mapping( - 'whole range', bt2.SignedIntegerRangeSet([(-(2 ** 31), (2 ** 31) - 1)]) + 'whole range', bt2.SignedIntegerRangeSet([(-(2**31), (2**31) - 1)]) ) fc.add_mapping('zip', bt2.SignedIntegerRangeSet([(-45, 1001)])) return fc @@ -1364,7 +1315,7 @@ 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._def_const = create_const_field( self._tc, self._create_fc(self._tc), self._const_value_setter ) self._def_new_value = -101 @@ -1402,7 +1353,7 @@ class SingleRealFieldTestCase(_TestNumericField, unittest.TestCase): 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._def_const = create_const_field( self._tc, self._tc.create_single_precision_real_field_class(), self._const_value_setter, @@ -1498,7 +1449,7 @@ class DoubleRealFieldTestCase(_TestNumericField, unittest.TestCase): 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._def_const = create_const_field( self._tc, self._tc.create_double_precision_real_field_class(), self._const_value_setter, @@ -1587,7 +1538,7 @@ class StringFieldTestCase(unittest.TestCase): 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._def_const = create_const_field( self._tc, self._tc.create_string_field_class(), self._const_value_setter ) self._def.value = self._def_value @@ -1863,7 +1814,7 @@ 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._def_const = create_const_field( self._tc, self._tc.create_static_array_field_class( self._tc.create_signed_integer_field_class(32), 3 @@ -1889,7 +1840,7 @@ 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._def_const = create_const_field( self._tc, self._tc.create_dynamic_array_field_class( self._tc.create_signed_integer_field_class(32) @@ -1968,7 +1919,7 @@ class StructureFieldTestCase(unittest.TestCase): 'F': {'F_1': 52}, } - self._def_const = _create_const_field( + self._def_const = create_const_field( self._tc, self._create_fc(self._tc), self._const_value_setter ) @@ -2234,7 +2185,9 @@ class OptionFieldTestCase(unittest.TestCase): field.value = {'opt_field': 'hiboux'} def _create_fc(self, tc): - fc = tc.create_option_field_class(tc.create_string_field_class()) + fc = tc.create_option_without_selector_field_class( + tc.create_string_field_class() + ) top_fc = tc.create_structure_field_class() top_fc.append_member('opt_field', fc) return top_fc @@ -2244,7 +2197,7 @@ class OptionFieldTestCase(unittest.TestCase): 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._def_const = create_const_field( self._tc, self._create_fc(self._tc), self._const_value_setter )['opt_field'] @@ -2358,7 +2311,7 @@ class VariantFieldTestCase(unittest.TestCase): self._def_selected_index = 3 const_fc = self._create_fc(self._tc)['variant_field'] - fld_const = _create_const_field( + fld_const = create_const_field( self._tc, const_fc.field_class, self._const_value_setter ) self._def_const = fld_const