update one_of/random_order tests

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

Author: wyli

tests/test_one_of.py

@@ -27,7 +27,6 @@
     RandShiftIntensityd,
     Resize,
     Resized,
-    TraceableTransform,
     Transform,
 )
 from monai.transforms.compose import Compose
@@ -113,9 +112,9 @@ def __init__(self, keys):
 KEYS = ["x", "y"]
 TEST_INVERSES = [
     (OneOf((InvA(KEYS), InvB(KEYS))), True, True),
-    (OneOf((OneOf((InvA(KEYS), InvB(KEYS))), OneOf((InvB(KEYS), InvA(KEYS))))), True, True),
-    (OneOf((Compose((InvA(KEYS), InvB(KEYS))), Compose((InvB(KEYS), InvA(KEYS))))), True, True),
-    (OneOf((NonInv(KEYS), NonInv(KEYS))), False, True),
+    (OneOf((OneOf((InvA(KEYS), InvB(KEYS))), OneOf((InvB(KEYS), InvA(KEYS))))), True, False),
+    (OneOf((Compose((InvA(KEYS), InvB(KEYS))), Compose((InvB(KEYS), InvA(KEYS))))), True, False),
+    (OneOf((NonInv(KEYS), NonInv(KEYS))), False, False),
 ]
 
 
@@ -161,11 +160,7 @@ def test_inverse(self, transform, invertible, use_metatensor):
 
         if invertible:
             for k in KEYS:
-                t = (
-                    fwd_data[TraceableTransform.trace_key(k)][-1]
-                    if not use_metatensor
-                    else fwd_data[k].applied_operations[-1]
-                )
+                t = fwd_data[k].applied_operations[-1]
                 # make sure the OneOf index was stored
                 self.assertEqual(t[TraceKeys.CLASS_NAME], OneOf.__name__)
                 # make sure index exists and is in bounds
@@ -176,12 +171,6 @@ def test_inverse(self, transform, invertible, use_metatensor):
 
         if invertible:
             for k in KEYS:
-                # check transform was removed
-                if not use_metatensor:
-                    self.assertTrue(
-                        len(fwd_inv_data[TraceableTransform.trace_key(k)])
-                        < len(fwd_data[TraceableTransform.trace_key(k)])
-                    )
                 # check data is same as original (and different from forward)
                 self.assertEqual(fwd_inv_data[k], data[k])
                 self.assertNotEqual(fwd_inv_data[k], fwd_data[k])

tests/test_random_order.py

@@ -16,7 +16,7 @@
 from parameterized import parameterized
 
 from monai.data import MetaTensor
-from monai.transforms import RandomOrder, TraceableTransform
+from monai.transforms import RandomOrder
 from monai.transforms.compose import Compose
 from monai.utils import set_determinism
 from monai.utils.enums import TraceKeys
@@ -41,10 +41,10 @@ def __init__(self, keys):
 KEYS = ["x", "y"]
 TEST_INVERSES = [
     (RandomOrder((InvC(KEYS), InvD(KEYS))), True, True),
-    (Compose((RandomOrder((InvC(KEYS), InvD(KEYS))), RandomOrder((InvD(KEYS), InvC(KEYS))))), True, True),
-    (RandomOrder((RandomOrder((InvC(KEYS), InvD(KEYS))), RandomOrder((InvD(KEYS), InvC(KEYS))))), True, True),
-    (RandomOrder((Compose((InvC(KEYS), InvD(KEYS))), Compose((InvD(KEYS), InvC(KEYS))))), True, True),
-    (RandomOrder((NonInv(KEYS), NonInv(KEYS))), False, True),
+    (Compose((RandomOrder((InvC(KEYS), InvD(KEYS))), RandomOrder((InvD(KEYS), InvC(KEYS))))), True, False),
+    (RandomOrder((RandomOrder((InvC(KEYS), InvD(KEYS))), RandomOrder((InvD(KEYS), InvC(KEYS))))), True, False),
+    (RandomOrder((Compose((InvC(KEYS), InvD(KEYS))), Compose((InvD(KEYS), InvC(KEYS))))), True, False),
+    (RandomOrder((NonInv(KEYS), NonInv(KEYS))), False, False),
 ]
 
 
@@ -77,11 +77,7 @@ def test_inverse(self, transform, invertible, use_metatensor):
 
         if invertible:
             for k in KEYS:
-                t = (
-                    fwd_data1[TraceableTransform.trace_key(k)][-1]
-                    if not use_metatensor
-                    else fwd_data1[k].applied_operations[-1]
-                )
+                t = fwd_data1[k].applied_operations[-1]
                 # make sure the RandomOrder applied_order was stored
                 self.assertEqual(t[TraceKeys.CLASS_NAME], RandomOrder.__name__)
 
@@ -94,12 +90,6 @@ def test_inverse(self, transform, invertible, use_metatensor):
         for i, _fwd_inv_data in enumerate(fwd_inv_data):
             if invertible:
                 for k in KEYS:
-                    # check transform was removed
-                    if not use_metatensor:
-                        self.assertTrue(
-                            len(_fwd_inv_data[TraceableTransform.trace_key(k)])
-                            < len(fwd_data[i][TraceableTransform.trace_key(k)])
-                        )
                     # check data is same as original (and different from forward)
                     self.assertEqual(_fwd_inv_data[k], data[k])
                     self.assertNotEqual(_fwd_inv_data[k], fwd_data[i][k])