From 5efe9f213563560d26bd34b6d9b3642642565b41 Mon Sep 17 00:00:00 2001 From: Ilya Etingof Date: Sun, 19 Nov 2017 16:41:26 +0100 Subject: Start `.prettyPrint` deprecation (#103) * __str__() of ASN.1 types reworked to serve instead of .prettyPrint() Related changes: `str()` on enumerations and boolean will return a string label rather than a number. --- tests/type/test_univ.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/type/test_univ.py b/tests/type/test_univ.py index a7183db..6819251 100644 --- a/tests/type/test_univ.py +++ b/tests/type/test_univ.py @@ -282,7 +282,8 @@ class IntegerTestCase(BaseTestCase): namedValues = univ.Integer.namedValues.clone(('asn1', 1)) assert Integer('asn1') == 1, 'named val fails' - assert str(Integer('asn1')) != 'asn1', 'named val __str__() fails' + assert int(Integer('asn1')) == 1, 'named val fails' + assert str(Integer('asn1')) == 'asn1', 'named val __str__() fails' def testSubtype(self): assert univ.Integer().subtype( @@ -323,7 +324,10 @@ class BooleanTestCase(BaseTestCase): assert not univ.Boolean(False) and not univ.Boolean(0), 'False initializer fails' def testStr(self): - assert str(univ.Boolean(1)) in ('1', '1L'), 'str() fails' + assert str(univ.Boolean(1)) == 'True', 'str() fails' + + def testInt(self): + assert int(univ.Boolean(1)) == 1, 'int() fails' def testRepr(self): assert 'Boolean' in repr(univ.Boolean(1)) -- cgit v1.2.1