fixed tests

Author: Kostiantyn Sologubov

generator/test/test_enums.py

@@ -4,14 +4,16 @@
 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):
     def setUp(self):
         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()))

generator/test/test_functions.py

@@ -13,6 +13,7 @@
 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 @@ def setUp(self):
         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']))

generator/test/test_structs.py

@@ -8,6 +8,7 @@
 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 @@ def setUp(self):
         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']))

generator/transformers/functions_producer.py

@@ -136,7 +136,7 @@ def extract_param(self, param: Param):
             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))