From ca3db5efe9e01ee66d5b16c76139eb01d965af24 Mon Sep 17 00:00:00 2001 From: erik Date: Thu, 9 Feb 2023 13:20:42 +0100 Subject: [PATCH] WIP Add tests for gradle and json --- build.gradle | 2 +- devops_test.py | 15 +++++++++------ file_handlers.py | 10 +++++----- test/config.gradle | 2 ++ test/config.json | 3 +++ test/{test_version.py => test_version_class.py} | 13 ++++++++++++- 6 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 test/config.gradle create mode 100644 test/config.json rename test/{test_version.py => test_version_class.py} (76%) diff --git a/build.gradle b/build.gradle index 6a8577e..6fa64a8 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: "kotlinx-serialization" group = "org.domaindrivenarchitecture.provs" -version = "0.17.1" +version = "0.17.1-SNAPSHOT" repositories { mavenCentral() diff --git a/devops_test.py b/devops_test.py index ec0b2ab..17b9220 100644 --- a/devops_test.py +++ b/devops_test.py @@ -3,12 +3,9 @@ from file_handlers import FileHandler def init_project(): # validate_values() - version = Version.from_file('build.gradle') - v2 = Version.from_file('package.json') - print(type(version.file_handler)) - print(type(v2.file_handler)) - # version.increment(ReleaseLevel.SNAPSHOT) - # version.write() + version = Version.from_file('build.gradle') + version.increment(ReleaseLevel.SNAPSHOT) + version.to_file() print(version.get()) def prepare_release(): @@ -39,6 +36,12 @@ class Version(): return inst + def to_file(self): + if self.file_handler is None: + raise Exception('Version was not created by from_file method.') + else: + self.file_handler.write(self.get()) + def increment(self, level: ReleaseLevel): self.is_snapshot = False match level: diff --git a/file_handlers.py b/file_handlers.py index 3543833..fe6495f 100644 --- a/file_handlers.py +++ b/file_handlers.py @@ -24,7 +24,7 @@ class FileHandler(ABC): pass @abstractmethod - def write(self): + def write(self, version_string): pass class JsonFileHandler(FileHandler): @@ -39,10 +39,10 @@ class JsonFileHandler(FileHandler): version = [int(x) for x in json_version.split('.')] return version, is_snapshot - def write(self): + def write(self, version_string): with open(self.config_file_path, 'r+') as json_file: json_data = json.load(json_file) - json_data['version'] = self.get() + json_data['version'] = version_string json_file.seek(0) json.dump(json_data, json_file, indent=4) json_file.truncate() @@ -72,10 +72,10 @@ class GradleFileHandler(FileHandler): return version, is_snapshot - def write(self): + def write(self, version_string): with open(self.config_file_path, 'r+') as gradle_file: gradle_contents = gradle_file.read() - version_substitute = re.sub("\nversion = .*\n", f'\nversion = "{self.get()}"\n', gradle_contents) + version_substitute = re.sub("\nversion = .*\n", f'\nversion = "{version_string}"\n', gradle_contents) gradle_file.seek(0) gradle_file.write(version_substitute) gradle_file.truncate() diff --git a/test/config.gradle b/test/config.gradle new file mode 100644 index 0000000..9123ba2 --- /dev/null +++ b/test/config.gradle @@ -0,0 +1,2 @@ + +version = "12.4.678" \ No newline at end of file diff --git a/test/config.json b/test/config.json new file mode 100644 index 0000000..f407ec1 --- /dev/null +++ b/test/config.json @@ -0,0 +1,3 @@ +{ + "version": "123.123.456" +} \ No newline at end of file diff --git a/test/test_version.py b/test/test_version_class.py similarity index 76% rename from test/test_version.py rename to test/test_version_class.py index d72416b..f90446c 100644 --- a/test/test_version.py +++ b/test/test_version_class.py @@ -22,4 +22,15 @@ def test_version(): assert version.get() == "1.3.0" version.increment(ReleaseLevel.MAJOR) - assert version.get() == "2.0.0" \ No newline at end of file + assert version.get() == "2.0.0" + + +def test_gradle(): + # validate_values() + version = Version.from_file('build.gradle') + + + + version.increment(ReleaseLevel.SNAPSHOT) + version.to_file() + print(version.get()) \ No newline at end of file