2022.6.17 - Unittests #84

Merged
edraft merged 51 commits from 2022.6.17 into 2022.6 2022-06-27 10:03:55 +02:00
8 changed files with 119 additions and 22 deletions
Showing only changes of commit 32507afae9 - Show all commits

View File

@ -14,6 +14,7 @@ from unittests_cli.new_test_case import NewTestCase
from unittests_cli.publish_test_case import PublishTestCase from unittests_cli.publish_test_case import PublishTestCase
from unittests_cli.remove_test_case import RemoveTestCase from unittests_cli.remove_test_case import RemoveTestCase
from unittests_cli.run_test_case import RunTestCase from unittests_cli.run_test_case import RunTestCase
from unittests_cli.start_test_case import StartTestCase
from unittests_cli.uninstall_test_case import UninstallTestCase from unittests_cli.uninstall_test_case import UninstallTestCase
from unittests_cli.update_test_case import UpdateTestCase from unittests_cli.update_test_case import UpdateTestCase
@ -25,25 +26,24 @@ class CLITestSuite(unittest.TestSuite):
loader = unittest.TestLoader() loader = unittest.TestLoader()
self._result: Optional[TestResult] = None self._result: Optional[TestResult] = None
self._is_online = True self._is_online = False
active_tests = [ active_tests = [
# nothing needed # nothing needed
GenerateTestCase, # GenerateTestCase,
NewTestCase, # NewTestCase,
# compare console output # compare console output
# VersionTestCase, # VersionTestCase,
# project needed # project needed
BuildTestCase, # BuildTestCase,
PublishTestCase, # PublishTestCase,
RunTestCase, # RunTestCase,
# check if application was executed properly and file watcher is working StartTestCase,
# StartTestCase,
# check in project settings if package is updated # check in project settings if package is updated
# UpdateTestCase, # UpdateTestCase,
# workspace needed # workspace needed
AddTestCase, # AddTestCase,
RemoveTestCase # RemoveTestCase
] ]
if self._is_online: if self._is_online:

View File

@ -5,10 +5,7 @@ import subprocess
import sys import sys
import unittest import unittest
import pkg_resources
from cpl_core.utils import String from cpl_core.utils import String
from unittests_cli.constants import PLAYGROUND_PATH from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands from unittests_shared.cli_commands import CLICommands

View File

@ -1,10 +1,8 @@
import json import json
import os import os
import shutil
import unittest import unittest
from cpl_core.utils import String from cpl_core.utils import String
from unittests_cli.constants import PLAYGROUND_PATH from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands from unittests_shared.cli_commands import CLICommands

View File

@ -1,10 +1,8 @@
import json import json
import os import os
import shutil
import unittest import unittest
from cpl_core.utils import String from cpl_core.utils import String
from unittests_cli.constants import PLAYGROUND_PATH from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands from unittests_shared.cli_commands import CLICommands

View File

@ -1,10 +1,97 @@
import json
import os
import shutil
import unittest import unittest
from cpl_core.utils import String
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_cli.threads.start_test_thread import StartTestThread
from unittests_shared.cli_commands import CLICommands
class StartTestCase(unittest.TestCase): class StartTestCase(unittest.TestCase):
def setUp(self): def __init__(self, methodName: str):
pass unittest.TestCase.__init__(self, methodName)
self._source = 'start-test'
self._project_file = f'src/{String.convert_to_snake_case(self._source)}/{self._source}.json'
self._appsettings = f'src/{String.convert_to_snake_case(self._source)}/appsettings.json'
self._application = f'src/{String.convert_to_snake_case(self._source)}/application.py'
self._test_code = f"""
import json
settings = dict()
with open('appsettings.json', 'r', encoding='utf-8') as cfg:
# load json
settings = json.load(cfg)
cfg.close()
if settings['RunTest']['WasStarted']:
settings['RunTest']['WasRestarted'] = 'True'
settings['RunTest']['WasStarted'] = 'True'
def test_equal(self): with open('appsettings.json', 'w', encoding='utf-8') as project_file:
pass project_file.write(json.dumps(settings, indent=2))
project_file.close()
"""
def _get_appsettings(self):
with open(os.path.join(os.getcwd(), self._appsettings), 'r', encoding='utf-8') as cfg:
# load json
project_json = json.load(cfg)
cfg.close()
return project_json
def _save_appsettings(self, settings: dict):
with open(os.path.join(os.getcwd(), self._appsettings), 'w', encoding='utf-8') as project_file:
project_file.write(json.dumps(settings, indent=2))
project_file.close()
def setUp(self):
os.chdir(os.path.abspath(PLAYGROUND_PATH))
# create projects
CLICommands.new('console', self._source, '--ab', '--s')
os.chdir(os.path.join(os.getcwd(), self._source))
settings = {'RunTest': {'WasStarted': 'False', 'WasRestarted': 'False'}}
self._save_appsettings(settings)
with open(os.path.join(os.getcwd(), self._application), 'a', encoding='utf-8') as file:
file.write(f'\t\t{self._test_code}')
file.close()
def cleanUp(self):
# remove projects
if not os.path.exists(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source))):
return
shutil.rmtree(os.path.abspath(os.path.join(PLAYGROUND_PATH, self._source)))
def test_start(self):
thread = StartTestThread()
thread.run()
settings = self._get_appsettings()
self.assertNotEqual(settings, {})
self.assertIn('RunTest', settings)
self.assertIn('WasStarted', settings['RunTest'])
self.assertEqual(
'True',
settings['RunTest']['WasStarted']
)
with open(os.path.join(os.getcwd(), self._application), 'a', encoding='utf-8') as file:
file.write(f'# trigger restart (comment generated by unittest)')
file.close()
settings = self._get_appsettings()
self.assertNotEqual(settings, {})
self.assertIn('RunTest', settings)
self.assertIn('WasStarted', settings['RunTest'])
self.assertIn('WasRestarted', settings['RunTest'])
self.assertEqual(
'True',
settings['RunTest']['WasStarted']
)
self.assertEqual(
'True',
settings['RunTest']['WasRestarted']
)

View File

@ -0,0 +1 @@
# imports

View File

@ -0,0 +1,12 @@
import threading
from unittests_shared.cli_commands import CLICommands
class StartTestThread(threading.Thread):
def __init__(self):
threading.Thread.__init__(self, daemon=True)
def run(self):
CLICommands.start()

View File

@ -18,7 +18,7 @@ class CLICommands:
if output: if output:
subprocess.run(command, env=env_vars) subprocess.run(command, env=env_vars)
else: else:
subprocess.run(command, env=env_vars, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) subprocess.run(command, env=env_vars, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL)
@classmethod @classmethod
def add(cls, source: str, target: str, output=False): def add(cls, source: str, target: str, output=False):
@ -59,6 +59,10 @@ class CLICommands:
return return
cls._run('run', project, output=output) cls._run('run', project, output=output)
@classmethod
def start(cls, output=False):
cls._run('start', output=output)
@classmethod @classmethod
def uninstall(cls, package: str, output=False): def uninstall(cls, package: str, output=False):
cls._run('uninstall', package, output=output) cls._run('uninstall', package, output=output)