X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_value.py;h=82383762dbfda1a25726a0a43db93ef2a7d31216;hb=7e481c9efd8ae221418561c14867807c9e534747;hp=f1bd4949ef69bfcad945333dd58d664f9e4532ac;hpb=cfbd7cf3bde05e8a6606478889dcd663604ef7b5;p=babeltrace.git diff --git a/tests/bindings/python/bt2/test_value.py b/tests/bindings/python/bt2/test_value.py index f1bd4949..82383762 100644 --- a/tests/bindings/python/bt2/test_value.py +++ b/tests/bindings/python/bt2/test_value.py @@ -20,7 +20,6 @@ from functools import partial, partialmethod import operator import collections import unittest -import numbers import math import copy import bt2 @@ -213,19 +212,23 @@ class _TestNumericValue(_TestCopySimple): # `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') - - with self.assertRaises(TypeError): - op(self._def, object()) - - def _test_binop_invalid_none(self, op): - if op in _COMP_BINOPS: - self.skipTest('not testing') - - with self.assertRaises(TypeError): - op(self._def, None) + def _test_binop_unknown(self, op): + if op is operator.eq: + self.assertIs(op(self._def, object()), False) + elif op is operator.ne: + self.assertIs(op(self._def, object()), True) + else: + with self.assertRaises(TypeError): + op(self._def, object()) + + def _test_binop_none(self, op): + 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: + with self.assertRaises(TypeError): + op(self._def, None) def _test_binop_rhs_false(self, test_cb, op): test_cb(op, False) @@ -483,10 +486,14 @@ class _TestNumericValue(_TestCopySimple): self.assertEqual(str(self._def), str(self._def_value)) def test_eq_none(self): - self.assertFalse(self._def == None) + # Disable the "comparison to None" warning, as this is precisely what + # we want to test here. + self.assertFalse(self._def == None) # noqa: E711 def test_ne_none(self): - self.assertTrue(self._def != None) + # Disable the "comparison to None" warning, as this is precisely what + # we want to test here. + self.assertTrue(self._def != None) # noqa: E711 # This is a list of binary operators used for @@ -574,13 +581,13 @@ def _inject_numeric_testing_methods(cls): for name, binop in _BINOPS: setattr( cls, - test_binop_name('invalid_unknown'), - partialmethod(_TestNumericValue._test_binop_invalid_unknown, op=binop), + test_binop_name('unknown'), + partialmethod(_TestNumericValue._test_binop_unknown, op=binop), ) setattr( cls, - test_binop_name('invalid_none'), - partialmethod(_TestNumericValue._test_binop_invalid_none, op=binop), + test_binop_name('none'), + partialmethod(_TestNumericValue._test_binop_none, op=binop), ) setattr( cls, @@ -1083,8 +1090,22 @@ class CreateValueFuncTestCase(unittest.TestCase): with self.assertRaisesRegex( TypeError, "cannot create value object from 'A' object" - ) as cm: - v = bt2.create_value(a) + ): + bt2.create_value(a) + + +def _create_const_value(value): + class MySink(bt2._UserSinkComponent): + def _user_consume(self): + pass + + @classmethod + def _user_query(cls, priv_query_exec, obj, params, method_obj): + nonlocal value + return {'my_value': value} + + res = bt2.QueryExecutor(MySink, 'obj', None).query() + return res['my_value'] class BoolValueTestCase(_TestNumericValue, unittest.TestCase): @@ -1123,11 +1144,11 @@ class BoolValueTestCase(_TestNumericValue, unittest.TestCase): def test_create_from_int_non_zero(self): with self.assertRaises(TypeError): - b = bt2.BoolValue(23) + bt2.BoolValue(23) def test_create_from_int_zero(self): with self.assertRaises(TypeError): - b = bt2.BoolValue(0) + bt2.BoolValue(0) def test_assign_true(self): b = bt2.BoolValue() @@ -1161,10 +1182,14 @@ class BoolValueTestCase(_TestNumericValue, unittest.TestCase): self.assertEqual(str(self._def), str(self._def_value)) def test_eq_none(self): - self.assertFalse(self._def == None) + # Disable the "comparison to None" warning, as this is precisely what + # we want to test here. + self.assertFalse(self._def == None) # noqa: E711 def test_ne_none(self): - self.assertTrue(self._def != None) + # Disable the "comparison to None" warning, as this is precisely what + # we want to test here. + self.assertTrue(self._def != None) # noqa: E711 def test_vfalse_eq_false(self): self.assertEqual(self._f, False) @@ -1235,11 +1260,11 @@ class _TestIntegerValue(_TestNumericValue): pass with self._assert_expecting_int(): - i = self._CLS(A()) + self._CLS(A()) def test_create_from_varray(self): with self._assert_expecting_int(): - i = self._CLS(bt2.ArrayValue()) + self._CLS(bt2.ArrayValue()) def test_assign_true(self): raw = True @@ -1280,11 +1305,11 @@ class SignedIntegerValueTestCase(_TestIntegerValue, unittest.TestCase): def test_create_pos_too_big(self): with self._assert_expecting_int64(): - i = self._CLS(2 ** 63) + self._CLS(2 ** 63) def test_create_neg_too_big(self): with self._assert_expecting_int64(): - i = self._CLS(-(2 ** 63) - 1) + self._CLS(-(2 ** 63) - 1) def test_assign_neg_int(self): raw = -13 @@ -1307,11 +1332,11 @@ class UnsignedIntegerValueTestCase(_TestIntegerValue, unittest.TestCase): def test_create_pos_too_big(self): with self._assert_expecting_uint64(): - i = self._CLS(2 ** 64) + self._CLS(2 ** 64) def test_create_neg(self): with self._assert_expecting_uint64(): - i = self._CLS(-1) + self._CLS(-1) _inject_numeric_testing_methods(UnsignedIntegerValueTestCase) @@ -1350,10 +1375,6 @@ class RealValueTestCase(_TestNumericValue, unittest.TestCase): def test_create_neg(self): self.assertEqual(self._fn, self._nv) - def test_create_from_vint(self): - f = bt2.RealValue(self._fp) - self.assertEqual(f, self._pv) - def test_create_from_false(self): f = bt2.RealValue(False) self.assertFalse(f) @@ -1382,11 +1403,11 @@ class RealValueTestCase(_TestNumericValue, unittest.TestCase): pass with self._assert_expecting_float(): - f = bt2.RealValue(A()) + bt2.RealValue(A()) def test_create_from_varray(self): with self._assert_expecting_float(): - f = bt2.RealValue(bt2.ArrayValue()) + bt2.RealValue(bt2.ArrayValue()) def test_assign_true(self): self._def.value = True @@ -1447,6 +1468,7 @@ class StringValueTestCase(_TestCopySimple, unittest.TestCase): def setUp(self): self._def_value = 'Hello, World!' self._def = bt2.StringValue(self._def_value) + self._def_const = _create_const_value(self._def_value) self._def_new_value = 'Yes!' def tearDown(self): @@ -1474,11 +1496,11 @@ class StringValueTestCase(_TestCopySimple, unittest.TestCase): pass with self._assert_expecting_str(): - i = bt2.StringValue(A()) + bt2.StringValue(A()) def test_create_from_varray(self): with self._assert_expecting_str(): - i = bt2.StringValue(bt2.ArrayValue()) + bt2.StringValue(bt2.ArrayValue()) def test_assign_int(self): with self._assert_expecting_str(): @@ -1497,7 +1519,10 @@ class StringValueTestCase(_TestCopySimple, unittest.TestCase): def test_eq(self): self.assertEqual(self._def, self._def_value) - def test_eq(self): + def test_const_eq(self): + self.assertEqual(self._def_const, self._def_value) + + def test_eq_raw(self): self.assertNotEqual(self._def, 23) def test_lt_vstring(self): @@ -1536,6 +1561,15 @@ class StringValueTestCase(_TestCopySimple, unittest.TestCase): s1 = bt2.StringValue('allo') self.assertGreaterEqual('bateau', s1) + def test_in_string(self): + s1 = bt2.StringValue('beau grand bateau') + self.assertIn('bateau', s1) + + def test_in_vstring(self): + s1 = bt2.StringValue('beau grand bateau') + s2 = bt2.StringValue('bateau') + self.assertIn(s2, s1) + def test_bool_op(self): self.assertEqual(bool(self._def), bool(self._def_value)) @@ -1548,12 +1582,22 @@ class StringValueTestCase(_TestCopySimple, unittest.TestCase): def test_getitem(self): self.assertEqual(self._def[5], self._def_value[5]) - def test_append_str(self): + def test_const_getitem(self): + self.assertEqual(self._def_const[5], self._def_value[5]) + + def test_iadd_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_iadd_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_vstr(self): to_append = 'meow meow meow' self._def += bt2.create_value(to_append) @@ -1565,6 +1609,7 @@ class ArrayValueTestCase(_TestCopySimple, unittest.TestCase): def setUp(self): self._def_value = [None, False, True, -23, 0, 42, -42.4, 23.17, 'yes'] self._def = bt2.ArrayValue(copy.deepcopy(self._def_value)) + self._def_const = _create_const_value(copy.deepcopy(self._def_value)) def tearDown(self): del self._def @@ -1597,7 +1642,7 @@ class ArrayValueTestCase(_TestCopySimple, unittest.TestCase): pass with self._assert_type_error(): - a = bt2.ArrayValue(A()) + bt2.ArrayValue(A()) def test_bool_op_true(self): self.assertTrue(bool(self._def)) @@ -1611,9 +1656,16 @@ class ArrayValueTestCase(_TestCopySimple, unittest.TestCase): def test_eq_int(self): self.assertNotEqual(self._def, 23) + def test_const_eq(self): + a1 = _create_const_value([1, 2, 3]) + a2 = [1, 2, 3] + self.assertEqual(a1, a2) + def test_eq_diff_len(self): a1 = bt2.create_value([1, 2, 3]) a2 = bt2.create_value([1, 2]) + self.assertIs(type(a1), bt2.ArrayValue) + self.assertIs(type(a2), bt2.ArrayValue) self.assertNotEqual(a1, a2) def test_eq_diff_content_same_len(self): @@ -1659,6 +1711,10 @@ class ArrayValueTestCase(_TestCopySimple, unittest.TestCase): with self.assertRaises(IndexError): self._def[len(self._def)] = 23 + def test_const_setitem(self): + with self.assertRaises(TypeError): + self._def_const[2] = 19 + def test_append_none(self): self._def.append(None) self.assertIsNone(self._def[len(self._def) - 1]) @@ -1668,6 +1724,10 @@ class ArrayValueTestCase(_TestCopySimple, unittest.TestCase): self._def.append(raw) self.assertEqual(self._def[len(self._def) - 1], raw) + def test_const_append(self): + with self.assertRaises(AttributeError): + self._def_const.append(12194) + def test_append_vint(self): raw = 145 self._def.append(bt2.create_value(raw)) @@ -1687,6 +1747,10 @@ class ArrayValueTestCase(_TestCopySimple, unittest.TestCase): self.assertEqual(self._def[len(self._def) - 2], raw[1]) self.assertEqual(self._def[len(self._def) - 1], raw[2]) + def test_const_iadd(self): + with self.assertRaises(TypeError): + self._def_const += 12194 + def test_iadd_unknown(self): class A: pass @@ -1705,6 +1769,31 @@ class ArrayValueTestCase(_TestCopySimple, unittest.TestCase): for velem, elem in zip(self._def, self._def_value): self.assertEqual(velem, elem) + def test_const_iter(self): + for velem, elem in zip(self._def_const, self._def_value): + self.assertEqual(velem, elem) + + def test_const_get_item(self): + item1 = self._def_const[0] + item2 = self._def_const[2] + item3 = self._def_const[5] + item4 = self._def_const[7] + item5 = self._def_const[8] + + self.assertEqual(item1, None) + + self.assertIs(type(item2), bt2._BoolValueConst) + self.assertEqual(item2, True) + + self.assertIs(type(item3), bt2._SignedIntegerValueConst) + self.assertEqual(item3, 42) + + self.assertIs(type(item4), bt2._RealValueConst) + self.assertEqual(item4, 23.17) + + self.assertIs(type(item5), bt2._StringValueConst) + self.assertEqual(item5, 'yes') + class MapValueTestCase(_TestCopySimple, unittest.TestCase): def setUp(self): @@ -1720,6 +1809,7 @@ class MapValueTestCase(_TestCopySimple, unittest.TestCase): 'str': 'yes', } self._def = bt2.MapValue(copy.deepcopy(self._def_value)) + self._def_const = _create_const_value(self._def_value) def tearDown(self): del self._def @@ -1744,7 +1834,7 @@ class MapValueTestCase(_TestCopySimple, unittest.TestCase): pass with self.assertRaises(AttributeError): - m = bt2.MapValue(A()) + bt2.MapValue(A()) def test_bool_op_true(self): self.assertTrue(bool(self._def)) @@ -1755,6 +1845,11 @@ class MapValueTestCase(_TestCopySimple, unittest.TestCase): def test_len(self): self.assertEqual(len(self._def), len(self._def_value)) + def test_const_eq(self): + a1 = _create_const_value({'a': 1, 'b': 2, 'c': 3}) + a2 = {'a': 1, 'b': 2, 'c': 3} + self.assertEqual(a1, a2) + def test_eq_int(self): self.assertNotEqual(self._def, 23) @@ -1763,16 +1858,31 @@ class MapValueTestCase(_TestCopySimple, unittest.TestCase): a2 = bt2.create_value({'a': 1, 'b': 2}) self.assertNotEqual(a1, a2) + def test_const_eq_diff_len(self): + a1 = _create_const_value({'a': 1, 'b': 2, 'c': 3}) + a2 = _create_const_value({'a': 1, 'b': 2}) + self.assertNotEqual(a1, a2) + def test_eq_diff_content_same_len(self): a1 = bt2.create_value({'a': 1, 'b': 2, 'c': 3}) a2 = bt2.create_value({'a': 4, 'b': 2, 'c': 3}) self.assertNotEqual(a1, a2) + def test_const_eq_diff_content_same_len(self): + a1 = _create_const_value({'a': 1, 'b': 2, 'c': 3}) + a2 = _create_const_value({'a': 4, 'b': 2, 'c': 3}) + self.assertNotEqual(a1, a2) + def test_eq_same_content_diff_keys(self): a1 = bt2.create_value({'a': 1, 'b': 2, 'c': 3}) a2 = bt2.create_value({'a': 1, 'k': 2, 'c': 3}) self.assertNotEqual(a1, a2) + def test_const_eq_same_content_diff_keys(self): + a1 = _create_const_value({'a': 1, 'b': 2, 'c': 3}) + a2 = _create_const_value({'a': 1, 'k': 2, 'c': 3}) + self.assertNotEqual(a1, a2) + def test_eq_same_content_same_len(self): raw = {'3': 3, 'True': True, 'array': [1, 2.5, None, {'a': 17.6, 'b': None}]} a1 = bt2.MapValue(raw) @@ -1780,11 +1890,22 @@ class MapValueTestCase(_TestCopySimple, unittest.TestCase): self.assertEqual(a1, a2) self.assertEqual(a1, raw) + def test_const_eq_same_content_same_len(self): + raw = {'3': 3, 'True': True, 'array': [1, 2.5, None, {'a': 17.6, 'b': None}]} + a1 = _create_const_value(raw) + a2 = _create_const_value(copy.deepcopy(raw)) + self.assertEqual(a1, a2) + self.assertEqual(a1, raw) + def test_setitem_int(self): raw = 19 self._def['pos-int'] = raw self.assertEqual(self._def['pos-int'], raw) + def test_const_setitem_int(self): + with self.assertRaises(TypeError): + self._def_const['pos-int'] = 19 + def test_setitem_vint(self): raw = 19 self._def['pos-int'] = bt2.create_value(raw) @@ -1809,6 +1930,41 @@ class MapValueTestCase(_TestCopySimple, unittest.TestCase): val = self._def_value[vkey] self.assertEqual(vval, val) + def test_const_iter(self): + for vkey, vval in self._def_const.items(): + val = self._def_value[vkey] + self.assertEqual(vval, val) + + def test_get_item(self): + i = self._def['pos-float'] + self.assertIs(type(i), bt2.RealValue) + self.assertEqual(i, 23.17) + + def test_const_get_item(self): + item1 = self._def_const['none'] + item2 = self._def_const['true'] + item3 = self._def_const['pos-int'] + item4 = self._def_const['pos-float'] + item5 = self._def_const['str'] + + self.assertEqual(item1, None) + + self.assertIs(type(item2), bt2._BoolValueConst) + self.assertEqual(item2, True) + + self.assertIs(type(item3), bt2._SignedIntegerValueConst) + self.assertEqual(item3, 42) + + self.assertIs(type(item4), bt2._RealValueConst) + self.assertEqual(item4, 23.17) + + self.assertIs(type(item5), bt2._StringValueConst) + self.assertEqual(item5, 'yes') + def test_getitem_wrong_key(self): with self.assertRaises(KeyError): self._def['kilojoule'] + + +if __name__ == '__main__': + unittest.main()