2022.6 #88

Merged
edraft merged 158 commits from 2022.6 into master 2022-06-29 17:50:07 +02:00
3 changed files with 111 additions and 17 deletions
Showing only changes of commit 6de3bbdaf4 - Show all commits

View File

@ -13,6 +13,7 @@ from unittests_cli.install_test_case import InstallTestCase
from unittests_cli.new_test_case import NewTestCase 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.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
@ -24,6 +25,7 @@ class CLITestSuite(unittest.TestSuite):
loader = unittest.TestLoader() loader = unittest.TestLoader()
self._result: Optional[TestResult] = None self._result: Optional[TestResult] = None
self._is_online = True
active_tests = [ active_tests = [
# nothing needed # nothing needed
@ -33,13 +35,10 @@ class CLITestSuite(unittest.TestSuite):
# VersionTestCase, # VersionTestCase,
# project needed # project needed
BuildTestCase, BuildTestCase,
InstallTestCase,
PublishTestCase, PublishTestCase,
# check if application was executed properly RunTestCase,
# RunTestCase,
# check if application was executed properly and file watcher is working # check if application was executed properly and file watcher is working
# StartTestCase, # StartTestCase,
UninstallTestCase,
# check in project settings if package is updated # check in project settings if package is updated
# UpdateTestCase, # UpdateTestCase,
# workspace needed # workspace needed
@ -47,6 +46,10 @@ class CLITestSuite(unittest.TestSuite):
RemoveTestCase RemoveTestCase
] ]
if self._is_online:
active_tests.append(InstallTestCase)
active_tests.append(UninstallTestCase)
for test in active_tests: for test in active_tests:
self.addTests(loader.loadTestsFromTestCase(test)) self.addTests(loader.loadTestsFromTestCase(test))

View File

@ -1,10 +1,91 @@
import json
import os
import shutil
import subprocess
import sys
import unittest import unittest
import pkg_resources
from cpl_core.utils import String
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands
class RunTestCase(unittest.TestCase): class RunTestCase(unittest.TestCase):
def setUp(self): def __init__(self, methodName: str):
pass unittest.TestCase.__init__(self, methodName)
self._source = 'run-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()
settings['RunTest']['WasStarted'] = 'True'
with open('appsettings.json', 'w', encoding='utf-8') as project_file:
project_file.write(json.dumps(settings, indent=2))
project_file.close()
"""
def test_equal(self): def _get_appsettings(self):
pass 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'}}
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_run(self):
CLICommands.run()
settings = self._get_appsettings()
self.assertNotEqual(settings, {})
self.assertIn('RunTest', settings)
self.assertIn('WasStarted', settings['RunTest'])
self.assertEqual(
'True',
settings['RunTest']['WasStarted']
)
def test_run_by_project(self):
os.chdir(os.path.join(os.getcwd()))
CLICommands.run(self._source)
settings = self._get_appsettings()
self.assertNotEqual(settings, {})
self.assertIn('RunTest', settings)
self.assertIn('WasStarted', settings['RunTest'])
self.assertEqual(
'True',
settings['RunTest']['WasStarted']
)

View File

@ -15,15 +15,18 @@ class CLICommands:
for arg in args: for arg in args:
command.append(arg) command.append(arg)
subprocess.run(command, env=env_vars) if output:
subprocess.run(command, env=env_vars)
else:
subprocess.run(command, env=env_vars, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
@classmethod @classmethod
def add(cls, source: str, target: str): def add(cls, source: str, target: str, output=False):
cls._run('add', source, target) cls._run('add', source, target, output=output)
@classmethod @classmethod
def build(cls): def build(cls, output=False):
cls._run('build') cls._run('build', output=output)
@classmethod @classmethod
def generate(cls, schematic: str, name: str, output=False): def generate(cls, schematic: str, name: str, output=False):
@ -42,12 +45,19 @@ class CLICommands:
cls._run('new', project_type, name, *args, output=output) cls._run('new', project_type, name, *args, output=output)
@classmethod @classmethod
def publish(cls): def publish(cls, output=False):
cls._run('publish') cls._run('publish', output=output)
@classmethod @classmethod
def remove(cls, project: str): def remove(cls, project: str, output=False):
cls._run('remove', project) cls._run('remove', project, output=output)
@classmethod
def run(cls, project: str = None, output=False):
if project is None:
cls._run('run', output=output)
return
cls._run('run', project, output=output)
@classmethod @classmethod
def uninstall(cls, package: str, output=False): def uninstall(cls, package: str, output=False):