refactor: don't require 'resource_manager' param for fill_with_random_values

Author: azmeuk

scim2_tester/checkers/resource_put.py

@@ -41,9 +41,7 @@ def object_replacement(
         in (Mutability.read_write, Mutability.write_only)
     ]
 
-    modified_obj = fill_with_random_values(
-        context, test_obj, context.resource_manager, mutable_fields
-    )
+    modified_obj = fill_with_random_values(context, test_obj, mutable_fields)
 
     if modified_obj is None:
         raise ValueError(

scim2_tester/filling.py

@@ -19,7 +19,7 @@
 from scim2_tester.utils import CheckContext
 
 if TYPE_CHECKING:
-    from scim2_tester.utils import ResourceManager
+    pass
 
 
 def model_from_ref_type(
@@ -47,7 +47,6 @@ def model_from_ref_type_(ref_type: type) -> Any:
 def generate_random_value(
     context: CheckContext,
     obj: Resource[Any],
-    resource_manager: "ResourceManager",
     field_name: str,
 ) -> Any:
     field_type = obj.get_field_root_type(field_name)
@@ -82,7 +81,7 @@ def generate_random_value(
         ref_type = get_args(field_type)[0]
         if ref_type not in (ExternalReference, URIReference):
             model = model_from_ref_type(context, ref_type, different_than=obj.__class__)
-            ref_obj = resource_manager.create_and_register(model)
+            ref_obj = context.resource_manager.create_and_register(model)
             value = ref_obj.meta.location
 
         else:
@@ -92,10 +91,10 @@ def generate_random_value(
         value = random.choice(list(field_type))
 
     elif isclass(field_type) and issubclass(field_type, ComplexAttribute):
-        value = fill_with_random_values(context, field_type(), resource_manager)
+        value = fill_with_random_values(context, field_type())
 
     elif isclass(field_type) and issubclass(field_type, Extension):
-        value = fill_with_random_values(context, field_type(), resource_manager)
+        value = fill_with_random_values(context, field_type())
 
     else:
         # Put emails so this will be accepted by EmailStr too
@@ -106,14 +105,12 @@ def generate_random_value(
 def fill_with_random_values(
     context: CheckContext,
     obj: Resource[Any],
-    resource_manager: "ResourceManager",
     field_names: list[str] | None = None,
 ) -> Resource[Any] | None:
     """Fill an object with random values generated according the attribute types.
 
     :param context: The check context containing the SCIM client and configuration
     :param obj: The Resource object to fill with random values
-    :param resource_manager: Resource manager for automatic cleanup
     :param field_names: Optional list of field names to fill (defaults to all)
     :returns: The filled object or None if the object ends up empty
     """
@@ -127,7 +124,7 @@ def fill_with_random_values(
         if field.default:
             continue
 
-        value = generate_random_value(context, obj, resource_manager, field_name)
+        value = generate_random_value(context, obj, field_name)
 
         is_multiple = obj.get_field_multiplicity(field_name)
         if is_multiple:

scim2_tester/utils.py

@@ -166,7 +166,7 @@ def create_and_register(self, model: type[Resource[Any]]) -> Resource[Any]:
             for field_name in model.model_fields
             if model.get_field_annotation(field_name, Required) == Required.true
         ]
-        obj = fill_with_random_values(self.context, model(), self, field_names)
+        obj = fill_with_random_values(self.context, model(), field_names)
         created = self.context.client.create(obj)
 
         # Handle the case where create might return Error or dict

tests/test_filling.py

@@ -31,7 +31,7 @@ def test_generate_random_value_bytes_field():
 
     cert = X509Certificate(value=base64.b64encode(b"placeholder"))
 
-    value = generate_random_value(context, cert, context.resource_manager, "value")
+    value = generate_random_value(context, cert, "value")
 
     assert isinstance(value, str)
     assert len(value) == 36  # UUID string length
@@ -61,7 +61,7 @@ def test_fill_with_empty_field_list():
     with patch(
         "scim2_tester.filling.generate_random_value", return_value="mock_value"
     ) as mock_generate:
-        result = fill_with_random_values(context, user, context.resource_manager, [])
+        result = fill_with_random_values(context, user, [])
         mock_generate.assert_not_called()
 
     assert result is user
@@ -78,9 +78,7 @@ def test_fill_with_nonexistent_field():
     with patch(
         "scim2_tester.filling.generate_random_value", return_value="mock_value"
     ) as mock_generate:
-        result = fill_with_random_values(
-            context, user, context.resource_manager, ["nonexistent_field"]
-        )
+        result = fill_with_random_values(context, user, ["nonexistent_field"])
         mock_generate.assert_not_called()
 
     assert result is user

tests/test_resource.py

@@ -58,9 +58,7 @@ class Type(str, Enum):
 def test_fill_with_random_values_generates_valid_data(testing_context):
     """Test that fill_with_random_values populates all fields with valid data."""
     obj = CustomModel()
-    obj = fill_with_random_values(
-        testing_context, obj, testing_context.resource_manager
-    )
+    obj = fill_with_random_values(testing_context, obj)
 
     assert obj is not None, (
         "fill_with_random_values should not return None for test object"