Merge pull request #1533 from smartdevicelink/bugfix/fix_gen_tests

Fix RPC Generator Tests 

5 files changed, 30 insertions, 3 deletions

diff --git a/generator/test/runner.py b/generator/test/runner.py
index a6754d57e..4ea327901 100755
--- a/generator/test/runner.py
+++ b/generator/test/runner.py
@@ -33,7 +33,8 @@ def main():
     suite.addTests(TestLoader().loadTestsFromTestCase(CodeFormatAndQuality))
 
     runner = TextTestRunner(verbosity=2)
-    runner.run(suite)
+    ret = not runner.run(suite).wasSuccessful()
+    sys.exit(ret)
 
 
 if __name__ == '__main__':
diff --git a/generator/test/test_enums.py b/generator/test/test_enums.py
index cc4a1e0c8..950ec0013 100644
--- a/generator/test/test_enums.py
+++ b/generator/test/test_enums.py
@@ -46,6 +46,7 @@ class TestEnumsProducer(unittest.TestCase):
                 self.producer.params(name='PRIMARY_WIDGET', origin='PRIMARY_WIDGET', deprecated=True,
                                      internal=1, description=None, since=None, value=None),),
             'since': None,
+            'history': None,
             'deprecated': True
         }
         actual = self.producer.transform(item)
@@ -64,6 +65,7 @@ class TestEnumsProducer(unittest.TestCase):
                 self.producer.params(name='EN_US', origin='EN-US', internal='"EN-US"', description=None, since=None,
                                      value=None, deprecated=None),),
             'since': None,
+            'history': None,
             'deprecated': None,
             'imports': {'java.util.EnumSet'}
         }
@@ -87,6 +89,7 @@ class TestEnumsProducer(unittest.TestCase):
                                             internal=1, description=None, since=None, value=None,
                                             deprecated=None)),
             'since': None,
+            'history': None,
             'deprecated': None
         }
         actual = self.producer.transform(item)
@@ -107,6 +110,7 @@ class TestEnumsProducer(unittest.TestCase):
                                      value=None,
                                      deprecated=None),),
             'since': None,
+            'history': None,
             'deprecated': None
         }
         actual = self.producer.transform(item)
@@ -129,6 +133,7 @@ class TestEnumsProducer(unittest.TestCase):
                 self.producer.params(name='VEHICLE_DATA_NOT_AVAILABLE', origin='VEHICLE_DATA_NOT_AVAILABLE',
                                      internal=None, description=None, since='2.0.0', value=None, deprecated=None)),
             'since': None,
+            'history': None,
             'deprecated': None
         }
         actual = self.producer.transform(item)
@@ -147,6 +152,7 @@ class TestEnumsProducer(unittest.TestCase):
                 self.producer.params(name='CID', origin='CID', internal=None, description=None,
                                      since='3.0.0', value=None, deprecated=None),),
             'since': '5.0.0',
+            'history': None,
             'deprecated': True
         }
         actual = self.producer.transform(item)
@@ -165,6 +171,7 @@ class TestEnumsProducer(unittest.TestCase):
                 self.producer.params(name='TEXT', origin='TEXT', description=None,
                                      since=None, value=None, deprecated=None, internal=None),),
             'since': '1.0.0',
+            'history': None,
             'deprecated': None
         }
         actual = self.producer.transform(item)
@@ -183,6 +190,7 @@ class TestEnumsProducer(unittest.TestCase):
                 self.producer.params(name='TEXT', origin='TEXT', description=None,
                                      since=None, value=None, deprecated=None, internal=None),),
             'since': None,
+            'history': None,
             'deprecated': None
         }
         actual = self.producer.transform(item)
@@ -201,6 +209,7 @@ class TestEnumsProducer(unittest.TestCase):
                 self.producer.params(deprecated=None, value=None, description=None,
                                      name='OK', origin='OK', since=None, internal=None),),
             'since': None,
+            'history': None,
             'deprecated': None
         }
         actual = self.producer.transform(item)
@@ -222,6 +231,7 @@ class TestEnumsProducer(unittest.TestCase):
                 self.producer.params(deprecated=None, value=None, description=None,
                                      name='_2D', origin='2D', since=None, internal='"2D"'),),
             'since': None,
+            'history': None,
             'deprecated': None,
             'imports': {'java.util.EnumSet'}
         }
