Skip to content

Commit aa017fb

Browse files
author
Robert Henigan
authored
Merge pull request #1533 from smartdevicelink/bugfix/fix_gen_tests
Fix RPC Generator Tests
2 parents 353531d + 5805204 commit aa017fb

5 files changed

Lines changed: 30 additions & 3 deletions

File tree

‎generator/test/runner.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ def main():
3333
suite.addTests(TestLoader().loadTestsFromTestCase(CodeFormatAndQuality))
3434

3535
runner = TextTestRunner(verbosity=2)
36-
runner.run(suite)
36+
ret = not runner.run(suite).wasSuccessful()
37+
sys.exit(ret)
3738

3839

3940
if __name__ == '__main__':

‎generator/test/test_enums.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ def test_deprecated(self):
4646
self.producer.params(name='PRIMARY_WIDGET', origin='PRIMARY_WIDGET', deprecated=True,
4747
internal=1, description=None, since=None, value=None),),
4848
'since': None,
49+
'history': None,
4950
'deprecated': True
5051
}
5152
actual = self.producer.transform(item)
@@ -64,6 +65,7 @@ def test_Language(self):
6465
self.producer.params(name='EN_US', origin='EN-US', internal='"EN-US"', description=None, since=None,
6566
value=None, deprecated=None),),
6667
'since': None,
68+
'history': None,
6769
'deprecated': None,
6870
'imports': {'java.util.EnumSet'}
6971
}
@@ -87,6 +89,7 @@ def test_PredefinedWindows(self):
8789
internal=1, description=None, since=None, value=None,
8890
deprecated=None)),
8991
'since': None,
92+
'history': None,
9093
'deprecated': None
9194
}
9295
actual = self.producer.transform(item)
@@ -107,6 +110,7 @@ def test_SamplingRate(self):
107110
value=None,
108111
deprecated=None),),
109112
'since': None,
113+
'history': None,
110114
'deprecated': None
111115
}
112116
actual = self.producer.transform(item)
@@ -129,6 +133,7 @@ def test_Result(self):
129133
self.producer.params(name='VEHICLE_DATA_NOT_AVAILABLE', origin='VEHICLE_DATA_NOT_AVAILABLE',
130134
internal=None, description=None, since='2.0.0', value=None, deprecated=None)),
131135
'since': None,
136+
'history': None,
132137
'deprecated': None
133138
}
134139
actual = self.producer.transform(item)
@@ -147,6 +152,7 @@ def test_DisplayType(self):
147152
self.producer.params(name='CID', origin='CID', internal=None, description=None,
148153
since='3.0.0', value=None, deprecated=None),),
149154
'since': '5.0.0',
155+
'history': None,
150156
'deprecated': True
151157
}
152158
actual = self.producer.transform(item)
@@ -165,6 +171,7 @@ def test_SpeechCapabilities(self):
165171
self.producer.params(name='TEXT', origin='TEXT', description=None,
166172
since=None, value=None, deprecated=None, internal=None),),
167173
'since': '1.0.0',
174+
'history': None,
168175
'deprecated': None
169176
}
170177
actual = self.producer.transform(item)
@@ -183,6 +190,7 @@ def test_VrCapabilities1(self):
183190
self.producer.params(name='TEXT', origin='TEXT', description=None,
184191
since=None, value=None, deprecated=None, internal=None),),
185192
'since': None,
193+
'history': None,
186194
'deprecated': None
187195
}
188196
actual = self.producer.transform(item)
@@ -201,6 +209,7 @@ def test_ButtonName(self):
201209
self.producer.params(deprecated=None, value=None, description=None,
202210
name='OK', origin='OK', since=None, internal=None),),
203211
'since': None,
212+
'history': None,
204213
'deprecated': None
205214
}
206215
actual = self.producer.transform(item)
@@ -222,6 +231,7 @@ def test_Dimension(self):
222231
self.producer.params(deprecated=None, value=None, description=None,
223232
name='_2D', origin='2D', since=None, internal='"2D"'),),
224233
'since': None,
234+
'history': None,
225235
'deprecated': None,
226236
'imports': {'java.util.EnumSet'}
227237
}
@@ -241,6 +251,7 @@ def test_VehicleDataEventStatus(self):
241251
self.producer.params(deprecated=None, value=None, description=None,
242252
name='NO_EVENT', origin='NO_EVENT', since=None, internal=None),),
243253
'since': None,
254+
'history': None,
244255
'deprecated': None,
245256
}
246257
actual = self.producer.transform(item)
@@ -263,6 +274,7 @@ def test_SystemCapabilityType(self):
263274
self.producer.params(deprecated=None, value=None, description=None,
264275
name='NAVIGATION', origin='NAVIGATION', since=None, internal=None)),
265276
'since': None,
277+
'history': None,
266278
'deprecated': None,
267279
}
268280
actual = self.producer.transform(item)

