2022.6 #88

Merged
edraft merged 158 commits from 2022.6 into master 2022-06-29 17:50:07 +02:00
4 changed files with 61 additions and 14 deletions
Showing only changes of commit 9b56650d4b - Show all commits

View File

@ -1,10 +1,52 @@
import json
import os
import shutil
import unittest
from cpl_core.utils import String
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_shared.cli_commands import CLICommands
class AddTestCase(unittest.TestCase):
def setUp(self):
pass
def __init__(self, methodName: str):
unittest.TestCase.__init__(self, methodName)
self._source = 'add-test-project'
self._target = 'add-test-library'
self._project_file = f'src/{String.convert_to_snake_case(self._source)}/{self._source}.json'
def test_equal(self):
pass
def _get_project_settings(self):
with open(os.path.join(os.getcwd(), self._project_file), 'r', encoding='utf-8') as cfg:
# load json
project_json = json.load(cfg)
cfg.close()
return project_json
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))
CLICommands.new('console', self._target, '--ab', '--s')
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_add(self):
CLICommands.add(self._source, self._target)
settings = self._get_project_settings()
self.assertNotEqual(settings, {})
self.assertIn('ProjectSettings', settings)
self.assertIn('ProjectReferences', settings['BuildSettings'])
self.assertIn('BuildSettings', settings)
self.assertIn(
f'../{String.convert_to_snake_case(self._target)}/{self._target}.json',
settings['BuildSettings']['ProjectReferences']
)

View File

@ -5,6 +5,7 @@ import unittest
from typing import Optional
from unittest import TestResult
from unittests_cli.add_test_case import AddTestCase
from unittests_cli.constants import PLAYGROUND_PATH
from unittests_cli.generate_test_case import GenerateTestCase
from unittests_cli.new_test_case import NewTestCase
@ -32,7 +33,7 @@ class CLITestSuite(unittest.TestSuite):
# self.addTests(loader.loadTestsFromTestCase(UpdateTestCase))
# workspace needed
# self.addTests(loader.loadTestsFromTestCase(AddTestCase))
self.addTests(loader.loadTestsFromTestCase(AddTestCase))
# self.addTests(loader.loadTestsFromTestCase(RemoveTestCase))
def _setup(self):

View File

@ -17,6 +17,10 @@ class CLICommands:
subprocess.run(command, env=env_vars)
@classmethod
def add(cls, source: str, target: str):
cls._run('add', source, target)
@classmethod
def generate(cls, schematic: str, name: str, output=False):
cls._run('generate', schematic, name, output=output)