Fix tests

.github/workflows/publish-to-pypi.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.6'
+          python-version: '3.8'
 
       - name: Install dependencies
         run: |

setup.py

@@ -6,7 +6,7 @@ def read_requirements(file):
 
 setup(
     name="simple_dependency_injector",
-    version="0.1.0",
+    version="0.2.0",
     description="A simple dependency injection framework for Python",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",

tests/config/another_services.json

@@ -0,0 +1,25 @@
+{
+  "services": {
+    "another_service": {
+      "class": "tests/services/my_module.py#AnotherService",
+      "arguments": [
+        "@core_service",
+        "!tagged service",
+        "!context"
+      ]
+    },
+    "core_service": {
+      "class": "tests/services/my_module.py#CoreService",
+      "tags": [
+        "service"
+      ]
+    },
+    "base_service": {
+      "class": "tests/services/my_module.py#BaseService",
+      "tags": [
+        "service"
+      ]
+    }
+  },
+  "imports": []
+}

tests/config/another_services.py

@@ -0,0 +1,14 @@
+services = {
+    "another_service": {
+        "class": "tests/services/my_module.py#AnotherService",
+        "arguments": [
+            "@core_service",
+            "!tagged service",
+            "!context",
+        ],
+    },
+    "core_service": {"class": "tests/services/my_module.py#CoreService", "tags": ["service"]},
+    "base_service": {"class": "tests/services/my_module.py#BaseService", "tags": ["service"]},
+}
+
+imports = []

tests/config/another_services.yaml

@@ -1,4 +1,15 @@
 services:
   another_service:
     class: 'tests/services/my_module.py#AnotherService'
-    scope: singleton
+    arguments:
+      - '@core_service'
+      - '!tagged service'
+      - '!context'
+  core_service:
+    class: 'tests/services/my_module.py#CoreService'
+    tags:
+      - 'service'
+  base_service:
+    class: 'tests/services/my_module.py#BaseService'
+    tags:
+      - 'service'

tests/config/services.json

@@ -0,0 +1,26 @@
+{
+  "services": {
+    "my_singleton_service": {
+      "class": "tests/services/my_module.py#MyService",
+      "scope": "singleton"
+    },
+    "my_service": {
+      "class": "tests/services/my_module.py#MyService"
+    },
+    "my_factory_service": {
+      "factory": {
+        "class": "tests/services/my_module.py#MyFactory",
+        "method": "create_service"
+      },
+      "scope": "request"
+    },
+    "my_instance_service": {
+      "instance": "tests/services/my_module.py#MyInstance"
+    }
+  },
+  "imports": [
+    {
+      "resource": "another_services.py"
+    }
+  ]
+}

tests/config/services_python.py → tests/config/services.py

@@ -1,8 +1,11 @@
 services = {
-    "my_service": {
+    "my_singleton_service": {
         "class": "tests/services/my_module.py#MyService",
         "scope": "singleton",
     },
+    "my_service": {
+        "class": "tests/services/my_module.py#MyService",
+    },
     "my_factory_service": {
         "factory": {
             "class": "tests/services/my_module.py#MyFactory",
@@ -15,4 +18,4 @@
     },
 }
 
-imports = [{"resource": "another_services_python.py"}]
+imports = [{"resource": "another_services.py"}]

tests/config/services.yaml

@@ -1,8 +1,11 @@
 services:
-  my_service:
+  my_singleton_service:
     class: 'tests/services/my_module.py#MyService'
     scope: singleton
 
+  my_service:
+    class: 'tests/services/my_module.py#MyService'
+
   my_factory_service:
     factory:
       class: 'tests/services/my_module.py#MyFactory'

tests/services/my_module.py

@@ -1,3 +1,6 @@
+from typing import Any, List
+
+
 class MyService:
     def __init__(self):
         self.name = "Service"
@@ -17,6 +20,19 @@ def __init__(self):
 MyInstance = MyInstanceGenerator()
 
 
-class AnotherService:
+class CoreService:
     def __init__(self):
+        self.name = "Core Service"
+
+
+class BaseService:
+    def __init__(self):
+        self.name = "Base Service"
+
+
+class AnotherService:
+    def __init__(self, core: CoreService, services: List[Any], context: Any):
         self.name = "Another Service"
+        self.core = core
+        self.services = services
+        self.context = context

tests/test_contexts.py

@@ -1,5 +1,5 @@
-import unittest
 import os.path
+import unittest
 
 from simple_dependency_injector import DependencyInjector
 
@@ -9,12 +9,17 @@ def setUp(self):
         self.injector = DependencyInjector(base_path=os.path.dirname(os.path.dirname(__file__)))
 
     def test_create_context(self):
-        self.injector.load("tests/config/services_python.py")
+        self.injector.load("tests/config/services.yaml")
         self.injector.compile()
-        context = self.injector.create_context()
+        context1 = self.injector.create_context()
+        context2 = self.injector.create_context()
+
+        service1 = context1.get("my_service")
+        service2 = context2.get("my_service")
 
-        service = context.get("my_service")
-        self.assertEqual(service.name, "Service")
+        self.assertEqual(service1.name, "Service")
+        self.assertEqual(service2.name, "Service")
+        self.assertNotEqual(service1, service2)
 
 
 if __name__ == "__main__":

tests/test_failures.py

@@ -1,10 +1,10 @@
-import unittest
 import os.path
+import unittest
 
 from simple_dependency_injector import DependencyInjector
 
 
-class TestFailureCases(unittest.TestCase):
+class TestFailures(unittest.TestCase):
     def setUp(self):
         self.injector = DependencyInjector(base_path=os.path.dirname(os.path.dirname(__file__)))
 
@@ -58,53 +58,6 @@ def test_missing_instance_parameter_yaml(self):
             str(context.exception),
         )
 
-    def test_invalid_class_python(self):
-        with self.assertRaises(AttributeError) as context:
-            self.injector.load("tests/config/invalid_class_python.py")
-            self.injector.compile()
-            self.injector.get("invalid_class")
-        self.assertEqual(
-            "module 'module.name' has no attribute 'NonExistentClass'",
-            str(context.exception),
-        )
-
-    def test_invalid_factory_method_python(self):
-        with self.assertRaises(AttributeError) as context:
-            self.injector.load("tests/config/invalid_factory_method_python.py")
-            self.injector.compile()
-            self.injector.get("invalid_factory_method")
-        self.assertIn("non_existent_method", str(context.exception))
-
-    def test_missing_class_parameter_python(self):
-        with self.assertRaises(ValueError) as context:
-            self.injector.load("tests/config/missing_class_parameter_python.py")
-            self.injector.compile()
-            self.injector.get("missing_class_parameter")
-        self.assertEqual(
-            "Service 'missing_class_parameter' has an invalid class name: 123",
-            str(context.exception),
-        )
-
-    def test_invalid_scope_python(self):
-        with self.assertRaises(ValueError) as context:
-            self.injector.load("tests/config/invalid_scope_python.py")
-            self.injector.compile()
-            self.injector.get("invalid_scope")
-        self.assertEqual(
-            "Service 'invalid_scope' has an invalid scope: invalid_scope",
-            str(context.exception),
-        )
-
-    def test_missing_instance_parameter_python(self):
-        with self.assertRaises(ValueError) as context:
-            self.injector.load("tests/config/missing_instance_parameter_python.py")
-            self.injector.compile()
-            self.injector.get("missing_instance_parameter")
-        self.assertEqual(
-            "Service 'missing_instance_parameter' has an invalid instance: 123",
-            str(context.exception),
-        )
-
 
 if __name__ == "__main__":
     unittest.main()

tests/test_imported_services.py

@@ -1,5 +1,5 @@
-import unittest
 import os.path
+import unittest
 
 from simple_dependency_injector import DependencyInjector
 
@@ -15,7 +15,7 @@ def test_load_yaml_imported_service(self):
         self.assertEqual(another_service.name, "Another Service")
 
     def test_load_python_imported_service(self):
-        self.injector.load("tests/config/services_python.py")
+        self.injector.load("tests/config/services.py")
         self.injector.compile()
         another_service = self.injector.get("another_service")
         self.assertEqual(another_service.name, "Another Service")