diff --git a/testdata/python/basic.py b/testdata/python/basic.py index 5ca61802d..1af2b4055 100644 --- a/testdata/python/basic.py +++ b/testdata/python/basic.py @@ -2813,21 +2813,32 @@ class BasicTest(unittest.TestCase): # binary strings - qba = pya.A.ia_cref_to_qba([ 17, 42, 0, 8 ]) - self.assertEqual(repr(qba), "b'\\x11*\\x00\\x08'") - self.assertEqual(pya.A.qba_to_ia(qba), [ 17, 42, 0, 8 ]) - self.assertEqual(pya.A.qba_cref_to_ia(qba), [ 17, 42, 0, 8 ]) - self.assertEqual(pya.A.qba_cptr_to_ia(qba), [ 17, 42, 0, 8 ]) - self.assertEqual(pya.A.qba_ref_to_ia(qba), [ 17, 42, 0, 8 ]) - self.assertEqual(pya.A.qba_ptr_to_ia(qba), [ 17, 42, 0, 8 ]) + if "ia_cref_to_qba" in pya.A.__dict__: - qba = pya.A.ia_cref_to_qba_cref([ 17, 42, 0, 8 ]) - self.assertEqual(repr(qba), "b'\\x11*\\x00\\x08'") + qba = pya.A.ia_cref_to_qba([ 17, 42, 0, 8 ]) + if sys.version_info < (3, 0): + self.assertEqual(repr(qba), "bytearray(b'\\x11*\\x00\\x08')") + else: + self.assertEqual(repr(qba), "b'\\x11*\\x00\\x08'") + self.assertEqual(pya.A.qba_to_ia(qba), [ 17, 42, 0, 8 ]) + self.assertEqual(pya.A.qba_cref_to_ia(qba), [ 17, 42, 0, 8 ]) + self.assertEqual(pya.A.qba_cptr_to_ia(qba), [ 17, 42, 0, 8 ]) + self.assertEqual(pya.A.qba_ref_to_ia(qba), [ 17, 42, 0, 8 ]) + self.assertEqual(pya.A.qba_ptr_to_ia(qba), [ 17, 42, 0, 8 ]) + + qba = pya.A.ia_cref_to_qba_cref([ 17, 42, 0, 8 ]) + if sys.version_info < (3, 0): + self.assertEqual(repr(qba), "bytearray(b'\\x11*\\x00\\x08')") + else: + self.assertEqual(repr(qba), "b'\\x11*\\x00\\x08'") - self.assertEqual(pya.A.qba_to_ia(b'\x00\x01\x02'), [ 0, 1, 2 ]) + self.assertEqual(pya.A.qba_to_ia(b'\x00\x01\x02'), [ 0, 1, 2 ]) ba = pya.A.ia_cref_to_ba([ 17, 42, 0, 8 ]) - self.assertEqual(repr(ba), "b'\\x11*\\x00\\x08'") + if sys.version_info < (3, 0): + self.assertEqual(repr(ba), "bytearray(b'\\x11*\\x00\\x08')") + else: + self.assertEqual(repr(ba), "b'\\x11*\\x00\\x08'") self.assertEqual(pya.A.ba_to_ia(ba), [ 17, 42, 0, 8 ]) self.assertEqual(pya.A.ba_cref_to_ia(ba), [ 17, 42, 0, 8 ]) self.assertEqual(pya.A.ba_cptr_to_ia(ba), [ 17, 42, 0, 8 ]) @@ -2835,7 +2846,10 @@ class BasicTest(unittest.TestCase): self.assertEqual(pya.A.ba_ptr_to_ia(ba), [ 17, 42, 0, 8 ]) ba = pya.A.ia_cref_to_ba_cref([ 17, 42, 0, 8 ]) - self.assertEqual(repr(ba), "b'\\x11*\\x00\\x08'") + if sys.version_info < (3, 0): + self.assertEqual(repr(ba), "bytearray(b'\\x11*\\x00\\x08')") + else: + self.assertEqual(repr(ba), "b'\\x11*\\x00\\x08'") self.assertEqual(pya.A.ba_to_ia(b'\x00\x01\x02'), [ 0, 1, 2 ]) diff --git a/testdata/ruby/basic_testcore.rb b/testdata/ruby/basic_testcore.rb index 0e75d0322..a4d0c8c16 100644 --- a/testdata/ruby/basic_testcore.rb +++ b/testdata/ruby/basic_testcore.rb @@ -1375,6 +1375,7 @@ class Basic_TestClass < TestBase # makes sure the objects inside the block before are deleted GC.start + GC.start # 2.0.0 needs a second one assert_equal(RBA::A.instance_count, ic0) assert_equal(RBA::A.a20_get == nil, true)