From a1f9992fbae1484111082d2dbd9a71a80e3be8c6 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 18 Apr 2023 15:34:29 +0200 Subject: [PATCH] Refactor tests to accomodate changes --- .../python/release_mixin/test_release_mixin.py | 14 +++++++++++--- src/test/python/release_mixin/test_services.py | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/test/python/release_mixin/test_release_mixin.py b/src/test/python/release_mixin/test_release_mixin.py index 9c4cfc3..ed4a52f 100644 --- a/src/test/python/release_mixin/test_release_mixin.py +++ b/src/test/python/release_mixin/test_release_mixin.py @@ -4,6 +4,7 @@ from pybuilder.core import Project from src.main.python.ddadevops.release_mixin.release_mixin import ReleaseMixin, create_release_mixin_config from src.main.python.ddadevops.release_mixin.infrastructure_api import GitApi, EnvironmentApi +from src.main.python.ddadevops.domain import Devops, ReleaseConfig from .helper import Helper @@ -27,6 +28,13 @@ def initialize(project, CONFIG_FILE): 'project_root_path': PROJECT_ROOT_PATH, 'build_dir_name': BUILD_DIR_NAME}) build = MyBuild(project, config) + return build + +def initialize_with_object(project, CONFIG_FILE): + project.build_depends_on('ddadevops>=3.1.2') + devops = Devops(STAGE, PROJECT_ROOT_PATH, MODULE, "release_test", BUILD_DIR_NAME) + release_config = ReleaseConfig(MAIN_BRANCH, CONFIG_FILE, devops) + build = MyBuild(project, release_config=release_config) return build def test_release_mixin_git(tmp_path: Path, monkeypatch: pt.MonkeyPatch): @@ -45,9 +53,9 @@ def test_release_mixin_git(tmp_path: Path, monkeypatch: pt.MonkeyPatch): git_api.add_file(th.TEST_FILE_NAME) git_api.commit("MAJOR release") - build = initialize(project, th.TEST_FILE_PATH) + build = initialize_with_object(project, th.TEST_FILE_PATH) build.prepare_release() - release_version = build.version_repo.get_version() + release_version = build.prepare_release_service.release_repo.version_repository.get_version() # test assert "124.0.1-SNAPSHOT" in release_version.get_version_string() @@ -73,7 +81,7 @@ def test_release_mixin_environment(tmp_path: Path, monkeypatch: pt.MonkeyPatch): build = initialize(project, th.TEST_FILE_PATH) build.prepare_release() - release_version = build.version_repo.get_version() + release_version = build.prepare_release_service.release_repo.version_repository.get_version() # test assert "124.0.1-SNAPSHOT" in release_version.get_version_string() diff --git a/src/test/python/release_mixin/test_services.py b/src/test/python/release_mixin/test_services.py index 8d7526d..ca8ca32 100644 --- a/src/test/python/release_mixin/test_services.py +++ b/src/test/python/release_mixin/test_services.py @@ -30,8 +30,8 @@ def test_prepare_release_service(): # todo: maybe use mocks for service api test def test_tag_and_push_release_service(): # init mock_release_repo = MockReleaseRepository(MockVersionRepository(), MockReleaseTypeRepository(MockGitApi()), 'main') - tag_and_push_release_service = TagAndPushReleaseService(MockGitApi()) - tag_and_push_release_service.tag_release(mock_release_repo.get_release()) + tag_and_push_release_service = TagAndPushReleaseService(MockGitApi(), mock_release_repo) + tag_and_push_release_service.tag_release() tag_and_push_release_service.push_release() #test