diff options
author | Kostiantyn Sologubov <ksologubov@luxoft.com> | 2020-04-09 12:13:28 +0300 |
---|---|---|
committer | Kostiantyn Sologubov <ksologubov@luxoft.com> | 2020-04-09 12:13:28 +0300 |
commit | 7a4ff35bf41fbaff7a021e71c3dd826c0f6a5e4b (patch) | |
tree | 8cbb84491b254ff96a9944bbfb934d32873a5352 | |
parent | 56408fc28c57ebf54353ff0d727ebd445f7e938d (diff) | |
download | sdl_android-7a4ff35bf41fbaff7a021e71c3dd826c0f6a5e4b.tar.gz |
fixed tests
-rw-r--r-- | generator/test/test_enums.py | 4 | ||||
-rw-r--r-- | generator/test/test_functions.py | 4 | ||||
-rw-r--r-- | generator/test/test_structs.py | 4 | ||||
-rw-r--r-- | generator/transformers/functions_producer.py | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/generator/test/test_enums.py b/generator/test/test_enums.py index 6d03cfa41..cc4a1e0c8 100644 --- a/generator/test/test_enums.py +++ b/generator/test/test_enums.py @@ -4,6 +4,7 @@ from collections import namedtuple, OrderedDict from model.enum import Enum from model.enum_element import EnumElement from transformers.enums_producer import EnumsProducer +from generator import Generator class TestEnumsProducer(unittest.TestCase): @@ -11,7 +12,8 @@ class TestEnumsProducer(unittest.TestCase): self.maxDiff = None Paths = namedtuple('Prop', 'enums_package') paths = Paths(enums_package='com.smartdevicelink.proxy.rpc.enums') - self.producer = EnumsProducer(paths) + keywords = Generator().get_key_words() + self.producer = EnumsProducer(paths, keywords) def comparison(self, expected, actual): actual = OrderedDict(sorted(actual.items())) diff --git a/generator/test/test_functions.py b/generator/test/test_functions.py index d6a932141..66e23a361 100644 --- a/generator/test/test_functions.py +++ b/generator/test/test_functions.py @@ -13,6 +13,7 @@ from model.param import Param from model.string import String from model.struct import Struct from transformers.functions_producer import FunctionsProducer +from generator import Generator class TestFunctionsProducer(unittest.TestCase): @@ -33,7 +34,8 @@ class TestFunctionsProducer(unittest.TestCase): self.expected_template['deprecated'] = None enum_names = ('FileType', 'Language') struct_names = ('SdlMsgVersion', 'TemplateColorScheme', 'TTSChunk', 'Choice') - self.producer = FunctionsProducer(paths, enum_names, struct_names) + keywords = Generator().get_key_words() + self.producer = FunctionsProducer(paths, enum_names, struct_names, keywords) def comparison(self, expected, actual): actual_params = dict(zip(map(lambda k: k.title, actual['params']), actual['params'])) diff --git a/generator/test/test_structs.py b/generator/test/test_structs.py index b8985cba8..079f1325b 100644 --- a/generator/test/test_structs.py +++ b/generator/test/test_structs.py @@ -8,6 +8,7 @@ from model.param import Param from model.string import String from model.struct import Struct from transformers.structs_producer import StructsProducer +from generator import Generator class TestStructsProducer(unittest.TestCase): @@ -17,7 +18,8 @@ class TestStructsProducer(unittest.TestCase): paths = Paths(enums_package='com.smartdevicelink.proxy.rpc.enums', structs_package='com.smartdevicelink.proxy.rpc', struct_class='com.smartdevicelink.proxy.RPCStruct') - self.producer = StructsProducer(paths, ['SamplingRate'], ('Image',)) + keywords = Generator().get_key_words() + self.producer = StructsProducer(paths, ['SamplingRate'], ('Image',), keywords) def comparison(self, expected, actual): actual_params = dict(zip(map(lambda k: k.origin, actual['params']), actual['params'])) diff --git a/generator/transformers/functions_producer.py b/generator/transformers/functions_producer.py index 5f692a4d0..df8ab2936 100644 --- a/generator/transformers/functions_producer.py +++ b/generator/transformers/functions_producer.py @@ -136,7 +136,7 @@ class FunctionsProducer(InterfaceProducerCommon): tr = t.replace('List<', '').rstrip('>') if t.startswith('Float'): imports.add('com.smartdevicelink.util.SdlDataTypeConverter') - p['return_type'] = self.replace_keywords(t) + p['return_type'] = self.replace_sync(t) if tr in self.enum_names: imports.add('{}.{}'.format(self.enums_package, tr)) |