diff options
-rw-r--r-- | .github/workflows/test.yml | 2 | ||||
-rw-r--r-- | generator/test/test_enums.py | 6 | ||||
-rw-r--r-- | generator/test/test_functions.py | 34 | ||||
-rw-r--r-- | generator/test/test_structs.py | 20 |
4 files changed, 39 insertions, 23 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 66194f630..93b939aed 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -80,7 +80,7 @@ jobs: yml: ./codecov.yml rpcTest: - name: RPCSpecGeneratorTests + name: RPC Generator Tests runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/generator/test/test_enums.py b/generator/test/test_enums.py index c68b90b66..175d83400 100644 --- a/generator/test/test_enums.py +++ b/generator/test/test_enums.py @@ -44,10 +44,8 @@ class TestEnumsProducer(TestCase): expected['origin'] = 'FunctionID' expected['name'] = 'SDLFunctionID' expected['imports'] = { - '.h': { - 'SDLEnum'}, - '.m': [ - 'SDLEnum']} + '.h': {'SDLEnum'}, + '.m': ['SDLEnum']} expected['history'] = None expected['params'] = ( self.producer.param_named(history=None, description=[], name='Reserved', origin='RESERVED', since=None, deprecated=False), diff --git a/generator/test/test_functions.py b/generator/test/test_functions.py index e320e57c9..d2b885e21 100644 --- a/generator/test/test_functions.py +++ b/generator/test/test_functions.py @@ -131,12 +131,13 @@ class TestFunctionsProducer(TestCase): expected['extends_class'] = 'SDLRPCRequest' expected['imports'] = { '.h': { - 'enum': [ - 'SDLRPCRequest'], + 'enum': ['SDLRPCRequest'], 'struct': [ 'SDLSdlMsgVersion', 'SDLTTSChunk', - 'SDLTemplateColorScheme']}, + 'SDLTemplateColorScheme' + ] + }, '.m': [ 'NSMutableDictionary+Store', 'SDLRPCFunctionNames', @@ -144,7 +145,9 @@ class TestFunctionsProducer(TestCase): 'SDLRegisterAppInterface', 'SDLSdlMsgVersion', 'SDLTTSChunk', - 'SDLTemplateColorScheme']} + 'SDLTemplateColorScheme' + ] + } expected['history'] = None expected['description'] = ['Establishes an interface with a mobile application. Before registerAppInterface no ' 'other commands will be accepted/executed.'] @@ -241,14 +244,17 @@ class TestFunctionsProducer(TestCase): '.h': { 'enum': [ 'SDLLanguage', - 'SDLRPCResponse'], + 'SDLRPCResponse' + ], 'struct': []}, '.m': [ 'NSMutableDictionary+Store', 'SDLLanguage', 'SDLRPCFunctionNames', 'SDLRPCParameterNames', - 'SDLRegisterAppInterface']} + 'SDLRegisterAppInterface' + ] + } expected['history'] = None expected['description'] = ['The response'] expected['params'] = ( @@ -314,7 +320,9 @@ class TestFunctionsProducer(TestCase): 'NSMutableDictionary+Store', 'SDLOnHMIStatus', 'SDLRPCFunctionNames', - 'SDLRPCParameterNames']} + 'SDLRPCParameterNames' + ] + } expected['history'] = None expected['params'] = ( self.producer.param_named( @@ -361,7 +369,9 @@ class TestFunctionsProducer(TestCase): 'NSMutableDictionary+Store', 'SDLCreateWindow', 'SDLRPCFunctionNames', - 'SDLRPCParameterNames']} + 'SDLRPCParameterNames' + ] + } expected['history'] = None expected['params'] = ( self.producer.param_named( @@ -458,7 +468,9 @@ class TestFunctionsProducer(TestCase): 'SDLChoice', 'SDLCreateInteractionChoiceSet', 'SDLRPCFunctionNames', - 'SDLRPCParameterNames']} + 'SDLRPCParameterNames' + ] + } expected['history'] = None expected['params'] = ( self.producer.param_named( @@ -505,7 +517,9 @@ class TestFunctionsProducer(TestCase): 'NSMutableDictionary+Store', 'SDLRPCFunctionNames', 'SDLRPCParameterNames', - 'SDLSetDisplayLayout']} + 'SDLSetDisplayLayout' + ] + } expected['history'] = '3.0.0' expected['since'] = '6.0.0' expected['deprecated'] = True diff --git a/generator/test/test_structs.py b/generator/test/test_structs.py index 8d4c1e173..0c33ebf3f 100644 --- a/generator/test/test_structs.py +++ b/generator/test/test_structs.py @@ -46,13 +46,15 @@ class TestStructsProducer(TestCase): expected['extends_class'] = 'SDLRPCStruct' expected['imports'] = { '.h': { - 'enum': [ - 'SDLRPCStruct'], - 'struct': []}, + 'enum': ['SDLRPCStruct'], + 'struct': [] + }, '.m': [ 'NSMutableDictionary+Store', 'SDLCloudAppProperties', - 'SDLRPCParameterNames']} + 'SDLRPCParameterNames' + ] + } expected['history'] = None expected['params'] = ( self.producer.param_named( @@ -98,13 +100,15 @@ class TestStructsProducer(TestCase): expected['extends_class'] = 'SDLRPCStruct' expected['imports'] = { '.h': { - 'enum': [ - 'SDLRPCStruct'], - 'struct': []}, + 'enum': ['SDLRPCStruct'], + 'struct': [] + }, '.m': [ 'NSMutableDictionary+Store', 'SDLRPCParameterNames', - 'SDLTouchEvent']} + 'SDLTouchEvent' + ] + } expected['history'] = None expected['params'] = ( self.producer.param_named( |