diff --git a/tests/unit/schema/test_integration_py36.py b/tests/unit/schema/test_integration_py36.py index 8437e3e3..80a60960 100644 --- a/tests/unit/schema/test_integration_py36.py +++ b/tests/unit/schema/test_integration_py36.py @@ -30,13 +30,7 @@ class TestSchemaSingleContainer(unittest.TestCase): def test(self): container = containers.DynamicContainer() - - schema_path = pathlib.Path(__file__).parent.parent / 'samples' / 'schemasample' / 'container-single.yml' - # TODO: from_yaml_schema() - with open(schema_path) as file: - schema = yaml.load(file, yaml.Loader) - container.from_schema(schema) - + container.from_yaml_schema(f'{_SAMPLES_DIR}/schemasample/container-single.yml') container.config.from_dict({ 'database': { 'dsn': ':memory:', @@ -99,81 +93,7 @@ class TestSchemaMultipleContainers(unittest.TestCase): def test(self): container = containers.DynamicContainer() - - schema_path = pathlib.Path(__file__).parent.parent / 'samples' / 'schemasample' / 'container-multiple.yml' - # TODO: from_yaml_schema() - with open(schema_path) as file: - schema = yaml.load(file, yaml.Loader) - container.from_schema(schema) - - container.core.config.from_dict({ - 'database': { - 'dsn': ':memory:', - }, - 'aws': { - 'access_key_id': 'KEY', - 'secret_access_key': 'SECRET', - }, - 'auth': { - 'token_ttl': 3600, - }, - }) - - # User service - user_service1 = container.services.user() - user_service2 = container.services.user() - self.assertIsInstance(user_service1, UserService) - self.assertIsInstance(user_service2, UserService) - self.assertIsNot(user_service1, user_service2) - - self.assertIsInstance(user_service1.db, sqlite3.Connection) - self.assertIsInstance(user_service2.db, sqlite3.Connection) - self.assertIs(user_service1.db, user_service2.db) - - # Auth service - auth_service1 = container.services.auth() - auth_service2 = container.services.auth() - self.assertIsInstance(auth_service1, AuthService) - self.assertIsInstance(auth_service2, AuthService) - self.assertIsNot(auth_service1, auth_service2) - - self.assertIsInstance(auth_service1.db, sqlite3.Connection) - self.assertIsInstance(auth_service2.db, sqlite3.Connection) - self.assertIs(auth_service1.db, auth_service2.db) - self.assertIs(auth_service1.db, container.gateways.database_client()) - self.assertIs(auth_service2.db, container.gateways.database_client()) - - self.assertEqual(auth_service1.token_ttl, 3600) - self.assertEqual(auth_service2.token_ttl, 3600) - - # Photo service - photo_service1 = container.services.photo() - photo_service2 = container.services.photo() - self.assertIsInstance(photo_service1, PhotoService) - self.assertIsInstance(photo_service2, PhotoService) - self.assertIsNot(photo_service1, photo_service2) - - self.assertIsInstance(photo_service1.db, sqlite3.Connection) - self.assertIsInstance(photo_service2.db, sqlite3.Connection) - self.assertIs(photo_service1.db, photo_service2.db) - self.assertIs(photo_service1.db, container.gateways.database_client()) - self.assertIs(photo_service2.db, container.gateways.database_client()) - - self.assertIs(photo_service1.s3, photo_service2.s3) - self.assertIs(photo_service1.s3, container.gateways.s3_client()) - self.assertIs(photo_service2.s3, container.gateways.s3_client()) - -class TestSchemaMultipleContainers(unittest.TestCase): - - def test(self): - container = containers.DynamicContainer() - - schema_path = pathlib.Path(__file__).parent.parent / 'samples' / 'schemasample' / 'container-multiple.yml' - # TODO: from_yaml_schema() - with open(schema_path) as file: - schema = yaml.load(file, yaml.Loader) - container.from_schema(schema) - + container.from_yaml_schema(f'{_SAMPLES_DIR}/schemasample/container-multiple.yml') container.core.config.from_dict({ 'database': { 'dsn': ':memory:', @@ -236,13 +156,7 @@ class TestSchemaMultipleContainersWithInlineProviders(unittest.TestCase): def test(self): container = containers.DynamicContainer() - - schema_path = pathlib.Path(__file__).parent.parent / 'samples' / 'schemasample' / 'container-multiple-inline.yml' - # TODO: from_yaml_schema() - with open(schema_path) as file: - schema = yaml.load(file, yaml.Loader) - container.from_schema(schema) - + container.from_yaml_schema(f'{_SAMPLES_DIR}/schemasample/container-multiple-inline.yml') container.core.config.from_dict({ 'database': { 'dsn': ':memory:',