diff --git a/src/test/python/release_mixin/__init__.py b/src/test/python/release_mixin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/main/python/ddadevops/release-mixin/test/helper.py b/src/test/python/release_mixin/helper.py similarity index 61% rename from src/main/python/ddadevops/release-mixin/test/helper.py rename to src/test/python/release_mixin/helper.py index 7b8ccfb..1c22f30 100644 --- a/src/main/python/ddadevops/release-mixin/test/helper.py +++ b/src/test/python/release_mixin/helper.py @@ -1,11 +1,11 @@ from pathlib import Path -from infrastructure_api import SystemAPI +from src.main.python.ddadevops.release_mixin.infrastructure_api import SystemAPI class Helper(): def __init__(self, file_name = 'config.json'): self.TEST_FILE_NAME = file_name - self.TEST_FILE_ROOT = Path('test/resources/') + self.TEST_FILE_ROOT = Path('src/test/resources/') self.TEST_FILE_PATH = self.TEST_FILE_ROOT / self.TEST_FILE_NAME def copy_files(self, source: Path, target: Path): diff --git a/src/main/python/ddadevops/release-mixin/test/mock_domain.py b/src/test/python/release_mixin/mock_domain.py similarity index 86% rename from src/main/python/ddadevops/release-mixin/test/mock_domain.py rename to src/test/python/release_mixin/mock_domain.py index b5b4b65..14e625c 100644 --- a/src/main/python/ddadevops/release-mixin/test/mock_domain.py +++ b/src/test/python/release_mixin/mock_domain.py @@ -1,11 +1,4 @@ -import os -import sys - -current = os.path.dirname(os.path.realpath(__file__)) -parent = os.path.dirname(current) -sys.path.append(parent) - -from domain import ReleaseType +from src.main.python.ddadevops.release_mixin.domain import ReleaseType class MockVersion(): diff --git a/src/main/python/ddadevops/release-mixin/test/mock_infrastructure.py b/src/test/python/release_mixin/mock_infrastructure.py similarity index 88% rename from src/main/python/ddadevops/release-mixin/test/mock_infrastructure.py rename to src/test/python/release_mixin/mock_infrastructure.py index 6e66498..8750308 100644 --- a/src/main/python/ddadevops/release-mixin/test/mock_infrastructure.py +++ b/src/test/python/release_mixin/mock_infrastructure.py @@ -1,13 +1,6 @@ -import os -import sys from mock_domain import MockRelease, MockVersion from mock_infrastructure_api import MockGitApi - -current = os.path.dirname(os.path.realpath(__file__)) -parent = os.path.dirname(current) -sys.path.append(parent) - -from domain import ReleaseType +from src.main.python.ddadevops.release_mixin.domain import ReleaseType class MockVersionRepository(): diff --git a/src/main/python/ddadevops/release-mixin/test/mock_infrastructure_api.py b/src/test/python/release_mixin/mock_infrastructure_api.py similarity index 100% rename from src/main/python/ddadevops/release-mixin/test/mock_infrastructure_api.py rename to src/test/python/release_mixin/mock_infrastructure_api.py diff --git a/src/main/python/ddadevops/release-mixin/test/test_domain.py b/src/test/python/release_mixin/test_domain.py similarity index 89% rename from src/main/python/ddadevops/release-mixin/test/test_domain.py rename to src/test/python/release_mixin/test_domain.py index d93b78d..a76ab9c 100644 --- a/src/main/python/ddadevops/release-mixin/test/test_domain.py +++ b/src/test/python/release_mixin/test_domain.py @@ -1,12 +1,5 @@ -import sys -import os from pathlib import Path - -current = os.path.dirname(os.path.realpath(__file__)) -parent = os.path.dirname(current) -sys.path.append(parent) - -from domain import Version, ReleaseType, Release +from src.main.python.ddadevops.release_mixin.domain import Version, ReleaseType, Release def test_version(tmp_path: Path): version = Version(tmp_path, [1, 2, 3]) diff --git a/src/main/python/ddadevops/release-mixin/test/test_infrastructure.py b/src/test/python/release_mixin/test_infrastructure.py similarity index 86% rename from src/main/python/ddadevops/release-mixin/test/test_infrastructure.py rename to src/test/python/release_mixin/test_infrastructure.py index 3b4c8fc..f200186 100644 --- a/src/main/python/ddadevops/release-mixin/test/test_infrastructure.py +++ b/src/test/python/release_mixin/test_infrastructure.py @@ -1,15 +1,7 @@ -import sys -import os -from helper import Helper - -current = os.path.dirname(os.path.realpath(__file__)) -parent = os.path.dirname(current) -sys.path.append(parent) - -from domain import ReleaseType -from infrastructure import ReleaseTypeRepository, VersionRepository, ReleaseRepository +from src.main.python.ddadevops.release_mixin.domain import ReleaseType +from src.main.python.ddadevops.release_mixin.infrastructure import ReleaseTypeRepository, VersionRepository, ReleaseRepository from mock_infrastructure_api import MockGitApi - +from helper import Helper def test_version_repository(tmp_path): # init diff --git a/src/main/python/ddadevops/release-mixin/test/test_infrastructure_api.py b/src/test/python/release_mixin/test_infrastructure_api.py similarity index 88% rename from src/main/python/ddadevops/release-mixin/test/test_infrastructure_api.py rename to src/test/python/release_mixin/test_infrastructure_api.py index 8c603f7..2c2b8ae 100644 --- a/src/main/python/ddadevops/release-mixin/test/test_infrastructure_api.py +++ b/src/test/python/release_mixin/test_infrastructure_api.py @@ -1,16 +1,10 @@ -import sys -import os -import pytest as pt from pathlib import Path from helper import Helper +import pytest as pt -current = os.path.dirname(os.path.realpath(__file__)) -parent = os.path.dirname(current) -sys.path.append(parent) - -from infrastructure_api import GitApi -from infrastructure import VersionRepository -from domain import ReleaseType +from src.main.python.ddadevops.release_mixin.infrastructure_api import GitApi +from src.main.python.ddadevops.release_mixin.infrastructure import VersionRepository +from src.main.python.ddadevops.release_mixin.domain import ReleaseType def change_test_dir( tmp_path: Path, monkeypatch: pt.MonkeyPatch): monkeypatch.chdir(tmp_path) diff --git a/src/main/python/ddadevops/release-mixin/test/test_release_mixin.py b/src/test/python/release_mixin/test_release_mixin.py similarity index 85% rename from src/main/python/ddadevops/release-mixin/test/test_release_mixin.py rename to src/test/python/release_mixin/test_release_mixin.py index eaca9a2..ff6663e 100644 --- a/src/main/python/ddadevops/release-mixin/test/test_release_mixin.py +++ b/src/test/python/release_mixin/test_release_mixin.py @@ -1,17 +1,11 @@ -import sys -import os import pytest as pt from helper import Helper from pathlib import Path from ddadevops import * from pybuilder.core import Project -current = os.path.dirname(os.path.realpath(__file__)) -parent = os.path.dirname(current) -sys.path.append(parent) - -from release_mixin import ReleaseMixin, create_release_mixin_config -from infrastructure_api import GitApi +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 MAIN_BRANCH = 'main' STAGE = 'test' diff --git a/src/main/python/ddadevops/release-mixin/test/test_services.py b/src/test/python/release_mixin/test_services.py similarity index 80% rename from src/main/python/ddadevops/release-mixin/test/test_services.py rename to src/test/python/release_mixin/test_services.py index a24341c..7323fd5 100644 --- a/src/main/python/ddadevops/release-mixin/test/test_services.py +++ b/src/test/python/release_mixin/test_services.py @@ -1,22 +1,4 @@ -import sys -import os - -# getting the name of the directory -# where the this file is present. -current = os.path.dirname(os.path.realpath(__file__)) - -# Getting the parent directory name -# where the current directory is present. -parent = os.path.dirname(current) - -# adding the parent directory to -# the sys.path. -sys.path.append(parent) - -# now we can import the module in the parent -# directory. - -from services import PrepareReleaseService, TagAndPushReleaseService +from src.main.python.ddadevops.release_mixin.services import PrepareReleaseService, TagAndPushReleaseService from mock_infrastructure import MockReleaseRepository, MockReleaseTypeRepository, MockVersionRepository from mock_infrastructure_api import MockGitApi diff --git a/src/main/python/ddadevops/release-mixin/test/resources/config.clj b/src/test/resources/config.clj similarity index 100% rename from src/main/python/ddadevops/release-mixin/test/resources/config.clj rename to src/test/resources/config.clj diff --git a/src/main/python/ddadevops/release-mixin/test/resources/config.gradle b/src/test/resources/config.gradle similarity index 100% rename from src/main/python/ddadevops/release-mixin/test/resources/config.gradle rename to src/test/resources/config.gradle diff --git a/src/main/python/ddadevops/release-mixin/test/resources/config.json b/src/test/resources/config.json similarity index 100% rename from src/main/python/ddadevops/release-mixin/test/resources/config.json rename to src/test/resources/config.json diff --git a/src/main/python/ddadevops/release-mixin/test/resources/config.py b/src/test/resources/config.py similarity index 100% rename from src/main/python/ddadevops/release-mixin/test/resources/config.py rename to src/test/resources/config.py