From e8ae635c88170351aef35d31e21c636234080a79 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 1 Dec 2022 17:00:17 +0100 Subject: [PATCH] Improved tests #129 --- unittests/unittests/application.py | 4 ++-- unittests/unittests_cli/add_test_case.py | 5 ++++- unittests/unittests_cli/build_test_case.py | 5 ++++- unittests/unittests_cli/cli_test_suite.py | 2 +- unittests/unittests_cli/constants.py | 10 +++++++--- unittests/unittests_cli/install_test_case.py | 5 ++++- unittests/unittests_cli/new_test_case.py | 5 ++++- unittests/unittests_cli/publish_test_case.py | 5 ++++- unittests/unittests_cli/remove_test_case.py | 5 ++++- unittests/unittests_cli/run_test_case.py | 5 ++++- unittests/unittests_cli/start_test_case.py | 5 ++++- unittests/unittests_cli/uninstall_test_case.py | 5 ++++- unittests/unittests_query/query_test_suite.py | 2 +- 13 files changed, 47 insertions(+), 16 deletions(-) diff --git a/unittests/unittests/application.py b/unittests/unittests/application.py index c9547c15..0ba34799 100644 --- a/unittests/unittests/application.py +++ b/unittests/unittests/application.py @@ -18,6 +18,6 @@ class Application(ApplicationABC): def main(self): runner = unittest.TextTestRunner() - # runner.run(CLITestSuite()) + runner.run(CLITestSuite()) runner.run(QueryTestSuite()) - # runner.run(TranslationTestSuite()) + runner.run(TranslationTestSuite()) diff --git a/unittests/unittests_cli/add_test_case.py b/unittests/unittests_cli/add_test_case.py index 27964fbe..d1b64503 100644 --- a/unittests/unittests_cli/add_test_case.py +++ b/unittests/unittests_cli/add_test_case.py @@ -26,7 +26,10 @@ class AddTestCase(unittest.TestCase): return project_json def setUp(self): - os.chdir(os.path.abspath(PLAYGROUND_PATH)) + if not os.path.exists(PLAYGROUND_PATH): + os.makedirs(PLAYGROUND_PATH) + + os.chdir(PLAYGROUND_PATH) # create projects CLICommands.new('console', self._source, '--ab', '--s') os.chdir(os.path.join(os.getcwd(), self._source)) diff --git a/unittests/unittests_cli/build_test_case.py b/unittests/unittests_cli/build_test_case.py index e35d5cbd..d01de06f 100644 --- a/unittests/unittests_cli/build_test_case.py +++ b/unittests/unittests_cli/build_test_case.py @@ -31,7 +31,10 @@ class BuildTestCase(unittest.TestCase): project_file.close() def setUp(self): - os.chdir(os.path.abspath(PLAYGROUND_PATH)) + if not os.path.exists(PLAYGROUND_PATH): + os.makedirs(PLAYGROUND_PATH) + + os.chdir(PLAYGROUND_PATH) # create projects CLICommands.new('console', self._source, '--ab', '--s') os.chdir(os.path.join(os.getcwd(), self._source)) diff --git a/unittests/unittests_cli/cli_test_suite.py b/unittests/unittests_cli/cli_test_suite.py index 65cb6355..228fa366 100644 --- a/unittests/unittests_cli/cli_test_suite.py +++ b/unittests/unittests_cli/cli_test_suite.py @@ -75,4 +75,4 @@ class CLITestSuite(unittest.TestSuite): def run(self, *args): self._setup() self._result = super().run(*args) - # self._cleanup() + self._cleanup() diff --git a/unittests/unittests_cli/constants.py b/unittests/unittests_cli/constants.py index f585a27f..c8318dab 100644 --- a/unittests/unittests_cli/constants.py +++ b/unittests/unittests_cli/constants.py @@ -1,5 +1,9 @@ import os -PLAYGROUND_PATH = os.path.abspath(os.path.join(os.getcwd(), '../test_cli_playground')) -TRANSLATION_PATH = os.path.abspath(os.path.join(os.getcwd(), '../unittests_translation')) -CLI_PATH = os.path.abspath(os.path.join(os.getcwd(), '../../src/cpl_cli/main.py')) +base = '' +if not os.getcwd().endswith('unittests'): + base = '../' + +PLAYGROUND_PATH = os.path.abspath(os.path.join(os.getcwd(), f'{base}test_cli_playground')) +TRANSLATION_PATH = os.path.abspath(os.path.join(os.getcwd(), f'{base}unittests_translation')) +CLI_PATH = os.path.abspath(os.path.join(os.getcwd(), f'{base}../src/cpl_cli/main.py')) diff --git a/unittests/unittests_cli/install_test_case.py b/unittests/unittests_cli/install_test_case.py index 527256d1..516a44e4 100644 --- a/unittests/unittests_cli/install_test_case.py +++ b/unittests/unittests_cli/install_test_case.py @@ -31,7 +31,10 @@ class InstallTestCase(unittest.TestCase): project_file.close() def setUp(self): - os.chdir(os.path.abspath(PLAYGROUND_PATH)) + if not os.path.exists(PLAYGROUND_PATH): + os.makedirs(PLAYGROUND_PATH) + + os.chdir(PLAYGROUND_PATH) # create projects CLICommands.new('console', self._source, '--ab', '--s') os.chdir(os.path.join(os.getcwd(), self._source)) diff --git a/unittests/unittests_cli/new_test_case.py b/unittests/unittests_cli/new_test_case.py index 5c05334e..5d0eb0a3 100644 --- a/unittests/unittests_cli/new_test_case.py +++ b/unittests/unittests_cli/new_test_case.py @@ -10,7 +10,10 @@ from unittests_shared.cli_commands import CLICommands class NewTestCase(unittest.TestCase): def setUp(self): - os.chdir(os.path.abspath(PLAYGROUND_PATH)) + if not os.path.exists(PLAYGROUND_PATH): + os.makedirs(PLAYGROUND_PATH) + + os.chdir(PLAYGROUND_PATH) def _test_project(self, project_type: str, name: str, *args, test_venv=False, without_ws=False): CLICommands.new(project_type, name, *args) diff --git a/unittests/unittests_cli/publish_test_case.py b/unittests/unittests_cli/publish_test_case.py index 7c828ced..141e374e 100644 --- a/unittests/unittests_cli/publish_test_case.py +++ b/unittests/unittests_cli/publish_test_case.py @@ -31,7 +31,10 @@ class PublishTestCase(unittest.TestCase): project_file.close() def setUp(self): - os.chdir(os.path.abspath(PLAYGROUND_PATH)) + if not os.path.exists(PLAYGROUND_PATH): + os.makedirs(PLAYGROUND_PATH) + + os.chdir(PLAYGROUND_PATH) # create projects CLICommands.new('console', self._source, '--ab', '--s') os.chdir(os.path.join(os.getcwd(), self._source)) diff --git a/unittests/unittests_cli/remove_test_case.py b/unittests/unittests_cli/remove_test_case.py index 81aa8ee0..f618e4b8 100644 --- a/unittests/unittests_cli/remove_test_case.py +++ b/unittests/unittests_cli/remove_test_case.py @@ -24,7 +24,10 @@ class RemoveTestCase(unittest.TestCase): return project_json def setUp(self): - os.chdir(os.path.abspath(PLAYGROUND_PATH)) + if not os.path.exists(PLAYGROUND_PATH): + os.makedirs(PLAYGROUND_PATH) + + os.chdir(PLAYGROUND_PATH) # create projects CLICommands.new('console', self._source, '--ab', '--s') os.chdir(os.path.join(os.getcwd(), self._source)) diff --git a/unittests/unittests_cli/run_test_case.py b/unittests/unittests_cli/run_test_case.py index 1d86b68d..7ec9b9dd 100644 --- a/unittests/unittests_cli/run_test_case.py +++ b/unittests/unittests_cli/run_test_case.py @@ -50,7 +50,10 @@ class RunTestCase(unittest.TestCase): project_file.close() def setUp(self): - os.chdir(os.path.abspath(PLAYGROUND_PATH)) + if not os.path.exists(PLAYGROUND_PATH): + os.makedirs(PLAYGROUND_PATH) + + os.chdir(PLAYGROUND_PATH) # create projects CLICommands.new('console', self._source, '--ab', '--s') os.chdir(os.path.join(os.getcwd(), self._source)) diff --git a/unittests/unittests_cli/start_test_case.py b/unittests/unittests_cli/start_test_case.py index f41eb450..3ff09294 100644 --- a/unittests/unittests_cli/start_test_case.py +++ b/unittests/unittests_cli/start_test_case.py @@ -50,7 +50,10 @@ class StartTestCase(unittest.TestCase): project_file.close() def setUp(self): - os.chdir(os.path.abspath(PLAYGROUND_PATH)) + if not os.path.exists(PLAYGROUND_PATH): + os.makedirs(PLAYGROUND_PATH) + + os.chdir(PLAYGROUND_PATH) # create projects CLICommands.new('console', self._source, '--ab', '--s') os.chdir(os.path.join(os.getcwd(), self._source)) diff --git a/unittests/unittests_cli/uninstall_test_case.py b/unittests/unittests_cli/uninstall_test_case.py index d81bddf9..a552bfc2 100644 --- a/unittests/unittests_cli/uninstall_test_case.py +++ b/unittests/unittests_cli/uninstall_test_case.py @@ -29,7 +29,10 @@ class UninstallTestCase(unittest.TestCase): return project_json def setUp(self): - os.chdir(os.path.abspath(PLAYGROUND_PATH)) + if not os.path.exists(PLAYGROUND_PATH): + os.makedirs(PLAYGROUND_PATH) + + os.chdir(PLAYGROUND_PATH) # create projects CLICommands.new('console', self._source, '--ab', '--s') os.chdir(os.path.join(os.getcwd(), self._source)) diff --git a/unittests/unittests_query/query_test_suite.py b/unittests/unittests_query/query_test_suite.py index e1c307b4..c8b0d7c1 100644 --- a/unittests/unittests_query/query_test_suite.py +++ b/unittests/unittests_query/query_test_suite.py @@ -25,4 +25,4 @@ class QueryTestSuite(unittest.TestSuite): if __name__ == "__main__": runner = unittest.TextTestRunner() - runner.run(QueryTestSuite()) \ No newline at end of file + runner.run(QueryTestSuite())