From 36df9f486b492502323d694b4f80eb948b830ecb Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 17 Nov 2023 14:45:38 +0100 Subject: [PATCH] Cleanup Fix typos, remove old todos --- src/main/python/ddadevops/domain/build_file.py | 1 - .../application/test_release_mixin_services.py | 6 +++--- src/test/python/domain/test_artifact.py | 2 +- src/test/python/domain/test_build_file.py | 12 ++++++------ src/test/python/domain/test_release.py | 4 ++-- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/python/ddadevops/domain/build_file.py b/src/main/python/ddadevops/domain/build_file.py index 7c29ec9..c159ca6 100644 --- a/src/main/python/ddadevops/domain/build_file.py +++ b/src/main/python/ddadevops/domain/build_file.py @@ -116,7 +116,6 @@ class BuildFile(Validateable): ) self.content = substitute case BuildFileType.JAVA_CLOJURE: - # TODO: we should stick here on defproject instead of first line! substitute = re.sub( self.__get_file_type_regex_str(build_file_type), fr'\g"{new_version.to_string()}"', diff --git a/src/test/python/application/test_release_mixin_services.py b/src/test/python/application/test_release_mixin_services.py index 976d7c5..69e83ab 100644 --- a/src/test/python/application/test_release_mixin_services.py +++ b/src/test/python/application/test_release_mixin_services.py @@ -13,7 +13,7 @@ from src.test.python.domain.helper import ( from src.main.python.ddadevops.application import ReleaseService -def test_sould_update_release_type(): +def test_should_update_release_type(): sut = ReleaseService( GitApiMock(), ArtifactDeploymentApiMock(), BuildFileRepositoryMock("build.py") ) @@ -26,7 +26,7 @@ def test_sould_update_release_type(): sut.update_release_type(release, "NOT_EXISTING") -def test_sould_publish_artifacts(): +def test_should_publish_artifacts(): mock = ArtifactDeploymentApiMock(release='{"id": 2345}') sut = ReleaseService(GitApiMock(), mock, BuildFileRepositoryMock()) devops = build_devops( @@ -41,7 +41,7 @@ def test_sould_publish_artifacts(): sut.publish_artifacts(release) assert "http://repo.test/api/v1/repos/orga/repo/releases/2345/assets" == mock.add_asset_to_release_api_endpoint -def test_sould_throw_exception_if_there_was_an_error_in_publish_artifacts(): +def test_should_throw_exception_if_there_was_an_error_in_publish_artifacts(): devops = build_devops( { "release_artifacts": ["target/art"], diff --git a/src/test/python/domain/test_artifact.py b/src/test/python/domain/test_artifact.py index 86e5324..ad9c719 100644 --- a/src/test/python/domain/test_artifact.py +++ b/src/test/python/domain/test_artifact.py @@ -13,7 +13,7 @@ from src.main.python.ddadevops.domain import ( from .helper import build_devops, devops_config -def test_sould_validate_release(): +def test_should_validate_release(): sut = Artifact("x") assert sut.is_valid() diff --git a/src/test/python/domain/test_build_file.py b/src/test/python/domain/test_build_file.py index fbd086a..7e199ba 100644 --- a/src/test/python/domain/test_build_file.py +++ b/src/test/python/domain/test_build_file.py @@ -7,7 +7,7 @@ from src.main.python.ddadevops.domain import ( ) -def test_sould_validate_build_file(): +def test_should_validate_build_file(): sut = BuildFile(Path("./project.clj"), "content") assert sut.is_valid() @@ -18,7 +18,7 @@ def test_sould_validate_build_file(): assert not sut.is_valid() -def test_sould_calculate_build_type(): +def test_should_calculate_build_type(): sut = BuildFile(Path("./project.clj"), "content") assert sut.build_file_type() == BuildFileType.JAVA_CLOJURE @@ -29,7 +29,7 @@ def test_sould_calculate_build_type(): assert sut.build_file_type() == BuildFileType.JS -def test_sould_parse_and_set_js(): +def test_should_parse_and_set_js(): sut = BuildFile( Path("./package.json"), """ @@ -77,7 +77,7 @@ def test_sould_parse_and_set_js(): ) -def test_sould_parse_and_set_version_for_gradle(): +def test_should_parse_and_set_version_for_gradle(): sut = BuildFile( Path("./build.gradle"), """ @@ -97,7 +97,7 @@ version = "1.1.5-SNAPSHOT" assert '\nversion = "2.0.0"\n' == sut.content -def test_sould_parse_and_set_version_for_py(): +def test_should_parse_and_set_version_for_py(): sut = BuildFile( Path("./build.py"), """ @@ -143,7 +143,7 @@ version = "1.1.5-SNAPSHOT" assert '\nversion = "2.0.0"\n' == sut.content -def test_sould_parse_and_set_version_for_clj(): +def test_should_parse_and_set_version_for_clj(): sut = BuildFile( Path("./project.clj"), """ diff --git a/src/test/python/domain/test_release.py b/src/test/python/domain/test_release.py index 968ce69..16dd1c0 100644 --- a/src/test/python/domain/test_release.py +++ b/src/test/python/domain/test_release.py @@ -15,7 +15,7 @@ from src.main.python.ddadevops.domain import ( from .helper import build_devops, devops_config -def test_sould_validate_release(): +def test_should_validate_release(): sut = Release( devops_config( { @@ -49,7 +49,7 @@ def test_sould_validate_release(): assert not sut.is_valid() -def test_sould_calculate_build_files(): +def test_should_calculate_build_files(): sut = Release( devops_config( {