From 7749d5a789ffa506520f3261873c594e82ad02c0 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sun, 14 Nov 2021 10:04:32 +0100 Subject: [PATCH] Moved tests to src & added add scoped logic --- src/cpl_core/dependency_injection/service_collection.py | 8 ++++++-- src/cpl_core/dependency_injection/service_provider.py | 4 ++-- src/cpl_core/dependency_injection/service_provider_abc.py | 2 +- src/{cpl_cli => }/tests/__init__.py | 0 src/{cpl_cli => }/tests/custom/console/main.py | 0 src/{cpl_cli => }/tests/custom/database/LICENSE | 0 src/{cpl_cli => }/tests/custom/database/README.md | 0 .../tests/custom/database/appsettings.development.json | 0 .../tests/custom/database/appsettings.edrafts-lapi.json | 0 .../tests/custom/database/appsettings.edrafts-pc.json | 0 src/{cpl_cli => }/tests/custom/database/appsettings.json | 0 src/{cpl_cli => }/tests/custom/database/cpl.json | 0 .../tests/custom/database/src/application.py | 0 src/{cpl_cli => }/tests/custom/database/src/main.py | 0 .../tests/custom/database/src/model/__init__.py | 0 .../tests/custom/database/src/model/city_model.py | 0 .../tests/custom/database/src/model/db_context.py | 0 .../tests/custom/database/src/model/user_model.py | 0 .../tests/custom/database/src/model/user_repo.py | 0 .../tests/custom/database/src/model/user_repo_abc.py | 0 src/{cpl_cli => }/tests/custom/database/src/startup.py | 0 .../tests/custom/database/src/tests/__init__.py | 0 src/{cpl_cli => }/tests/custom/general/cpl-workspace.json | 0 .../tests/custom/general/src/general/application.py | 0 .../general/src/general/appsettings.development.json | 0 .../general/src/general/appsettings.edrafts-lapi.json | 0 .../general/src/general/appsettings.edrafts-pc.json | 0 .../tests/custom/general/src/general/appsettings.json | 0 .../tests/custom/general/src/general/db/__init__.py | 0 .../tests/custom/general/src/general/general.json | 0 .../tests/custom/general/src/general/main.py | 0 .../tests/custom/general/src/general/startup.py | 0 .../tests/custom/general/src/general/test_extension.py | 0 .../tests/custom/general/src/general/test_service.py | 0 src/{cpl_cli => }/tests/generated/simple-app/LICENSE | 0 src/{cpl_cli => }/tests/generated/simple-app/README.md | 0 .../tests/generated/simple-app/appsettings.json | 0 .../tests/generated/simple-app/cpl-workspace.json | 0 src/{cpl_cli => }/tests/generated/simple-app/cpl.json | 0 .../tests/generated/simple-app/src/application.py | 0 src/{cpl_cli => }/tests/generated/simple-app/src/main.py | 0 .../tests/generated/simple-app/src/simple_app/__init__.py | 0 .../generated/simple-app/src/simple_app/application.py | 0 .../tests/generated/simple-app/src/simple_app/main.py | 0 .../generated/simple-app/src/simple_app/simple-app.json | 0 .../tests/generated/simple-app/src/tests/__init__.py | 0 src/{cpl_cli => }/tests/generated/simple-console/LICENSE | 0 .../tests/generated/simple-console/README.md | 0 .../tests/generated/simple-console/appsettings.json | 0 .../tests/generated/simple-console/cpl-workspace.json | 0 src/{cpl_cli => }/tests/generated/simple-console/cpl.json | 0 .../tests/generated/simple-console/src/main.py | 0 .../simple-console/src/simple_console/__init__.py | 0 .../generated/simple-console/src/simple_console/main.py | 0 .../simple-console/src/simple_console/simple-console.json | 0 .../tests/generated/simple-console/src/tests/__init__.py | 0 src/{cpl_cli => }/tests/generated/simple-di/LICENSE | 0 src/{cpl_cli => }/tests/generated/simple-di/README.md | 0 .../tests/generated/simple-di/appsettings.json | 0 .../tests/generated/simple-di/cpl-workspace.json | 0 src/{cpl_cli => }/tests/generated/simple-di/cpl.json | 0 src/{cpl_cli => }/tests/generated/simple-di/src/main.py | 0 .../tests/generated/simple-di/src/simple_di/__init__.py | 0 .../tests/generated/simple-di/src/simple_di/main.py | 0 .../generated/simple-di/src/simple_di/simple-di.json | 0 .../tests/generated/simple-di/src/tests/__init__.py | 0 .../tests/generated/simple-startup-app/LICENSE | 0 .../tests/generated/simple-startup-app/README.md | 0 .../tests/generated/simple-startup-app/appsettings.json | 0 .../tests/generated/simple-startup-app/cpl-workspace.json | 0 .../simple-startup-app/src/simple_startup_app/__init__.py | 0 .../src/simple_startup_app/application.py | 0 .../simple-startup-app/src/simple_startup_app/main.py | 0 .../src/simple_startup_app/simple-startup-app.json | 0 .../simple-startup-app/src/simple_startup_app/startup.py | 0 .../generated/simple-startup-app/src/tests/__init__.py | 0 src/{cpl_cli => }/tests/generated/startup-app/LICENSE | 0 src/{cpl_cli => }/tests/generated/startup-app/README.md | 0 src/{cpl_cli => }/tests/generated/startup-app/cpl.json | 0 .../tests/generated/startup-app/src/application.py | 0 src/{cpl_cli => }/tests/generated/startup-app/src/main.py | 0 .../tests/generated/startup-app/src/startup.py | 0 .../tests/generated/startup-app/src/tests/__init__.py | 0 83 files changed, 9 insertions(+), 5 deletions(-) rename src/{cpl_cli => }/tests/__init__.py (100%) rename src/{cpl_cli => }/tests/custom/console/main.py (100%) rename src/{cpl_cli => }/tests/custom/database/LICENSE (100%) rename src/{cpl_cli => }/tests/custom/database/README.md (100%) rename src/{cpl_cli => }/tests/custom/database/appsettings.development.json (100%) rename src/{cpl_cli => }/tests/custom/database/appsettings.edrafts-lapi.json (100%) rename src/{cpl_cli => }/tests/custom/database/appsettings.edrafts-pc.json (100%) rename src/{cpl_cli => }/tests/custom/database/appsettings.json (100%) rename src/{cpl_cli => }/tests/custom/database/cpl.json (100%) rename src/{cpl_cli => }/tests/custom/database/src/application.py (100%) rename src/{cpl_cli => }/tests/custom/database/src/main.py (100%) rename src/{cpl_cli => }/tests/custom/database/src/model/__init__.py (100%) rename src/{cpl_cli => }/tests/custom/database/src/model/city_model.py (100%) rename src/{cpl_cli => }/tests/custom/database/src/model/db_context.py (100%) rename src/{cpl_cli => }/tests/custom/database/src/model/user_model.py (100%) rename src/{cpl_cli => }/tests/custom/database/src/model/user_repo.py (100%) rename src/{cpl_cli => }/tests/custom/database/src/model/user_repo_abc.py (100%) rename src/{cpl_cli => }/tests/custom/database/src/startup.py (100%) rename src/{cpl_cli => }/tests/custom/database/src/tests/__init__.py (100%) rename src/{cpl_cli => }/tests/custom/general/cpl-workspace.json (100%) rename src/{cpl_cli => }/tests/custom/general/src/general/application.py (100%) rename src/{cpl_cli => }/tests/custom/general/src/general/appsettings.development.json (100%) rename src/{cpl_cli => }/tests/custom/general/src/general/appsettings.edrafts-lapi.json (100%) rename src/{cpl_cli => }/tests/custom/general/src/general/appsettings.edrafts-pc.json (100%) rename src/{cpl_cli => }/tests/custom/general/src/general/appsettings.json (100%) rename src/{cpl_cli => }/tests/custom/general/src/general/db/__init__.py (100%) rename src/{cpl_cli => }/tests/custom/general/src/general/general.json (100%) rename src/{cpl_cli => }/tests/custom/general/src/general/main.py (100%) rename src/{cpl_cli => }/tests/custom/general/src/general/startup.py (100%) rename src/{cpl_cli => }/tests/custom/general/src/general/test_extension.py (100%) rename src/{cpl_cli => }/tests/custom/general/src/general/test_service.py (100%) rename src/{cpl_cli => }/tests/generated/simple-app/LICENSE (100%) rename src/{cpl_cli => }/tests/generated/simple-app/README.md (100%) rename src/{cpl_cli => }/tests/generated/simple-app/appsettings.json (100%) rename src/{cpl_cli => }/tests/generated/simple-app/cpl-workspace.json (100%) rename src/{cpl_cli => }/tests/generated/simple-app/cpl.json (100%) rename src/{cpl_cli => }/tests/generated/simple-app/src/application.py (100%) rename src/{cpl_cli => }/tests/generated/simple-app/src/main.py (100%) rename src/{cpl_cli => }/tests/generated/simple-app/src/simple_app/__init__.py (100%) rename src/{cpl_cli => }/tests/generated/simple-app/src/simple_app/application.py (100%) rename src/{cpl_cli => }/tests/generated/simple-app/src/simple_app/main.py (100%) rename src/{cpl_cli => }/tests/generated/simple-app/src/simple_app/simple-app.json (100%) rename src/{cpl_cli => }/tests/generated/simple-app/src/tests/__init__.py (100%) rename src/{cpl_cli => }/tests/generated/simple-console/LICENSE (100%) rename src/{cpl_cli => }/tests/generated/simple-console/README.md (100%) rename src/{cpl_cli => }/tests/generated/simple-console/appsettings.json (100%) rename src/{cpl_cli => }/tests/generated/simple-console/cpl-workspace.json (100%) rename src/{cpl_cli => }/tests/generated/simple-console/cpl.json (100%) rename src/{cpl_cli => }/tests/generated/simple-console/src/main.py (100%) rename src/{cpl_cli => }/tests/generated/simple-console/src/simple_console/__init__.py (100%) rename src/{cpl_cli => }/tests/generated/simple-console/src/simple_console/main.py (100%) rename src/{cpl_cli => }/tests/generated/simple-console/src/simple_console/simple-console.json (100%) rename src/{cpl_cli => }/tests/generated/simple-console/src/tests/__init__.py (100%) rename src/{cpl_cli => }/tests/generated/simple-di/LICENSE (100%) rename src/{cpl_cli => }/tests/generated/simple-di/README.md (100%) rename src/{cpl_cli => }/tests/generated/simple-di/appsettings.json (100%) rename src/{cpl_cli => }/tests/generated/simple-di/cpl-workspace.json (100%) rename src/{cpl_cli => }/tests/generated/simple-di/cpl.json (100%) rename src/{cpl_cli => }/tests/generated/simple-di/src/main.py (100%) rename src/{cpl_cli => }/tests/generated/simple-di/src/simple_di/__init__.py (100%) rename src/{cpl_cli => }/tests/generated/simple-di/src/simple_di/main.py (100%) rename src/{cpl_cli => }/tests/generated/simple-di/src/simple_di/simple-di.json (100%) rename src/{cpl_cli => }/tests/generated/simple-di/src/tests/__init__.py (100%) rename src/{cpl_cli => }/tests/generated/simple-startup-app/LICENSE (100%) rename src/{cpl_cli => }/tests/generated/simple-startup-app/README.md (100%) rename src/{cpl_cli => }/tests/generated/simple-startup-app/appsettings.json (100%) rename src/{cpl_cli => }/tests/generated/simple-startup-app/cpl-workspace.json (100%) rename src/{cpl_cli => }/tests/generated/simple-startup-app/src/simple_startup_app/__init__.py (100%) rename src/{cpl_cli => }/tests/generated/simple-startup-app/src/simple_startup_app/application.py (100%) rename src/{cpl_cli => }/tests/generated/simple-startup-app/src/simple_startup_app/main.py (100%) rename src/{cpl_cli => }/tests/generated/simple-startup-app/src/simple_startup_app/simple-startup-app.json (100%) rename src/{cpl_cli => }/tests/generated/simple-startup-app/src/simple_startup_app/startup.py (100%) rename src/{cpl_cli => }/tests/generated/simple-startup-app/src/tests/__init__.py (100%) rename src/{cpl_cli => }/tests/generated/startup-app/LICENSE (100%) rename src/{cpl_cli => }/tests/generated/startup-app/README.md (100%) rename src/{cpl_cli => }/tests/generated/startup-app/cpl.json (100%) rename src/{cpl_cli => }/tests/generated/startup-app/src/application.py (100%) rename src/{cpl_cli => }/tests/generated/startup-app/src/main.py (100%) rename src/{cpl_cli => }/tests/generated/startup-app/src/startup.py (100%) rename src/{cpl_cli => }/tests/generated/startup-app/src/tests/__init__.py (100%) diff --git a/src/cpl_core/dependency_injection/service_collection.py b/src/cpl_core/dependency_injection/service_collection.py index d5837f4b..55e00156 100644 --- a/src/cpl_core/dependency_injection/service_collection.py +++ b/src/cpl_core/dependency_injection/service_collection.py @@ -59,9 +59,13 @@ class ServiceCollection(ServiceCollectionABC): self._add_descriptor(impl, ServiceLifetimeEnum.singleton) def add_scoped(self, service_type: Type, service: Callable = None): - raise Exception('Not implemented') + if service is not None: + self._add_descriptor(service, ServiceLifetimeEnum.scoped) + else: + self._add_descriptor(service_type, ServiceLifetimeEnum.scoped) + - def add_transient(self, service_type: Union[type], service: Union[type] = None): + def add_transient(self, service_type: type, service: type = None): if service is not None: self._add_descriptor(service, ServiceLifetimeEnum.transient) else: diff --git a/src/cpl_core/dependency_injection/service_provider.py b/src/cpl_core/dependency_injection/service_provider.py index 6357716d..cf079d83 100644 --- a/src/cpl_core/dependency_injection/service_provider.py +++ b/src/cpl_core/dependency_injection/service_provider.py @@ -31,7 +31,7 @@ class ServiceProvider(ServiceProviderABC): self._configuration: ConfigurationABC = config self._database_context = db_context - def _find_service(self, service_type: type) -> [ServiceDescriptor]: + def _find_service(self, service_type: type) -> ServiceDescriptor: for descriptor in self._service_descriptors: if descriptor.service_type == service_type or issubclass(descriptor.service_type, service_type): return descriptor @@ -85,7 +85,7 @@ class ServiceProvider(ServiceProviderABC): return service_type(*params) - def get_service(self, service_type: type) -> Optional[Callable[object]]: + def get_service(self, service_type: type) -> Optional[Callable]: result = self._find_service(service_type) if result is None: diff --git a/src/cpl_core/dependency_injection/service_provider_abc.py b/src/cpl_core/dependency_injection/service_provider_abc.py index 507deb21..6c64a4e3 100644 --- a/src/cpl_core/dependency_injection/service_provider_abc.py +++ b/src/cpl_core/dependency_injection/service_provider_abc.py @@ -26,7 +26,7 @@ class ServiceProviderABC(ABC): pass @abstractmethod - def get_service(self, instance_type: Type) -> Optional[Callable[object]]: + def get_service(self, instance_type: Type) -> Optional[Callable]: r"""Returns instance of given type Parameter diff --git a/src/cpl_cli/tests/__init__.py b/src/tests/__init__.py similarity index 100% rename from src/cpl_cli/tests/__init__.py rename to src/tests/__init__.py diff --git a/src/cpl_cli/tests/custom/console/main.py b/src/tests/custom/console/main.py similarity index 100% rename from src/cpl_cli/tests/custom/console/main.py rename to src/tests/custom/console/main.py diff --git a/src/cpl_cli/tests/custom/database/LICENSE b/src/tests/custom/database/LICENSE similarity index 100% rename from src/cpl_cli/tests/custom/database/LICENSE rename to src/tests/custom/database/LICENSE diff --git a/src/cpl_cli/tests/custom/database/README.md b/src/tests/custom/database/README.md similarity index 100% rename from src/cpl_cli/tests/custom/database/README.md rename to src/tests/custom/database/README.md diff --git a/src/cpl_cli/tests/custom/database/appsettings.development.json b/src/tests/custom/database/appsettings.development.json similarity index 100% rename from src/cpl_cli/tests/custom/database/appsettings.development.json rename to src/tests/custom/database/appsettings.development.json diff --git a/src/cpl_cli/tests/custom/database/appsettings.edrafts-lapi.json b/src/tests/custom/database/appsettings.edrafts-lapi.json similarity index 100% rename from src/cpl_cli/tests/custom/database/appsettings.edrafts-lapi.json rename to src/tests/custom/database/appsettings.edrafts-lapi.json diff --git a/src/cpl_cli/tests/custom/database/appsettings.edrafts-pc.json b/src/tests/custom/database/appsettings.edrafts-pc.json similarity index 100% rename from src/cpl_cli/tests/custom/database/appsettings.edrafts-pc.json rename to src/tests/custom/database/appsettings.edrafts-pc.json diff --git a/src/cpl_cli/tests/custom/database/appsettings.json b/src/tests/custom/database/appsettings.json similarity index 100% rename from src/cpl_cli/tests/custom/database/appsettings.json rename to src/tests/custom/database/appsettings.json diff --git a/src/cpl_cli/tests/custom/database/cpl.json b/src/tests/custom/database/cpl.json similarity index 100% rename from src/cpl_cli/tests/custom/database/cpl.json rename to src/tests/custom/database/cpl.json diff --git a/src/cpl_cli/tests/custom/database/src/application.py b/src/tests/custom/database/src/application.py similarity index 100% rename from src/cpl_cli/tests/custom/database/src/application.py rename to src/tests/custom/database/src/application.py diff --git a/src/cpl_cli/tests/custom/database/src/main.py b/src/tests/custom/database/src/main.py similarity index 100% rename from src/cpl_cli/tests/custom/database/src/main.py rename to src/tests/custom/database/src/main.py diff --git a/src/cpl_cli/tests/custom/database/src/model/__init__.py b/src/tests/custom/database/src/model/__init__.py similarity index 100% rename from src/cpl_cli/tests/custom/database/src/model/__init__.py rename to src/tests/custom/database/src/model/__init__.py diff --git a/src/cpl_cli/tests/custom/database/src/model/city_model.py b/src/tests/custom/database/src/model/city_model.py similarity index 100% rename from src/cpl_cli/tests/custom/database/src/model/city_model.py rename to src/tests/custom/database/src/model/city_model.py diff --git a/src/cpl_cli/tests/custom/database/src/model/db_context.py b/src/tests/custom/database/src/model/db_context.py similarity index 100% rename from src/cpl_cli/tests/custom/database/src/model/db_context.py rename to src/tests/custom/database/src/model/db_context.py diff --git a/src/cpl_cli/tests/custom/database/src/model/user_model.py b/src/tests/custom/database/src/model/user_model.py similarity index 100% rename from src/cpl_cli/tests/custom/database/src/model/user_model.py rename to src/tests/custom/database/src/model/user_model.py diff --git a/src/cpl_cli/tests/custom/database/src/model/user_repo.py b/src/tests/custom/database/src/model/user_repo.py similarity index 100% rename from src/cpl_cli/tests/custom/database/src/model/user_repo.py rename to src/tests/custom/database/src/model/user_repo.py diff --git a/src/cpl_cli/tests/custom/database/src/model/user_repo_abc.py b/src/tests/custom/database/src/model/user_repo_abc.py similarity index 100% rename from src/cpl_cli/tests/custom/database/src/model/user_repo_abc.py rename to src/tests/custom/database/src/model/user_repo_abc.py diff --git a/src/cpl_cli/tests/custom/database/src/startup.py b/src/tests/custom/database/src/startup.py similarity index 100% rename from src/cpl_cli/tests/custom/database/src/startup.py rename to src/tests/custom/database/src/startup.py diff --git a/src/cpl_cli/tests/custom/database/src/tests/__init__.py b/src/tests/custom/database/src/tests/__init__.py similarity index 100% rename from src/cpl_cli/tests/custom/database/src/tests/__init__.py rename to src/tests/custom/database/src/tests/__init__.py diff --git a/src/cpl_cli/tests/custom/general/cpl-workspace.json b/src/tests/custom/general/cpl-workspace.json similarity index 100% rename from src/cpl_cli/tests/custom/general/cpl-workspace.json rename to src/tests/custom/general/cpl-workspace.json diff --git a/src/cpl_cli/tests/custom/general/src/general/application.py b/src/tests/custom/general/src/general/application.py similarity index 100% rename from src/cpl_cli/tests/custom/general/src/general/application.py rename to src/tests/custom/general/src/general/application.py diff --git a/src/cpl_cli/tests/custom/general/src/general/appsettings.development.json b/src/tests/custom/general/src/general/appsettings.development.json similarity index 100% rename from src/cpl_cli/tests/custom/general/src/general/appsettings.development.json rename to src/tests/custom/general/src/general/appsettings.development.json diff --git a/src/cpl_cli/tests/custom/general/src/general/appsettings.edrafts-lapi.json b/src/tests/custom/general/src/general/appsettings.edrafts-lapi.json similarity index 100% rename from src/cpl_cli/tests/custom/general/src/general/appsettings.edrafts-lapi.json rename to src/tests/custom/general/src/general/appsettings.edrafts-lapi.json diff --git a/src/cpl_cli/tests/custom/general/src/general/appsettings.edrafts-pc.json b/src/tests/custom/general/src/general/appsettings.edrafts-pc.json similarity index 100% rename from src/cpl_cli/tests/custom/general/src/general/appsettings.edrafts-pc.json rename to src/tests/custom/general/src/general/appsettings.edrafts-pc.json diff --git a/src/cpl_cli/tests/custom/general/src/general/appsettings.json b/src/tests/custom/general/src/general/appsettings.json similarity index 100% rename from src/cpl_cli/tests/custom/general/src/general/appsettings.json rename to src/tests/custom/general/src/general/appsettings.json diff --git a/src/cpl_cli/tests/custom/general/src/general/db/__init__.py b/src/tests/custom/general/src/general/db/__init__.py similarity index 100% rename from src/cpl_cli/tests/custom/general/src/general/db/__init__.py rename to src/tests/custom/general/src/general/db/__init__.py diff --git a/src/cpl_cli/tests/custom/general/src/general/general.json b/src/tests/custom/general/src/general/general.json similarity index 100% rename from src/cpl_cli/tests/custom/general/src/general/general.json rename to src/tests/custom/general/src/general/general.json diff --git a/src/cpl_cli/tests/custom/general/src/general/main.py b/src/tests/custom/general/src/general/main.py similarity index 100% rename from src/cpl_cli/tests/custom/general/src/general/main.py rename to src/tests/custom/general/src/general/main.py diff --git a/src/cpl_cli/tests/custom/general/src/general/startup.py b/src/tests/custom/general/src/general/startup.py similarity index 100% rename from src/cpl_cli/tests/custom/general/src/general/startup.py rename to src/tests/custom/general/src/general/startup.py diff --git a/src/cpl_cli/tests/custom/general/src/general/test_extension.py b/src/tests/custom/general/src/general/test_extension.py similarity index 100% rename from src/cpl_cli/tests/custom/general/src/general/test_extension.py rename to src/tests/custom/general/src/general/test_extension.py diff --git a/src/cpl_cli/tests/custom/general/src/general/test_service.py b/src/tests/custom/general/src/general/test_service.py similarity index 100% rename from src/cpl_cli/tests/custom/general/src/general/test_service.py rename to src/tests/custom/general/src/general/test_service.py diff --git a/src/cpl_cli/tests/generated/simple-app/LICENSE b/src/tests/generated/simple-app/LICENSE similarity index 100% rename from src/cpl_cli/tests/generated/simple-app/LICENSE rename to src/tests/generated/simple-app/LICENSE diff --git a/src/cpl_cli/tests/generated/simple-app/README.md b/src/tests/generated/simple-app/README.md similarity index 100% rename from src/cpl_cli/tests/generated/simple-app/README.md rename to src/tests/generated/simple-app/README.md diff --git a/src/cpl_cli/tests/generated/simple-app/appsettings.json b/src/tests/generated/simple-app/appsettings.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-app/appsettings.json rename to src/tests/generated/simple-app/appsettings.json diff --git a/src/cpl_cli/tests/generated/simple-app/cpl-workspace.json b/src/tests/generated/simple-app/cpl-workspace.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-app/cpl-workspace.json rename to src/tests/generated/simple-app/cpl-workspace.json diff --git a/src/cpl_cli/tests/generated/simple-app/cpl.json b/src/tests/generated/simple-app/cpl.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-app/cpl.json rename to src/tests/generated/simple-app/cpl.json diff --git a/src/cpl_cli/tests/generated/simple-app/src/application.py b/src/tests/generated/simple-app/src/application.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-app/src/application.py rename to src/tests/generated/simple-app/src/application.py diff --git a/src/cpl_cli/tests/generated/simple-app/src/main.py b/src/tests/generated/simple-app/src/main.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-app/src/main.py rename to src/tests/generated/simple-app/src/main.py diff --git a/src/cpl_cli/tests/generated/simple-app/src/simple_app/__init__.py b/src/tests/generated/simple-app/src/simple_app/__init__.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-app/src/simple_app/__init__.py rename to src/tests/generated/simple-app/src/simple_app/__init__.py diff --git a/src/cpl_cli/tests/generated/simple-app/src/simple_app/application.py b/src/tests/generated/simple-app/src/simple_app/application.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-app/src/simple_app/application.py rename to src/tests/generated/simple-app/src/simple_app/application.py diff --git a/src/cpl_cli/tests/generated/simple-app/src/simple_app/main.py b/src/tests/generated/simple-app/src/simple_app/main.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-app/src/simple_app/main.py rename to src/tests/generated/simple-app/src/simple_app/main.py diff --git a/src/cpl_cli/tests/generated/simple-app/src/simple_app/simple-app.json b/src/tests/generated/simple-app/src/simple_app/simple-app.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-app/src/simple_app/simple-app.json rename to src/tests/generated/simple-app/src/simple_app/simple-app.json diff --git a/src/cpl_cli/tests/generated/simple-app/src/tests/__init__.py b/src/tests/generated/simple-app/src/tests/__init__.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-app/src/tests/__init__.py rename to src/tests/generated/simple-app/src/tests/__init__.py diff --git a/src/cpl_cli/tests/generated/simple-console/LICENSE b/src/tests/generated/simple-console/LICENSE similarity index 100% rename from src/cpl_cli/tests/generated/simple-console/LICENSE rename to src/tests/generated/simple-console/LICENSE diff --git a/src/cpl_cli/tests/generated/simple-console/README.md b/src/tests/generated/simple-console/README.md similarity index 100% rename from src/cpl_cli/tests/generated/simple-console/README.md rename to src/tests/generated/simple-console/README.md diff --git a/src/cpl_cli/tests/generated/simple-console/appsettings.json b/src/tests/generated/simple-console/appsettings.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-console/appsettings.json rename to src/tests/generated/simple-console/appsettings.json diff --git a/src/cpl_cli/tests/generated/simple-console/cpl-workspace.json b/src/tests/generated/simple-console/cpl-workspace.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-console/cpl-workspace.json rename to src/tests/generated/simple-console/cpl-workspace.json diff --git a/src/cpl_cli/tests/generated/simple-console/cpl.json b/src/tests/generated/simple-console/cpl.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-console/cpl.json rename to src/tests/generated/simple-console/cpl.json diff --git a/src/cpl_cli/tests/generated/simple-console/src/main.py b/src/tests/generated/simple-console/src/main.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-console/src/main.py rename to src/tests/generated/simple-console/src/main.py diff --git a/src/cpl_cli/tests/generated/simple-console/src/simple_console/__init__.py b/src/tests/generated/simple-console/src/simple_console/__init__.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-console/src/simple_console/__init__.py rename to src/tests/generated/simple-console/src/simple_console/__init__.py diff --git a/src/cpl_cli/tests/generated/simple-console/src/simple_console/main.py b/src/tests/generated/simple-console/src/simple_console/main.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-console/src/simple_console/main.py rename to src/tests/generated/simple-console/src/simple_console/main.py diff --git a/src/cpl_cli/tests/generated/simple-console/src/simple_console/simple-console.json b/src/tests/generated/simple-console/src/simple_console/simple-console.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-console/src/simple_console/simple-console.json rename to src/tests/generated/simple-console/src/simple_console/simple-console.json diff --git a/src/cpl_cli/tests/generated/simple-console/src/tests/__init__.py b/src/tests/generated/simple-console/src/tests/__init__.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-console/src/tests/__init__.py rename to src/tests/generated/simple-console/src/tests/__init__.py diff --git a/src/cpl_cli/tests/generated/simple-di/LICENSE b/src/tests/generated/simple-di/LICENSE similarity index 100% rename from src/cpl_cli/tests/generated/simple-di/LICENSE rename to src/tests/generated/simple-di/LICENSE diff --git a/src/cpl_cli/tests/generated/simple-di/README.md b/src/tests/generated/simple-di/README.md similarity index 100% rename from src/cpl_cli/tests/generated/simple-di/README.md rename to src/tests/generated/simple-di/README.md diff --git a/src/cpl_cli/tests/generated/simple-di/appsettings.json b/src/tests/generated/simple-di/appsettings.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-di/appsettings.json rename to src/tests/generated/simple-di/appsettings.json diff --git a/src/cpl_cli/tests/generated/simple-di/cpl-workspace.json b/src/tests/generated/simple-di/cpl-workspace.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-di/cpl-workspace.json rename to src/tests/generated/simple-di/cpl-workspace.json diff --git a/src/cpl_cli/tests/generated/simple-di/cpl.json b/src/tests/generated/simple-di/cpl.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-di/cpl.json rename to src/tests/generated/simple-di/cpl.json diff --git a/src/cpl_cli/tests/generated/simple-di/src/main.py b/src/tests/generated/simple-di/src/main.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-di/src/main.py rename to src/tests/generated/simple-di/src/main.py diff --git a/src/cpl_cli/tests/generated/simple-di/src/simple_di/__init__.py b/src/tests/generated/simple-di/src/simple_di/__init__.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-di/src/simple_di/__init__.py rename to src/tests/generated/simple-di/src/simple_di/__init__.py diff --git a/src/cpl_cli/tests/generated/simple-di/src/simple_di/main.py b/src/tests/generated/simple-di/src/simple_di/main.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-di/src/simple_di/main.py rename to src/tests/generated/simple-di/src/simple_di/main.py diff --git a/src/cpl_cli/tests/generated/simple-di/src/simple_di/simple-di.json b/src/tests/generated/simple-di/src/simple_di/simple-di.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-di/src/simple_di/simple-di.json rename to src/tests/generated/simple-di/src/simple_di/simple-di.json diff --git a/src/cpl_cli/tests/generated/simple-di/src/tests/__init__.py b/src/tests/generated/simple-di/src/tests/__init__.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-di/src/tests/__init__.py rename to src/tests/generated/simple-di/src/tests/__init__.py diff --git a/src/cpl_cli/tests/generated/simple-startup-app/LICENSE b/src/tests/generated/simple-startup-app/LICENSE similarity index 100% rename from src/cpl_cli/tests/generated/simple-startup-app/LICENSE rename to src/tests/generated/simple-startup-app/LICENSE diff --git a/src/cpl_cli/tests/generated/simple-startup-app/README.md b/src/tests/generated/simple-startup-app/README.md similarity index 100% rename from src/cpl_cli/tests/generated/simple-startup-app/README.md rename to src/tests/generated/simple-startup-app/README.md diff --git a/src/cpl_cli/tests/generated/simple-startup-app/appsettings.json b/src/tests/generated/simple-startup-app/appsettings.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-startup-app/appsettings.json rename to src/tests/generated/simple-startup-app/appsettings.json diff --git a/src/cpl_cli/tests/generated/simple-startup-app/cpl-workspace.json b/src/tests/generated/simple-startup-app/cpl-workspace.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-startup-app/cpl-workspace.json rename to src/tests/generated/simple-startup-app/cpl-workspace.json diff --git a/src/cpl_cli/tests/generated/simple-startup-app/src/simple_startup_app/__init__.py b/src/tests/generated/simple-startup-app/src/simple_startup_app/__init__.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-startup-app/src/simple_startup_app/__init__.py rename to src/tests/generated/simple-startup-app/src/simple_startup_app/__init__.py diff --git a/src/cpl_cli/tests/generated/simple-startup-app/src/simple_startup_app/application.py b/src/tests/generated/simple-startup-app/src/simple_startup_app/application.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-startup-app/src/simple_startup_app/application.py rename to src/tests/generated/simple-startup-app/src/simple_startup_app/application.py diff --git a/src/cpl_cli/tests/generated/simple-startup-app/src/simple_startup_app/main.py b/src/tests/generated/simple-startup-app/src/simple_startup_app/main.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-startup-app/src/simple_startup_app/main.py rename to src/tests/generated/simple-startup-app/src/simple_startup_app/main.py diff --git a/src/cpl_cli/tests/generated/simple-startup-app/src/simple_startup_app/simple-startup-app.json b/src/tests/generated/simple-startup-app/src/simple_startup_app/simple-startup-app.json similarity index 100% rename from src/cpl_cli/tests/generated/simple-startup-app/src/simple_startup_app/simple-startup-app.json rename to src/tests/generated/simple-startup-app/src/simple_startup_app/simple-startup-app.json diff --git a/src/cpl_cli/tests/generated/simple-startup-app/src/simple_startup_app/startup.py b/src/tests/generated/simple-startup-app/src/simple_startup_app/startup.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-startup-app/src/simple_startup_app/startup.py rename to src/tests/generated/simple-startup-app/src/simple_startup_app/startup.py diff --git a/src/cpl_cli/tests/generated/simple-startup-app/src/tests/__init__.py b/src/tests/generated/simple-startup-app/src/tests/__init__.py similarity index 100% rename from src/cpl_cli/tests/generated/simple-startup-app/src/tests/__init__.py rename to src/tests/generated/simple-startup-app/src/tests/__init__.py diff --git a/src/cpl_cli/tests/generated/startup-app/LICENSE b/src/tests/generated/startup-app/LICENSE similarity index 100% rename from src/cpl_cli/tests/generated/startup-app/LICENSE rename to src/tests/generated/startup-app/LICENSE diff --git a/src/cpl_cli/tests/generated/startup-app/README.md b/src/tests/generated/startup-app/README.md similarity index 100% rename from src/cpl_cli/tests/generated/startup-app/README.md rename to src/tests/generated/startup-app/README.md diff --git a/src/cpl_cli/tests/generated/startup-app/cpl.json b/src/tests/generated/startup-app/cpl.json similarity index 100% rename from src/cpl_cli/tests/generated/startup-app/cpl.json rename to src/tests/generated/startup-app/cpl.json diff --git a/src/cpl_cli/tests/generated/startup-app/src/application.py b/src/tests/generated/startup-app/src/application.py similarity index 100% rename from src/cpl_cli/tests/generated/startup-app/src/application.py rename to src/tests/generated/startup-app/src/application.py diff --git a/src/cpl_cli/tests/generated/startup-app/src/main.py b/src/tests/generated/startup-app/src/main.py similarity index 100% rename from src/cpl_cli/tests/generated/startup-app/src/main.py rename to src/tests/generated/startup-app/src/main.py diff --git a/src/cpl_cli/tests/generated/startup-app/src/startup.py b/src/tests/generated/startup-app/src/startup.py similarity index 100% rename from src/cpl_cli/tests/generated/startup-app/src/startup.py rename to src/tests/generated/startup-app/src/startup.py diff --git a/src/cpl_cli/tests/generated/startup-app/src/tests/__init__.py b/src/tests/generated/startup-app/src/tests/__init__.py similarity index 100% rename from src/cpl_cli/tests/generated/startup-app/src/tests/__init__.py rename to src/tests/generated/startup-app/src/tests/__init__.py