sh-edraft.de/sh_cpl
2
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

Improved testing and service providing

Browse Source
This commit is contained in:
Sven Heidemann
2020-11-25 21:41:45 +01:00
parent cd9d4d3c3d
commit b501fef27d
20 changed files with 340 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/tests/logging/logger.py
View File

@@ -16,7 +16,6 @@ class LoggerTest(unittest.TestCase):
def setUp(self):
self._app_host = ApplicationHost()
self._services = self._app_host.services
self._services.init(())
self._services.create()
self._log_settings = LoggingSettings()
@@ -35,8 +34,6 @@ class LoggerTest(unittest.TestCase):
"DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
})
self._services.add_singleton(Logger, self._log_settings, self._time_format_settings, self._app_host)
def tearDown(self):
if os.path.isdir(self._log_settings.path):
shutil.rmtree(self._log_settings.path)
@@ -48,9 +45,7 @@ class LoggerTest(unittest.TestCase):
def test_create(self):
print(f'{__name__}.test_create:')
logger: Logger = self._services.get_service(LoggerBase)
self.assertIsNotNone(logger)
logger = Logger(self._log_settings, self._time_format_settings, self._app_host)
logger.create()
self.assertTrue(os.path.isdir(self._log_settings.path))
@@ -62,7 +57,7 @@ class LoggerTest(unittest.TestCase):
def test_header(self):
print(f'{__name__}.test_header:')
logger: Logger = self._services.get_service(LoggerBase)
logger = Logger(self._log_settings, self._time_format_settings, self._app_host)
logger.create()
logger.header('HeaderTest:')
@@ -84,7 +79,7 @@ class LoggerTest(unittest.TestCase):
def test_trace(self):
print(f'{__name__}.test_trace:')
logger: Logger = self._services.get_service(LoggerBase)
logger = Logger(self._log_settings, self._time_format_settings, self._app_host)
logger.create()
logger.trace(__name__, f'{__name__}.test_trace:')
@@ -106,7 +101,7 @@ class LoggerTest(unittest.TestCase):
def test_debug(self):
print(f'{__name__}.test_debug:')
logger: Logger = self._services.get_service(LoggerBase)
logger = Logger(self._log_settings, self._time_format_settings, self._app_host)
logger.create()
logger.debug(__name__, f'{__name__}.test_debug:')
@@ -128,7 +123,7 @@ class LoggerTest(unittest.TestCase):
def test_info(self):
print(f'{__name__}.test_info:')
logger: Logger = self._services.get_service(LoggerBase)
logger = Logger(self._log_settings, self._time_format_settings, self._app_host)
logger.create()
logger.info(__name__, f'{__name__}.test_info:')
@@ -150,7 +145,7 @@ class LoggerTest(unittest.TestCase):
def test_warn(self):
print(f'{__name__}.test_warn:')
logger: Logger = self._services.get_service(LoggerBase)
logger = Logger(self._log_settings, self._time_format_settings, self._app_host)
logger.create()
logger.warn(__name__, f'{__name__}.test_warn:')
@@ -172,7 +167,7 @@ class LoggerTest(unittest.TestCase):
def test_error(self):
print(f'{__name__}.test_error:')
logger: Logger = self._services.get_service(LoggerBase)
logger = Logger(self._log_settings, self._time_format_settings, self._app_host)
logger.create()
logger.error(__name__, f'{__name__}.test_error:')
@@ -194,7 +189,7 @@ class LoggerTest(unittest.TestCase):
def test_fatal(self):
print(f'{__name__}.test_fatal:')
logger: Logger = self._services.get_service(LoggerBase)
logger = Logger(self._log_settings, self._time_format_settings, self._app_host)
logger.create()
with self.assertRaises(SystemExit):
logger.fatal(__name__, f'{__name__}.test_fatal:')

31
src/tests/publishing/publisher.py
View File

