cleaner addressof() tests

wlav · Oct 17, 2017 · c373a99 · c373a99
1 parent f94b4df
commit c373a99
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/python/cppyy/_cpython_cppyy.py b/python/cppyy/_cpython_cppyy.py
@@ -9,7 +9,6 @@
     'load_reflection_info',
     'addressof',
     'bind_object',
-    'addressof',
     'nullptr',
     'move',
     '_backend',

diff --git a/test/test_advancedcpp.py b/test/test_advancedcpp.py
@@ -391,10 +391,10 @@ def test08_void_pointer_passing(self):
 
         import array
         addressofo = array.array('l', [cppyy.addressof(o)])
-        assert addressofo.buffer_info()[0] == pp.gime_address_ptr_ptr(addressofo)
+        assert addressofo[0] == pp.gime_address_ptr_ptr(addressofo)
 
         assert 0 == pp.gime_address_ptr(0)
-        assert 0 == pp.gime_address_ptr(None)
+        raises(TypeError, pp.gime_address_ptr, None)
 
         ptr = cppyy.bind_object(0, some_concrete_class)
         assert cppyy.addressof(ptr) == 0
@@ -403,6 +403,9 @@ def test08_void_pointer_passing(self):
         pp.set_address_ptr_ptr(ptr)
         assert cppyy.addressof(ptr) == 0x4321
 
+        assert cppyy.addressof(cppyy.nullptr) == 0
+        assert cppyy.addressof(None)          == 0
+
     def test09_opaque_pointer_passing(self):
         """Test passing around of opaque pointers"""