‎generator/test/test_functions.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def test_GetVehicleDataResponse(self):
6262
expected['function_id'] = 'GET_VEHICLE_DATA'
6363
expected['class_name'] = 'GetVehicleDataResponse'
6464
expected['extends_class'] = 'RPCResponse'
65+
expected['history'] = None
6566
expected['imports'] = ['androidx.annotation.NonNull', '',
6667
'com.smartdevicelink.protocol.enums.FunctionID',
6768
'com.smartdevicelink.proxy.RPCResponse',
@@ -86,6 +87,7 @@ def test_RegisterAppInterfaceResponse(self):
8687
expected['function_id'] = 'REGISTER_APP_INTERFACE'
8788
expected['class_name'] = 'RegisterAppInterfaceResponse'
8889
expected['extends_class'] = 'RPCResponse'
90+
expected['history'] = None
8991
expected['imports'] = ['androidx.annotation.NonNull', '',
9092
'com.smartdevicelink.protocol.enums.FunctionID', 'com.smartdevicelink.proxy.RPCResponse',
9193
'com.smartdevicelink.proxy.rpc.enums.Language',
@@ -108,6 +110,7 @@ def test_RegisterAppInterface(self):
108110
expected['function_id'] = 'REGISTER_APP_INTERFACE'
109111
expected['class_name'] = 'RegisterAppInterface'
110112
expected['extends_class'] = 'RPCRequest'
113+
expected['history'] = None
111114
expected['imports'] = ['androidx.annotation.NonNull', '',
112115
'com.smartdevicelink.protocol.enums.FunctionID',
113116
'com.smartdevicelink.proxy.RPCRequest',
@@ -139,6 +142,7 @@ def test_PutFileRequest(self):
139142
expected['function_id'] = 'PUT_FILE'
140143
expected['class_name'] = 'PutFile'
141144
expected['extends_class'] = 'RPCRequest'
145+
expected['history'] = None
142146
expected['imports'] = ['androidx.annotation.NonNull', '',
143147
'com.smartdevicelink.protocol.enums.FunctionID', 'com.smartdevicelink.proxy.RPCRequest',
144148
'com.smartdevicelink.proxy.rpc.enums.FileType', '', 'java.util.Hashtable']
@@ -163,6 +167,7 @@ def test_OnEncodedSyncPDataNotification(self):
163167
expected['function_id'] = 'ON_ENCODED_SYNC_PDATA'
164168
expected['class_name'] = 'OnEncodedSyncPData'
165169
expected['extends_class'] = 'RPCNotification'
170+
expected['history'] = None
166171
expected['imports'] = ['androidx.annotation.NonNull', '',
167172
'com.smartdevicelink.protocol.enums.FunctionID',
168173
'com.smartdevicelink.proxy.RPCNotification', '', 'java.util.Hashtable']
@@ -184,6 +189,7 @@ def test_DeleteCommand(self):
184189
expected['function_id'] = 'DELETE_COMMAND'
185190
expected['class_name'] = 'DeleteCommand'
186191
expected['extends_class'] = 'RPCRequest'
192+
expected['history'] = None
187193
expected['imports'] = ['androidx.annotation.NonNull', '',
188194
'com.smartdevicelink.protocol.enums.FunctionID', 'com.smartdevicelink.proxy.RPCRequest',
189195
'', 'java.util.Hashtable']
@@ -204,6 +210,7 @@ def test_Alert(self):
204210
expected['function_id'] = 'ALERT'
205211
expected['class_name'] = 'Alert'
206212
expected['extends_class'] = 'RPCRequest'
213+
expected['history'] = None
207214
expected['imports'] = ['androidx.annotation.NonNull', '',
208215
'com.smartdevicelink.protocol.enums.FunctionID',
209216
'com.smartdevicelink.proxy.RPCRequest', '', 'java.util.Hashtable']
@@ -225,6 +232,7 @@ def test_ReleaseInteriorVehicleDataModule(self):
225232
expected['function_id'] = 'RELEASE_INTERIOR_VEHICLE_DATA_MODULE'
226233
expected['class_name'] = 'ReleaseInteriorVehicleDataModule'
227234
expected['extends_class'] = 'RPCRequest'
235+
expected['history'] = None
228236
expected['imports'] = ['androidx.annotation.NonNull', '',
229237
'com.smartdevicelink.protocol.enums.FunctionID',
230238
'com.smartdevicelink.proxy.RPCRequest', '', 'java.util.Hashtable']

‎generator/test/test_structs.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def test_AudioPassThruCapabilities(self):
4545
'com.smartdevicelink.util.SdlDataTypeConverter', '', 'java.util.Hashtable'],
4646
'deprecated': None,
4747
'since': None,
48+
'history': None,
4849
'params': (self.producer.params(deprecated=None, key='KEY_RANGE',
4950
last='range', mandatory=True,
5051
origin='range', return_type='Float',
@@ -72,6 +73,7 @@ def test_CloudAppProperties(self):
7273
'java.util.Hashtable', 'java.util.List'],
7374
'deprecated': None,
7475
'since': None,
76+
'history': None,
7577
'params': (self.producer.params(deprecated=None, key='KEY_NICKNAMES',
7678
last='nicknames', mandatory=True,
7779
origin='nicknames', return_type='List<String>', name=None,
@@ -91,6 +93,7 @@ def test_SoftButton(self):
9193
'class_name': 'SoftButton',
9294
'extends_class': 'RPCStruct',
9395
'since': None,
96+
'history': None,
9497
'deprecated': None,
9598
'description': ['Describes different audio type configurations for '
9699
'PerformAudioPassThru.'],
@@ -112,6 +115,7 @@ def test_OASISAddress(self):
112115
'class_name': 'OASISAddress',
113116
'extends_class': 'RPCStruct',
114117
'since': None,
118+
'history': None,
115119
'deprecated': None,
116120
'params': (
117121
self.producer.params(deprecated=None, key='KEY_COUNTRY_NAME', last='countryName', mandatory=True,
@@ -132,6 +136,7 @@ def test_LocationDetails(self):
132136
'class_name': 'LocationDetails',
133137
'extends_class': 'RPCStruct',
134138
'since': None,
139+
'history': None,
135140
'deprecated': None,
136141
'params': (
137142
self.producer.params(deprecated=None, key='KEY_SEARCH_ADDRESS', last='searchAddress', mandatory=True,
@@ -152,6 +157,7 @@ def test_SingleTireStatus(self):
152157
'class_name': 'SingleTireStatus',
153158
'extends_class': 'RPCStruct',
154159
'since': None,
160+
'history': None,
155161
'deprecated': None,
156162
'params': (
157163
self.producer.params(deprecated=None, key='KEY_TPMS', last='tpms', mandatory=True, origin='tpms',

‎generator/transformers/common_producer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def extract_description(d):
8080

8181
@staticmethod
8282
def extract_values(param):
83-
p = OrderedDict()
83+
p = OrderedDict()
8484
if hasattr(param.param_type, 'min_size'):
8585
p['array_min_size'] = param.param_type.min_size
8686
if hasattr(param.param_type, 'max_size'):
@@ -93,7 +93,7 @@ def extract_values(param):
9393
elif hasattr(param.param_type, 'default_value'):
9494
if hasattr(param.param_type.default_value, 'name'):
9595
p['default_value'] = param.param_type.default_value.name
96-
else:
96+
else:
9797
p['default_value'] = param.param_type.default_value
9898
if hasattr(param.param_type, 'min_value'):
9999
p['num_min_value'] = param.param_type.min_value

0 commit comments

Comments
 (0)