Tests and minor bug fixes for resolve_target.

Author: ntoll

config.json

@@ -5,6 +5,9 @@
         "./tests/__init__.py": "tests/__init__.py",
         "./tests/test_asyncmock.py": "tests/test_asyncmock.py",
         "./tests/test_mock.py": "tests/test_mock.py",
-        "./tests/test_patch.py": "tests/test_patch.py"
+        "./tests/test_patch.py": "tests/test_patch.py",
+        "./tests/test_resolve_target.py": "tests/test_resolve_target.py",
+        "./tests/a_package/__init__.py": "tests/a_package/__init__.py",
+        "./tests/a_package/a_module.py": "tests/a_package/a_module.py"    
     }
 }

tests/a_package/__init__.py

@@ -0,0 +1,28 @@
+"""
+A dummy module for testing purposes.
+"""
+
+import random
+
+
+class AClass:
+    """
+    A dummy class for testing.
+    """
+
+    def __init__(self, a: int):
+        self.a = a
+
+    def a_method(self, b):
+        return self.a + b
+
+    def __repr__(self):
+        return f"AClass(a={self.a})"
+
+
+def a_function(a, b):
+    return a + b
+
+
+def another_function(a, b):
+    return random.randint(a, b)

tests/a_package/a_module.py

@@ -2,9 +2,11 @@
 Tests the patch decorator/context manager.
 """
 
+import upytest
 from umock import patch
 
 
+@upytest.skip("upytest does not support patching yet")
 def test_patch_decorator():
     """
     Tests the patch decorator.

tests/test_patch.py

@@ -0,0 +1,48 @@
+"""
+Tests for the resolve_target function used to return a target Python object
+from a target string.
+"""
+
+import upytest
+from umock import resolve_target
+
+
+def test_resolve_target_no_colon():
+    """
+    The target path is a dotted string without a colon pointing to a specific
+    object in the module.
+    """
+    target = "tests.a_package.a_module.AClass"
+    expected = "AClass"
+    actual = resolve_target(target)
+    assert actual.__name__ == expected
+
+
+def test_resolve_target_with_colon():
+    """
+    The target path is a dotted string with a colon pointing to a specific
+    object in the module.
+    """
+    target = "tests.a_package.a_module:AClass.a_method"
+    expected = "a_method"
+    actual = resolve_target(target)
+    assert actual.__name__ == expected
+
+
+def test_resolve_target_with_object():
+    """
+    If the target is already an object, return it as is.
+    """
+    target = "tests.a_package.a_module.AClass"
+    expected = resolve_target(target)
+    actual = resolve_target(expected)
+    assert actual is expected
+
+
+def test_resolve_target_invalid_target():
+    """
+    If the target path points to an invalid object, raise an AttributeError.
+    """
+    target = "tests.a_package.a_module:AClass.not_a_method"
+    with upytest.raises(AttributeError):
+        resolve_target(target)

tests/test_resolve_target.py

@@ -358,15 +358,15 @@ def resolve_target(target):
     "Inspired by" pkgutil.resolve_name in the CPython standard library (but
     much simpler/naive).
 
-    Will raise an ImportError if the target module cannot be resolved or an
-    AttributeError if the attribute cannot be found.
+    Will raise an AttributeError if the target object cannot be resolved.
     """
     if not isinstance(target, str):
         return target
     if ":" in target:
         # There is a colon - a one-step import is all that's needed.
         module_name, attributes = target.split(":")
-        module = __import__(module_name)
+        module_path = module_name.replace(".", "/")
+        module = __import__(module_path)
         parts = attributes.split(".")
     else:
         # No colon - have to iterate to find the package boundary.
@@ -377,7 +377,7 @@ def resolve_target(target):
         while parts:
             # Traverse the parts of the target to find the package boundary.
             p = parts[0]
-            new_module_name = f"{module_name}.{p}"
+            new_module_name = f"{module_name}/{p}"
             try:
                 module = __import__(new_module_name)
                 parts.pop(0)