@@ -241,6 +251,7 @@ class TestEnumsProducer(unittest.TestCase):
                 self.producer.params(deprecated=None, value=None, description=None,
                                      name='NO_EVENT', origin='NO_EVENT', since=None, internal=None),),
             'since': None,
+            'history': None,
             'deprecated': None,
         }
         actual = self.producer.transform(item)
@@ -263,6 +274,7 @@ class TestEnumsProducer(unittest.TestCase):
                 self.producer.params(deprecated=None, value=None, description=None,
                                      name='NAVIGATION', origin='NAVIGATION', since=None, internal=None)),
             'since': None,
+            'history': None,
             'deprecated': None,
         }
         actual = self.producer.transform(item)
diff --git a/generator/test/test_functions.py b/generator/test/test_functions.py
index c722479a7..78a1eb607 100644
--- a/generator/test/test_functions.py
+++ b/generator/test/test_functions.py
@@ -62,6 +62,7 @@ class TestFunctionsProducer(unittest.TestCase):
         expected['function_id'] = 'GET_VEHICLE_DATA'
         expected['class_name'] = 'GetVehicleDataResponse'
         expected['extends_class'] = 'RPCResponse'
+        expected['history'] = None
         expected['imports'] = ['androidx.annotation.NonNull', '',
                                'com.smartdevicelink.protocol.enums.FunctionID',
                                'com.smartdevicelink.proxy.RPCResponse',
@@ -86,6 +87,7 @@ class TestFunctionsProducer(unittest.TestCase):
         expected['function_id'] = 'REGISTER_APP_INTERFACE'
         expected['class_name'] = 'RegisterAppInterfaceResponse'
         expected['extends_class'] = 'RPCResponse'
+        expected['history'] = None
         expected['imports'] = ['androidx.annotation.NonNull', '',
                                'com.smartdevicelink.protocol.enums.FunctionID', 'com.smartdevicelink.proxy.RPCResponse',
                                'com.smartdevicelink.proxy.rpc.enums.Language',
@@ -108,6 +110,7 @@ class TestFunctionsProducer(unittest.TestCase):
         expected['function_id'] = 'REGISTER_APP_INTERFACE'
         expected['class_name'] = 'RegisterAppInterface'
         expected['extends_class'] = 'RPCRequest'
+        expected['history'] = None
         expected['imports'] = ['androidx.annotation.NonNull', '',
                                'com.smartdevicelink.protocol.enums.FunctionID',
                                'com.smartdevicelink.proxy.RPCRequest',
@@ -139,6 +142,7 @@ class TestFunctionsProducer(unittest.TestCase):
         expected['function_id'] = 'PUT_FILE'
         expected['class_name'] = 'PutFile'
         expected['extends_class'] = 'RPCRequest'
+        expected['history'] = None
         expected['imports'] = ['androidx.annotation.NonNull', '',
                                'com.smartdevicelink.protocol.enums.FunctionID', 'com.smartdevicelink.proxy.RPCRequest',
                                'com.smartdevicelink.proxy.rpc.enums.FileType', '', 'java.util.Hashtable']
@@ -163,6 +167,7 @@ class TestFunctionsProducer(unittest.TestCase):
         expected['function_id'] = 'ON_ENCODED_SYNC_PDATA'
         expected['class_name'] = 'OnEncodedSyncPData'
         expected['extends_class'] = 'RPCNotification'
+        expected['history'] = None
         expected['imports'] = ['androidx.annotation.NonNull', '',
                                'com.smartdevicelink.protocol.enums.FunctionID',
                                'com.smartdevicelink.proxy.RPCNotification', '', 'java.util.Hashtable']
@@ -184,6 +189,7 @@ class TestFunctionsProducer(unittest.TestCase):
         expected['function_id'] = 'DELETE_COMMAND'
         expected['class_name'] = 'DeleteCommand'
         expected['extends_class'] = 'RPCRequest'
+        expected['history'] = None
         expected['imports'] = ['androidx.annotation.NonNull', '',
                                'com.smartdevicelink.protocol.enums.FunctionID', 'com.smartdevicelink.proxy.RPCRequest',
                                '', 'java.util.Hashtable']
@@ -204,6 +210,7 @@ class TestFunctionsProducer(unittest.TestCase):
         expected['function_id'] = 'ALERT'
         expected['class_name'] = 'Alert'
         expected['extends_class'] = 'RPCRequest'
+        expected['history'] = None
         expected['imports'] = ['androidx.annotation.NonNull', '',
                                'com.smartdevicelink.protocol.enums.FunctionID',
                                'com.smartdevicelink.proxy.RPCRequest', '', 'java.util.Hashtable']
@@ -225,6 +232,7 @@ class TestFunctionsProducer(unittest.TestCase):
         expected['function_id'] = 'RELEASE_INTERIOR_VEHICLE_DATA_MODULE'
         expected['class_name'] = 'ReleaseInteriorVehicleDataModule'
         expected['extends_class'] = 'RPCRequest'
+        expected['history'] = None
         expected['imports'] = ['androidx.annotation.NonNull', '',
                                'com.smartdevicelink.protocol.enums.FunctionID',
                                'com.smartdevicelink.proxy.RPCRequest', '', 'java.util.Hashtable']
diff --git a/generator/test/test_structs.py b/generator/test/test_structs.py
index 9ec378013..6844abf1b 100644
--- a/generator/test/test_structs.py
+++ b/generator/test/test_structs.py
@@ -45,6 +45,7 @@ class TestStructsProducer(unittest.TestCase):
                         'com.smartdevicelink.util.SdlDataTypeConverter', '', 'java.util.Hashtable'],
             'deprecated': None,
             'since': None,
+            'history': None,
             'params': (self.producer.params(deprecated=None, key='KEY_RANGE',
                                             last='range', mandatory=True,
                                             origin='range', return_type='Float',
@@ -72,6 +73,7 @@ class TestStructsProducer(unittest.TestCase):
                         'java.util.Hashtable', 'java.util.List'],
             'deprecated': None,
             'since': None,
+            'history': None,
             'params': (self.producer.params(deprecated=None, key='KEY_NICKNAMES',
                                             last='nicknames', mandatory=True,
                                             origin='nicknames', return_type='List<String>', name=None,
@@ -91,6 +93,7 @@ class TestStructsProducer(unittest.TestCase):
             'class_name': 'SoftButton',
             'extends_class': 'RPCStruct',
             'since': None,
+            'history': None,
             'deprecated': None,
             'description': ['Describes different audio type configurations for '
                             'PerformAudioPassThru.'],
@@ -112,6 +115,7 @@ class TestStructsProducer(unittest.TestCase):
             'class_name': 'OASISAddress',
             'extends_class': 'RPCStruct',
             'since': None,
+            'history': None,
             'deprecated': None,
             'params': (
                 self.producer.params(deprecated=None, key='KEY_COUNTRY_NAME', last='countryName', mandatory=True,
@@ -132,6 +136,7 @@ class TestStructsProducer(unittest.TestCase):
             'class_name': 'LocationDetails',
             'extends_class': 'RPCStruct',
             'since': None,
+            'history': None,
             'deprecated': None,
             'params': (
                 self.producer.params(deprecated=None, key='KEY_SEARCH_ADDRESS', last='searchAddress', mandatory=True,
@@ -152,6 +157,7 @@ class TestStructsProducer(unittest.TestCase):
             'class_name': 'SingleTireStatus',
             'extends_class': 'RPCStruct',
             'since': None,
+            'history': None,
             'deprecated': None,
             'params': (
                 self.producer.params(deprecated=None, key='KEY_TPMS', last='tpms', mandatory=True, origin='tpms',
diff --git a/generator/transformers/common_producer.py b/generator/transformers/common_producer.py
index efd89e2a8..f5f9286b6 100644
--- a/generator/transformers/common_producer.py
+++ b/generator/transformers/common_producer.py
@@ -80,7 +80,7 @@ class InterfaceProducerCommon(ABC):
 
     @staticmethod
     def extract_values(param):
-        p = OrderedDict()    
+        p = OrderedDict()
         if hasattr(param.param_type, 'min_size'):
             p['array_min_size'] = param.param_type.min_size
         if hasattr(param.param_type, 'max_size'):
@@ -93,7 +93,7 @@ class InterfaceProducerCommon(ABC):
         elif hasattr(param.param_type, 'default_value'):
             if hasattr(param.param_type.default_value, 'name'):
                 p['default_value'] = param.param_type.default_value.name
-            else:  
+            else:
                 p['default_value'] = param.param_type.default_value
         if hasattr(param.param_type, 'min_value'):
             p['num_min_value'] = param.param_type.min_value