From 162815b5ba49866ce1555a416d0ff1890e5a807d Mon Sep 17 00:00:00 2001
From: bom <mattis.boeckle@meissa-gmbh.de>
Date: Fri, 17 Mar 2023 09:22:05 +0100
Subject: [PATCH] Import local files instead of modules of the same name

These modules don't exist and caused our tests to fail
---
 src/test/python/release_mixin/mock_infrastructure.py     | 5 +++--
 src/test/python/release_mixin/test_infrastructure.py     | 4 ++--
 src/test/python/release_mixin/test_infrastructure_api.py | 3 ++-
 src/test/python/release_mixin/test_release_mixin.py      | 3 ++-
 src/test/python/release_mixin/test_services.py           | 5 +++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/test/python/release_mixin/mock_infrastructure.py b/src/test/python/release_mixin/mock_infrastructure.py
index 8750308..cb0fd5f 100644
--- a/src/test/python/release_mixin/mock_infrastructure.py
+++ b/src/test/python/release_mixin/mock_infrastructure.py
@@ -1,7 +1,8 @@
-from mock_domain import MockRelease, MockVersion
-from mock_infrastructure_api import MockGitApi
 from src.main.python.ddadevops.release_mixin.domain import ReleaseType
 
+from .mock_domain import MockRelease, MockVersion
+from .mock_infrastructure_api import MockGitApi
+
 class MockVersionRepository():
 
     def __init__(self):
diff --git a/src/test/python/release_mixin/test_infrastructure.py b/src/test/python/release_mixin/test_infrastructure.py
index f200186..2a6242b 100644
--- a/src/test/python/release_mixin/test_infrastructure.py
+++ b/src/test/python/release_mixin/test_infrastructure.py
@@ -1,7 +1,7 @@
 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
+from .mock_infrastructure_api import MockGitApi
+from .helper import Helper
 
 def test_version_repository(tmp_path):
     # init
diff --git a/src/test/python/release_mixin/test_infrastructure_api.py b/src/test/python/release_mixin/test_infrastructure_api.py
index 2c2b8ae..d5b54dc 100644
--- a/src/test/python/release_mixin/test_infrastructure_api.py
+++ b/src/test/python/release_mixin/test_infrastructure_api.py
@@ -1,11 +1,12 @@
 from pathlib import Path
-from helper import Helper
 import pytest as pt
 
 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
 
+from .helper import Helper
+
 def change_test_dir( tmp_path: Path, monkeypatch: pt.MonkeyPatch):
     monkeypatch.chdir(tmp_path)
 
diff --git a/src/test/python/release_mixin/test_release_mixin.py b/src/test/python/release_mixin/test_release_mixin.py
index ff6663e..4bebfa1 100644
--- a/src/test/python/release_mixin/test_release_mixin.py
+++ b/src/test/python/release_mixin/test_release_mixin.py
@@ -1,5 +1,4 @@
 import pytest as pt
-from helper import Helper
 from pathlib import Path
 from ddadevops import *
 from pybuilder.core import Project
@@ -7,6 +6,8 @@ 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
 
+from .helper import Helper
+
 MAIN_BRANCH = 'main'
 STAGE = 'test'
 PROJECT_ROOT_PATH = '.'
diff --git a/src/test/python/release_mixin/test_services.py b/src/test/python/release_mixin/test_services.py
index 7323fd5..8d7526d 100644
--- a/src/test/python/release_mixin/test_services.py
+++ b/src/test/python/release_mixin/test_services.py
@@ -1,6 +1,7 @@
 from src.main.python.ddadevops.release_mixin.services import PrepareReleaseService, TagAndPushReleaseService
-from mock_infrastructure import MockReleaseRepository, MockReleaseTypeRepository, MockVersionRepository
-from mock_infrastructure_api import MockGitApi
+
+from .mock_infrastructure import MockReleaseRepository, MockReleaseTypeRepository, MockVersionRepository
+from .mock_infrastructure_api import MockGitApi
 
 def test_prepare_release_service(): # todo: maybe use mocks for service api tests
     # init