Revert "organise testcases"

This reverts commit 30d2369.

Author: prakashsellathurai

Lib/test/test_weakref.py

@@ -538,44 +538,83 @@ class MyObj:
         with self.assertRaises(TypeError):
             hash(weakref.proxy(obj))
 
-    def _assert_no_proxy_refcount_leak(self, make_class, do_op, op_name):
-        """Helper: verify a proxy operation doesn't leak."""
-        # Create dead proxy
-        o = make_class()
+    def test_proxy_unref_add_refcount(self):
+        class C:
+            def __add__(self, o):
+                return NotImplemented
+
+        # create dead proxy
+        o = C()
         dead = weakref.proxy(o)
         del o
         gc.collect()
-    
-        # Create live proxy
-        obj = make_class()
+
+        # create live proxy
+        obj = C()
         ref = weakref.ref(obj)
         proxy = weakref.proxy(obj)
-        
-        # run operation
+
         try:
-            do_op(proxy, dead)
+            operator.add(proxy, dead)
         except ReferenceError:
             pass
+
         del proxy, obj, dead
         gc.collect()
-    
-        # verify
-        self.assertIsNone(ref(), f"Leaked object in '{op_name}' operation")
-        
-    def test_proxy_unref_binary_refcount(self):
-        class C:
-            def __add__(self, o): return NotImplemented
-        self._assert_no_proxy_refcount_leak(C, operator.add, "Binary")
-    
-    def test_proxy_unref_ternary_refcount(self):
+
+        self.assertIsNone(ref(), "Leaked object in add operation")
+
+    def test_proxy_unref_pow_refcount(self):
         class C:
-            def __pow__(self, o, m=None): return NotImplemented
-        self._assert_no_proxy_refcount_leak(C, lambda p, d: pow(p, d, None), "Ternary")
-    
+            def __pow__(self, o, m=None):
+                return NotImplemented
+
+        # create dead proxy
+        o = C()
+        dead = weakref.proxy(o)
+        del o
+        gc.collect()
+
+        # create live proxy
+        obj = C()
+        ref = weakref.ref(obj)
+        proxy = weakref.proxy(obj)
+
+        try:
+            pow(proxy, dead, None)
+        except ReferenceError:
+            pass
+
+        del proxy, obj, dead
+        gc.collect()
+
+        self.assertIsNone(ref(), "Leaked object in pow operation")
+
     def test_proxy_unref_richcompare_refcount(self):
         class C:
-            def __eq__(self, o): return NotImplemented
-        self._assert_no_proxy_refcount_leak(C, lambda p, d: p == d, "Rich Compare")
+            def __eq__(self, o):
+                return NotImplemented
+
+        # create dead proxy
+        o = C()
+        dead = weakref.proxy(o)
+        del o
+        gc.collect()
+
+        # create live proxy
+        obj = C()
+        ref = weakref.ref(obj)
+        proxy = weakref.proxy(obj)
+
+        try:
+            proxy == dead
+        except ReferenceError:
+            pass
+
+        del proxy, obj, dead
+        gc.collect()
+
+        self.assertIsNone(ref(), "Leaked object in richcompare operation")
 
     def test_getweakrefcount(self):
         o = C()