diff --git a/tests/unit/samples/schemasample/__init__.py b/tests/unit/samples/schema/__init__.py similarity index 100% rename from tests/unit/samples/schemasample/__init__.py rename to tests/unit/samples/schema/__init__.py diff --git a/tests/unit/samples/schemasample/container-boto3-session.yml b/tests/unit/samples/schema/container-boto3-session.yml similarity index 100% rename from tests/unit/samples/schemasample/container-boto3-session.yml rename to tests/unit/samples/schema/container-boto3-session.yml diff --git a/tests/unit/samples/schemasample/container-multiple-inline.yml b/tests/unit/samples/schema/container-multiple-inline.yml similarity index 73% rename from tests/unit/samples/schemasample/container-multiple-inline.yml rename to tests/unit/samples/schema/container-multiple-inline.yml index c9955337..f5394a2d 100644 --- a/tests/unit/samples/schemasample/container-multiple-inline.yml +++ b/tests/unit/samples/schema/container-multiple-inline.yml @@ -12,7 +12,7 @@ container: provides: sqlite3.connect args: - provider: Callable - provides: samples.schemasample.utils.return_ + provides: samples.schema.utils.return_ args: - container.core.config.database.dsn @@ -27,32 +27,32 @@ container: services: user: provider: Factory - provides: samples.schemasample.services.UserService + provides: samples.schema.services.UserService kwargs: db: provider: Callable - provides: samples.schemasample.utils.return_ + provides: samples.schema.utils.return_ args: - container.gateways.database_client auth: provider: Factory - provides: samples.schemasample.services.AuthService + provides: samples.schema.services.AuthService kwargs: db: provider: Callable - provides: samples.schemasample.utils.return_ + provides: samples.schema.utils.return_ args: - container.gateways.database_client token_ttl: container.core.config.auth.token_ttl.as_int() photo: provider: Factory - provides: samples.schemasample.services.PhotoService + provides: samples.schema.services.PhotoService kwargs: db: provider: Callable - provides: samples.schemasample.utils.return_ + provides: samples.schema.utils.return_ args: - container.gateways.database_client s3: container.gateways.s3_client diff --git a/tests/unit/samples/schemasample/container-multiple-reordered.yml b/tests/unit/samples/schema/container-multiple-reordered.yml similarity index 83% rename from tests/unit/samples/schemasample/container-multiple-reordered.yml rename to tests/unit/samples/schema/container-multiple-reordered.yml index cf2ec7f9..499cf0a2 100644 --- a/tests/unit/samples/schemasample/container-multiple-reordered.yml +++ b/tests/unit/samples/schema/container-multiple-reordered.yml @@ -5,20 +5,20 @@ container: services: user: provider: Factory - provides: samples.schemasample.services.UserService + provides: samples.schema.services.UserService kwargs: db: container.gateways.database_client auth: provider: Factory - provides: samples.schemasample.services.AuthService + provides: samples.schema.services.AuthService kwargs: db: container.gateways.database_client token_ttl: container.core.config.auth.token_ttl.as_int() photo: provider: Factory - provides: samples.schemasample.services.PhotoService + provides: samples.schema.services.PhotoService kwargs: db: container.gateways.database_client s3: container.gateways.s3_client diff --git a/tests/unit/samples/schemasample/container-multiple.yml b/tests/unit/samples/schema/container-multiple.yml similarity index 83% rename from tests/unit/samples/schemasample/container-multiple.yml rename to tests/unit/samples/schema/container-multiple.yml index 661aa64e..e7dc40aa 100644 --- a/tests/unit/samples/schemasample/container-multiple.yml +++ b/tests/unit/samples/schema/container-multiple.yml @@ -24,20 +24,20 @@ container: services: user: provider: Factory - provides: samples.schemasample.services.UserService + provides: samples.schema.services.UserService kwargs: db: container.gateways.database_client auth: provider: Factory - provides: samples.schemasample.services.AuthService + provides: samples.schema.services.AuthService kwargs: db: container.gateways.database_client token_ttl: container.core.config.auth.token_ttl.as_int() photo: provider: Factory - provides: samples.schemasample.services.PhotoService + provides: samples.schema.services.PhotoService kwargs: db: container.gateways.database_client s3: container.gateways.s3_client diff --git a/tests/unit/samples/schemasample/container-single.yml b/tests/unit/samples/schema/container-single.yml similarity index 81% rename from tests/unit/samples/schemasample/container-single.yml rename to tests/unit/samples/schema/container-single.yml index 057eecca..553ab4b0 100644 --- a/tests/unit/samples/schemasample/container-single.yml +++ b/tests/unit/samples/schema/container-single.yml @@ -20,20 +20,20 @@ container: user_service: provider: Factory - provides: samples.schemasample.services.UserService + provides: samples.schema.services.UserService kwargs: db: container.database_client auth_service: provider: Factory - provides: samples.schemasample.services.AuthService + provides: samples.schema.services.AuthService kwargs: db: container.database_client token_ttl: container.config.auth.token_ttl.as_int() photo_service: provider: Factory - provides: samples.schemasample.services.PhotoService + provides: samples.schema.services.PhotoService kwargs: db: container.database_client s3: container.s3_client diff --git a/tests/unit/samples/schemasample/services.py b/tests/unit/samples/schema/services.py similarity index 100% rename from tests/unit/samples/schemasample/services.py rename to tests/unit/samples/schema/services.py diff --git a/tests/unit/samples/schemasample/utils.py b/tests/unit/samples/schema/utils.py similarity index 100% rename from tests/unit/samples/schemasample/utils.py rename to tests/unit/samples/schema/utils.py diff --git a/tests/unit/schema/test_integration_py36.py b/tests/unit/schema/test_integration_py36.py index 97cab1d2..aa7a6fd0 100644 --- a/tests/unit/schema/test_integration_py36.py +++ b/tests/unit/schema/test_integration_py36.py @@ -6,7 +6,7 @@ import sqlite3 from dependency_injector import containers from pytest import mark -from samples.schemasample.services import UserService, AuthService, PhotoService +from samples.schema.services import UserService, AuthService, PhotoService SAMPLES_DIR = os.path.abspath( @@ -18,7 +18,7 @@ SAMPLES_DIR = os.path.abspath( def test_single_container_schema(container: containers.DynamicContainer): - container.from_yaml_schema(f"{SAMPLES_DIR}/schemasample/container-single.yml") + container.from_yaml_schema(f"{SAMPLES_DIR}/schema/container-single.yml") container.config.from_dict({ "database": { "dsn": ":memory:", @@ -78,7 +78,7 @@ def test_single_container_schema(container: containers.DynamicContainer): def test_multiple_containers_schema(container: containers.DynamicContainer): - container.from_yaml_schema(f"{SAMPLES_DIR}/schemasample/container-multiple.yml") + container.from_yaml_schema(f"{SAMPLES_DIR}/schema/container-multiple.yml") container.core.config.from_dict({ "database": { "dsn": ":memory:", @@ -138,7 +138,7 @@ def test_multiple_containers_schema(container: containers.DynamicContainer): def test_multiple_reordered_containers_schema(container: containers.DynamicContainer): - container.from_yaml_schema(f"{SAMPLES_DIR}/schemasample/container-multiple-reordered.yml") + container.from_yaml_schema(f"{SAMPLES_DIR}/schema/container-multiple-reordered.yml") container.core.config.from_dict({ "database": { "dsn": ":memory:", @@ -198,7 +198,7 @@ def test_multiple_reordered_containers_schema(container: containers.DynamicConta def test_multiple_containers_with_inline_providers_schema(container: containers.DynamicContainer): - container.from_yaml_schema(f"{SAMPLES_DIR}/schemasample/container-multiple-inline.yml") + container.from_yaml_schema(f"{SAMPLES_DIR}/schema/container-multiple-inline.yml") container.core.config.from_dict({ "database": { "dsn": ":memory:", @@ -259,7 +259,7 @@ def test_multiple_containers_with_inline_providers_schema(container: containers. @mark.skip(reason="Boto3 tries to connect to the internet") def test_schema_with_boto3_session(container: containers.DynamicContainer): - container.from_yaml_schema(f"{SAMPLES_DIR}/schemasample/container-boto3-session.yml") + container.from_yaml_schema(f"{SAMPLES_DIR}/schema/container-boto3-session.yml") container.config.from_dict( { "aws_access_key_id": "key",