@@ -9,6 +9,7 @@ from sh_edraft.logging.model import LoggingSettings
from sh_edraft.publishing import Publisher
from sh_edraft.publishing.base import PublisherBase
from sh_edraft.publishing.model import Template
from sh_edraft.publishing.model.publish_settings_model import PublishSettingsModel
from sh_edraft.source_code.model import Version
from sh_edraft.time.model import TimeFormatSettings
@@ -33,7 +34,7 @@ class PublisherTest(unittest.TestCase):
})
self._version = Version(2020, 12, 5).to_dict()
self._templates = [
templates = [
Template(
'../../publish_templates/*_template.txt',
'*',
@@ -62,29 +63,33 @@ class PublisherTest(unittest.TestCase):
)
]
self._source = '../'
self._dist = '../../dist'
self._source_path = '../'
self._dist_path = '../../dist'
self._publish_settings_model = PublishSettingsModel()
self._publish_settings_model.from_dict({
"SourcePath": self._source_path,
"DistPath": self._dist_path,
"Templates": templates,
"IncludedFiles": [],
"ExcludedFiles": [],
"TemplateEnding": "_template.txt",
})
def setUp(self):
self._config()
self._app_host = ApplicationHost()
self._services = self._app_host.services
self._services.init(())
self._services.create()
self._services.add_singleton(Logger, self._log_settings, self._time_format_settings, self._app_host)
logger: Logger = self._services.get_service(LoggerBase)
logger.create()
self._logger = Logger(self._log_settings, self._time_format_settings, self._app_host)
self._logger.create()
def tearDown(self):
if os.path.isdir(self._log_settings.path):
shutil.rmtree(self._log_settings.path)
def test_create(self):
self._services.add_transient(Publisher, self._services.get_service(LoggerBase), self._source, self._dist, self._templates)
publisher: Publisher = self._services.get_service(PublisherBase)
publisher: Publisher = Publisher(self._logger, self._publish_settings_model)
self.assertIsNotNone(publisher)
publisher.create()
self.assertTrue(os.path.isdir(self._dist))
self.assertTrue(os.path.isdir(self._dist_path))

65
src/tests/service_providing/service_provider.py
View File

@@ -1,11 +1,13 @@
import unittest
from sh_edraft.configuration import ApplicationHost
from sh_edraft.configuration.model.application_host_base import ApplicationHostBase
from sh_edraft.logging import Logger
from sh_edraft.logging.base import LoggerBase
from sh_edraft.logging.model import LoggingSettings
from sh_edraft.publishing import Publisher
from sh_edraft.publishing.base import PublisherBase
from sh_edraft.publishing.model.publish_settings_model import PublishSettingsModel
from sh_edraft.service import ServiceProvider
from sh_edraft.service.base import ServiceBase
from sh_edraft.time.model import TimeFormatSettings
@@ -16,7 +18,6 @@ class ServiceProviderTest(unittest.TestCase):
def setUp(self):
self._app_host = ApplicationHost()
self._services = self._app_host.services
self._services.init(())
self._services.create()
self._log_settings = LoggingSettings()
@@ -26,6 +27,7 @@ class ServiceProviderTest(unittest.TestCase):
"ConsoleLogLevel": "TRACE",
"FileLogLevel": "TRACE"
})
self._services.config.add_config_by_type(LoggingSettings, self._log_settings)
self._time_format_settings = TimeFormatSettings()
self._time_format_settings.from_dict({
@@ -34,48 +36,69 @@ class ServiceProviderTest(unittest.TestCase):
"DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
"DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
})
self._services.config.add_config_by_type(TimeFormatSettings, self._time_format_settings)
self._services.config.add_config_by_type(ApplicationHost, self._app_host)
self._publish_settings_model = PublishSettingsModel()
self._publish_settings_model.from_dict({
"SourcePath": "../",
"DistPath": "../../dist",
"Templates": [],
"IncludedFiles": [],
"ExcludedFiles": [],
"TemplateEnding": "_template.txt",
})
self._services.config.add_config_by_type(PublishSettingsModel, self._publish_settings_model)
def _check_general_requirements(self):
self.assertIsNotNone(self._services)
def _check_logger_requirements(self):
self.assertIsNotNone(self._log_settings)
self.assertIsNotNone(self._time_format_settings)
def _add_logger(self):
self._services.add_singleton(Logger, self._log_settings, self._time_format_settings, self._app_host)
self._services.add_singleton(LoggerBase, Logger)
logger: Logger = self._services.get_service(LoggerBase)
logger.create()
def test_create(self):
print(f'{__name__}.test_create:')
provider = ServiceProvider()
self.assertIsNotNone(provider)
provider.init(())
provider.create()
self.assertIsNotNone(provider)
def test_add_singleton(self):
print(f'{__name__}.test_add_singleton:')
self._check_general_requirements()
self._check_logger_requirements()
self._services.add_singleton(Logger, self._log_settings, self._time_format_settings, self._app_host)
self._services.add_singleton(LoggerBase, Logger)
self.assertGreater(len(self._services._singleton_services), 0)
found = False
for service in self._services._singleton_services:
if isinstance(service, Logger) and isinstance(service, LoggerBase) and isinstance(service, ServiceBase):
for service_type in self._services._singleton_services:
service = self._services._singleton_services[service_type]
if service_type == LoggerBase and (
isinstance(service, Logger) and isinstance(service, LoggerBase) and isinstance(service, ServiceBase)
):
if not found:
found = True
self.assertTrue(found)
found = False
for service_type in self._services._singleton_services:
service = self._services._singleton_services[service_type]
if service_type == PublisherBase and (
isinstance(service, Publisher) and isinstance(service, PublisherBase) and isinstance(service, ServiceBase)
):
if not found:
found = True
self.assertFalse(found)
def test_get_singleton(self):
print(f'{__name__}.test_get_singleton:')
self._check_general_requirements()
self._check_logger_requirements()
self._services.add_singleton(Logger, self._log_settings, self._time_format_settings, self._app_host)
self._services.add_singleton(LoggerBase, Logger)
logger: Logger = self._services.get_service(LoggerBase)
self.assertIsNotNone(logger)
self.assertTrue(isinstance(logger, Logger))
@@ -89,18 +112,16 @@ class ServiceProviderTest(unittest.TestCase):
def test_add_scoped(self):
print(f'{__name__}.test_add_scoped:')
self._check_general_requirements()
self._check_logger_requirements()
self._add_logger()
self._services.add_singleton(Logger, self._log_settings, self._time_format_settings, self._app_host)
self._services.add_scoped(Publisher, self._services.get_service(LoggerBase), '../', '../../dist', [])
self._services.add_scoped(PublisherBase, Publisher)
def test_get_scoped(self):
print(f'{__name__}.test_get_scoped:')
self._check_general_requirements()
self._check_logger_requirements()
self._add_logger()
self._services.add_scoped(Publisher, self._services.get_service(LoggerBase), '../', '../../dist', [])
self._services.add_scoped(PublisherBase, Publisher)
publisher: Publisher = self._services.get_service(PublisherBase)
self.assertIsNotNone(publisher)
self.assertTrue(isinstance(publisher, Publisher))
@@ -114,10 +135,9 @@ class ServiceProviderTest(unittest.TestCase):
def test_add_transient(self):
print(f'{__name__}.test_add_transient:')
self._check_general_requirements()
self._check_logger_requirements()
self._add_logger()
self._services.add_transient(Publisher, self._services.get_service(LoggerBase), '../', '../../dist', [])
self._services.add_transient(PublisherBase, Publisher)
self.assertGreater(len(self._services._transient_services), 0)
self.assertTrue(bool(isinstance(service, ServiceBase) for service in self._services._transient_services))
@@ -125,10 +145,9 @@ class ServiceProviderTest(unittest.TestCase):
def test_get_transient(self):
print(f'{__name__}.test_get_transient:')
self._check_general_requirements()
self._check_logger_requirements()
self._add_logger()
self._services.add_singleton(Logger, self._log_settings, self._time_format_settings, self._app_host)
self._services.add_transient(Publisher, self._services.get_service(LoggerBase), '../', '../../dist', [])
self._services.add_transient(PublisherBase, Publisher)
publisher: Publisher = self._services.get_service(PublisherBase)
self.assertIsNotNone(publisher)
self.assertTrue(isinstance(publisher, Publisher))