[Python] More explicit identity comparisons in tests

bindings/distrdf/test/test_proxy.py

@@ -136,8 +136,8 @@ def test_node_attr_transformation(self):
         ]
 
         for attr in node_attributes:
-            self.assertEqual(getattr(proxy, attr),
-                             getattr(proxy.proxied_node, attr))
+            self.assertIs(getattr(proxy, attr),
+                          getattr(proxy.proxied_node, attr))
 
     def test_undefined_attr_transformation(self):
         """

bindings/pyroot/pythonizations/test/roofit.py

@@ -40,7 +40,7 @@
         a = ROOT.RooRealVar("a", "", 0)
         b = ROOT.RooRealVar("b", "", 0)
 
         l = collection_class(a, b)
 
         it = iter(l)
 
@@ -64,19 +64,30 @@
         self.assertTrue(var0 in coll)
         self.assertTrue("var0" in coll)
 
         self.assertTrue(not var1 in coll)
         self.assertTrue(not "var1" in coll)
 
         self.assertTrue(var2 in coll)
         self.assertTrue(not "var2" in coll)
 
         # ensure consistency with RooAbsCollection::find
         variables = [var0, var1, var2]
 
         for i, vptr in enumerate(variables):
             vname = "var" + str(i)
-            self.assertEqual(coll.find(vptr) == vptr, vptr in coll)
-            self.assertEqual(coll.find(vname) == vptr, vname in coll)
+
+            found_by_ptr = coll.find(vptr)
+            found_by_name = coll.find(vname)
+
+            # To ensure comparing objects of equal type also when it can't
+            # auto-downcast because the object was not found in the collection:
+            if found_by_ptr == ROOT.nullptr:
+                found_by_ptr = ROOT.BindObject(found_by_ptr, vptr.IsA().GetName())
+            if found_by_name == ROOT.nullptr:
+                found_by_name = ROOT.BindObject(found_by_name, vptr.IsA().GetName())
+
+            self.assertEqual(found_by_ptr == vptr, vptr in coll)
+            self.assertEqual(found_by_name == vptr, vname in coll)
 
     def _test_getitem(self, collection_class):
 
@@ -235,8 +246,8 @@
     def test_frame(self):
         # test that kwargs can be passed
         # and lead to correct result
         r1 = self.gauss.plotOn(self.xframe, ROOT.RooFit.LineColor(ROOT.kRed))
         r2 = self.gauss.plotOn(self.xframe, LineColor=ROOT.kRed)
 
     def test_wrong_kwargs(self):
         # test that AttributeError is raised
@@ -248,15 +259,15 @@
         # as doing the same plot with passed ROOT objects
         dtframe = self.x.frame(ROOT.RooFit.Range(-5, 5), ROOT.RooFit.Title("dt distribution with custom binning"))
         binning = ROOT.RooBinning(20, -5, 5)
         r1 = self.data.plotOn(dtframe, ROOT.RooFit.Binning(binning))
         r2 = self.data.plotOn(dtframe, Binning=binning)
 
     def test_data(self):
         # test that no error is causes if python style and cpp style
         # args are provided to plotOn and that results are identical
         frame = self.x.frame(ROOT.RooFit.Name("xframe"), ROOT.RooFit.Title("Red Curve"), ROOT.RooFit.Bins(20))
         res1_d1 = self.data.plotOn(frame, ROOT.RooFit.DataError(ROOT.RooAbsData.SumW2))
         res2_d1 = self.data.plotOn(frame, DataError=ROOT.RooAbsData.SumW2)
 
 
 class TestRooArgList(unittest.TestCase):

roottest/python/basic/PyROOT_datatypetest.py

@@ -599,16 +599,14 @@ def test10_global_ptr(self):
         d = gbl.get_global_pod()
         assert gbl.is_global_pod(d)
         assert c == d
-        # TODO: in PyROOT, non-TObjects are not mem-regulated
-        #assert id(c) == id(d)
+        assert c is d
 
         e = gbl.CppyyTestPod()
         e.m_int = 43
         e.m_double = 2.14
 
         gbl.g_pod = e
-        # TODO: in PyROOT, non-TObjects are not mem-regulated
-        #assert gbl.is_global_pod(e)
+        assert gbl.is_global_pod(e)
         assert gbl.g_pod.m_int == 43
         assert gbl.g_pod.m_double == 2.14
 
@@ -892,14 +890,10 @@ def address_equality_test(a, b):
             b2 = cppyy.bind_object(a, CppyyTestData)
             b.m_int = 888
             assert b.m_int == 888
-            assert b == b2 and b.m_int == b2.m_int
-            # TODO: in PyROOT, non-TObjects are not mem-regulated
-            #assert b is b2    # memory regulator recycles
+            assert b is b2 and b.m_int == b2.m_int
             b3 = cppyy.bind_object(cppyy.addressof(a), CppyyTestData)
             assert b3.m_int == 888
-            assert b == b3 and b.m_int == b3.m_int
-            # TODO: in PyROOT, non-TObjects are not mem-regulated
-            #assert b is b3    # likewise
+            assert b is b3 and b.m_int == b3.m_int
 
         address_equality_test(c.m_voidp, c2)
         address_equality_test(c.get_voidp(), c2)

roottest/python/cpp/PyROOT_cpptests.py

@@ -166,7 +166,7 @@ def test10StaticFunctionCall( self ):
 
       c2 = gROOT.Class()
 
-      self.assertEqual( c1, c2 )
+      self.assertIs( c1, c2 )
 
       old = gROOT.GetDirLevel()
       TROOT.SetDirLevel( 2 )

roottest/python/regression/PyROOT_regressiontests.py

@@ -524,7 +524,7 @@ def test1ReuseProxies(self):
       a2 = ROOT.A()
       a1.otherA = a2
       a3 = a1.otherA
-      self.assertEqual(a3, a2)
+      self.assertIs(a3, a2)
       val = 4
       a3.b = val
       self.assertEqual(a2.b, val)