diff options
author | NicoleYarroch <nicole@livio.io> | 2019-03-12 11:04:19 -0400 |
---|---|---|
committer | NicoleYarroch <nicole@livio.io> | 2019-03-12 11:04:19 -0400 |
commit | 4d677111b015e7c4f39844b787f734251aecc164 (patch) | |
tree | a09922935e0923884a490aea3794b461a9d1e522 | |
parent | 19dd8c1ce0b3d7476d6211c171a33d4de53636d1 (diff) | |
download | sdl_ios-4d677111b015e7c4f39844b787f734251aecc164.tar.gz |
Fixed parameter names
29 files changed, 140 insertions, 99 deletions
diff --git a/SmartDeviceLink/SDLCloudAppProperties.m b/SmartDeviceLink/SDLCloudAppProperties.m index 28568a19a..ed0486fb0 100644 --- a/SmartDeviceLink/SDLCloudAppProperties.m +++ b/SmartDeviceLink/SDLCloudAppProperties.m @@ -9,7 +9,7 @@ #import "SDLCloudAppProperties.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -44,59 +44,59 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setNicknames:(nullable NSArray<NSString *> *)nicknames { - [store sdl_setObject:nicknames forName:SDLNameNicknames]; + [store sdl_setObject:nicknames forName:SDLRPCParameterNameNicknames]; } - (nullable NSArray<NSString *> *)nicknames { - return [store sdl_objectForName:SDLNameNicknames]; + return [store sdl_objectForName:SDLRPCParameterNameNicknames]; } - (void)setAppID:(NSString *)appID { - [store sdl_setObject:appID forName:SDLNameAppId]; + [store sdl_setObject:appID forName:SDLRPCParameterNameAppId]; } - (NSString *)appID { - return [store sdl_objectForName:SDLNameAppId]; + return [store sdl_objectForName:SDLRPCParameterNameAppId]; } - (void)setEnabled:(nullable NSNumber<SDLBool> *)enabled { - [store sdl_setObject:enabled forName:SDLNameEnabled]; + [store sdl_setObject:enabled forName:SDLRPCParameterNameEnabled]; } - (nullable NSNumber<SDLBool> *)enabled { - return [store sdl_objectForName:SDLNameEnabled]; + return [store sdl_objectForName:SDLRPCParameterNameEnabled]; } - (void)setAuthToken:(nullable NSString *)authToken { - [store sdl_setObject:authToken forName:SDLNameAuthToken]; + [store sdl_setObject:authToken forName:SDLRPCParameterNameAuthToken]; } - (nullable NSString *)authToken { - return [store sdl_objectForName:SDLNameAuthToken]; + return [store sdl_objectForName:SDLRPCParameterNameAuthToken]; } - (void)setCloudTransportType:(nullable NSString *)cloudTransportType { - [store sdl_setObject:cloudTransportType forName:SDLNameCloudTransportType]; + [store sdl_setObject:cloudTransportType forName:SDLRPCParameterNameCloudTransportType]; } - (nullable NSString *)cloudTransportType { - return [store sdl_objectForName:SDLNameCloudTransportType]; + return [store sdl_objectForName:SDLRPCParameterNameCloudTransportType]; } - (void)setHybridAppPreference:(nullable SDLHybridAppPreference)hybridAppPreference { - [store sdl_setObject:hybridAppPreference forName:SDLNameHybridAppPreference]; + [store sdl_setObject:hybridAppPreference forName:SDLRPCParameterNameHybridAppPreference]; } - (nullable SDLHybridAppPreference)hybridAppPreference { - return [store sdl_objectForName:SDLNameHybridAppPreference]; + return [store sdl_objectForName:SDLRPCParameterNameHybridAppPreference]; } - (void)setEndpoint:(nullable NSString *)endpoint { - [store sdl_setObject:endpoint forName:SDLNameEndpoint]; + [store sdl_setObject:endpoint forName:SDLRPCParameterNameEndpoint]; } - (nullable NSString *)endpoint { - return [store sdl_objectForName:SDLNameEndpoint]; + return [store sdl_objectForName:SDLRPCParameterNameEndpoint]; } @end diff --git a/SmartDeviceLink/SDLFunctionID.m b/SmartDeviceLink/SDLFunctionID.m index 805683a57..d90390132 100644 --- a/SmartDeviceLink/SDLFunctionID.m +++ b/SmartDeviceLink/SDLFunctionID.m @@ -82,6 +82,8 @@ NS_ASSUME_NONNULL_BEGIN @47: SDLRPCFunctionNameUnsubscribeWayPoints, @48: SDLRPCFunctionNameGetSystemCapability, @49: SDLRPCFunctionNameSendHapticData, + @50: SDLRPCFunctionNameSetCloudAppProperties, + @51: SDLRPCFunctionNameGetCloudAppProperties, @52: SDLRPCFunctionNamePublishAppService, @53: SDLRPCFunctionNameGetAppServiceData, @54: SDLRPCFunctionNameGetFile, diff --git a/SmartDeviceLink/SDLGetCloudAppProperties.m b/SmartDeviceLink/SDLGetCloudAppProperties.m index ff0c7e86e..5d000d716 100644 --- a/SmartDeviceLink/SDLGetCloudAppProperties.m +++ b/SmartDeviceLink/SDLGetCloudAppProperties.m @@ -9,14 +9,15 @@ #import "SDLGetCloudAppProperties.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLGetCloudAppProperties - (instancetype)init { - if (self = [super initWithName:SDLNameGetCloudAppProperties]) { + if (self = [super initWithName:SDLRPCFunctionNameGetCloudAppProperties]) { } return self; } @@ -33,11 +34,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setAppID:(NSString *)appID { - [parameters sdl_setObject:appID forName:SDLNameAppId]; + [parameters sdl_setObject:appID forName:SDLRPCParameterNameAppId]; } - (NSString *)appID { - return [parameters sdl_objectForName:SDLNameAppId]; + return [parameters sdl_objectForName:SDLRPCParameterNameAppId]; } @end diff --git a/SmartDeviceLink/SDLGetCloudAppPropertiesResponse.m b/SmartDeviceLink/SDLGetCloudAppPropertiesResponse.m index f7aa9fe5b..ae71ab73c 100644 --- a/SmartDeviceLink/SDLGetCloudAppPropertiesResponse.m +++ b/SmartDeviceLink/SDLGetCloudAppPropertiesResponse.m @@ -10,7 +10,8 @@ #import "NSMutableDictionary+Store.h" #import "SDLCloudAppProperties.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @@ -18,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLGetCloudAppPropertiesResponse - (instancetype)init { - if (self = [super initWithName:SDLNameGetCloudAppProperties]) { + if (self = [super initWithName:SDLRPCFunctionNameGetCloudAppProperties]) { } return self; } @@ -35,11 +36,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setProperties:(nullable SDLCloudAppProperties *)properties { - [parameters sdl_setObject:properties forName:SDLNameProperties]; + [parameters sdl_setObject:properties forName:SDLRPCParameterNameProperties]; } - (nullable SDLCloudAppProperties *)properties { - return [parameters sdl_objectForName:SDLNameProperties ofClass:SDLCloudAppProperties.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameProperties ofClass:SDLCloudAppProperties.class]; } @end diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m index 3520b9d0d..9f1fe5de6 100644 --- a/SmartDeviceLink/SDLGetVehicleData.m +++ b/SmartDeviceLink/SDLGetVehicleData.m @@ -299,11 +299,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setCloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID { - [parameters sdl_setObject:cloudAppVehicleID forName:SDLNameCloudAppVehicleID]; + [parameters sdl_setObject:cloudAppVehicleID forName:SDLRPCParameterNameCloudAppVehicleID]; } - (nullable NSNumber<SDLBool> *)cloudAppVehicleID { - return [parameters sdl_objectForName:SDLNameCloudAppVehicleID]; + return [parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID]; } @end diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index 340e66da5..6e3a9c6f0 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -263,11 +263,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setCloudAppVehicleID:(nullable NSString *)cloudAppVehicleID { - [parameters sdl_setObject:cloudAppVehicleID forName:SDLNameCloudAppVehicleID]; + [parameters sdl_setObject:cloudAppVehicleID forName:SDLRPCParameterNameCloudAppVehicleID]; } - (nullable NSString *)cloudAppVehicleID { - return [parameters sdl_objectForName:SDLNameCloudAppVehicleID]; + return [parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID]; } @end diff --git a/SmartDeviceLink/SDLNotificationConstants.m b/SmartDeviceLink/SDLNotificationConstants.m index 51e9849be..2f88aeed8 100644 --- a/SmartDeviceLink/SDLNotificationConstants.m +++ b/SmartDeviceLink/SDLNotificationConstants.m @@ -80,8 +80,6 @@ SDLNotificationName const SDLDidReceiveUnsubscribeButtonResponse = @"com.sdl.res SDLNotificationName const SDLDidReceiveUnsubscribeVehicleDataResponse = @"com.sdl.response.unsubscribeVehicleData"; SDLNotificationName const SDLDidReceiveUnsubscribeWaypointsResponse = @"com.sdl.response.unsubscribeWaypoints"; -SDLNotificationName const SDLDidReceiveSetCloudAppPropertiesRequest = @"com.sdl.request.setCloudAppProperties"; -SDLNotificationName const SDLDidReceiveGetCloudAppPropertiesRequest = @"com.sdl.request.getCloudAppProperties"; #pragma mark - RPC Requests SDLNotificationName const SDLDidReceiveAddCommandRequest = @"com.sdl.request.addCommand"; SDLNotificationName const SDLDidReceiveAddSubMenuRequest = @"com.sdl.request.addSubMenu"; @@ -99,6 +97,7 @@ SDLNotificationName const SDLDidReceiveDialNumberRequest = @"com.sdl.request.dia SDLNotificationName const SDLDidReceiveEncodedSyncPDataRequest = @"com.sdl.request.encodedSyncPData"; SDLNotificationName const SDLDidReceiveEndAudioPassThruRequest = @"com.sdl.request.endAudioPassThru"; SDLNotificationName const SDLDidReceiveGetAppServiceDataRequest = @"com.sdl.request.getAppServiceData"; +SDLNotificationName const SDLDidReceiveGetCloudAppPropertiesRequest = @"com.sdl.request.getCloudAppProperties"; SDLNotificationName const SDLDidReceiveGetDTCsRequest = @"com.sdl.request.getDTCs"; SDLNotificationName const SDLDidReceiveGetFileRequest = @"com.sdl.request.getFile"; SDLNotificationName const SDLDidReceiveGetInteriorVehicleDataRequest = @"com.sdl.request.getInteriorVehicleData"; @@ -118,6 +117,7 @@ SDLNotificationName const SDLDidReceiveScrollableMessageRequest = @"com.sdl.requ SDLNotificationName const SDLDidReceiveSendHapticDataRequest = @"com.sdl.request.sendHapticData"; SDLNotificationName const SDLDidReceiveSendLocationRequest = @"com.sdl.request.sendLocation"; SDLNotificationName const SDLDidReceiveSetAppIconRequest = @"com.sdl.request.setAppIcon"; +SDLNotificationName const SDLDidReceiveSetCloudAppPropertiesRequest = @"com.sdl.request.setCloudAppProperties"; SDLNotificationName const SDLDidReceiveSetDisplayLayoutRequest = @"com.sdl.request.setDisplayLayout"; SDLNotificationName const SDLDidReceiveSetGlobalPropertiesRequest = @"com.sdl.request.setGlobalProperties"; SDLNotificationName const SDLDidReceiveSetInteriorVehicleDataRequest = @"com.sdl.request.setInteriorVehicleData"; diff --git a/SmartDeviceLink/SDLNotificationDispatcher.m b/SmartDeviceLink/SDLNotificationDispatcher.m index 553a243cc..809f3170f 100644 --- a/SmartDeviceLink/SDLNotificationDispatcher.m +++ b/SmartDeviceLink/SDLNotificationDispatcher.m @@ -84,14 +84,6 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark Optional Methods -- (void)onSetCloudAppProperties:(SDLSetCloudAppProperties *)request { - // TODO: need to be able to send request -} - -- (void)onGetCloudAppProperties:(SDLGetCloudAppProperties *)request { - // TODO: need to be able to send request -} - - (void)onError:(NSException *)e { NSError *error = [NSError sdl_lifecycle_unknownRemoteErrorWithDescription:e.name andReason:e.reason]; [self postNotificationName:SDLDidReceiveError infoObject:error]; @@ -389,6 +381,10 @@ NS_ASSUME_NONNULL_BEGIN [self postRPCRequestNotification:SDLDidReceiveGetAppServiceDataRequest request:request]; } +- (void)onGetCloudAppProperties:(SDLGetCloudAppProperties *)request { + [self postRPCRequestNotification:SDLDidReceiveGetCloudAppPropertiesRequest request:request]; +} + - (void)onGetDTCs:(SDLGetDTCs *)request { [self postRPCRequestNotification:SDLDidReceiveGetDTCsRequest request:request]; } @@ -465,6 +461,10 @@ NS_ASSUME_NONNULL_BEGIN [self postRPCRequestNotification:SDLDidReceiveSetAppIconRequest request:request]; } +- (void)onSetCloudAppProperties:(SDLSetCloudAppProperties *)request { + [self postRPCRequestNotification:SDLDidReceiveSetCloudAppPropertiesRequest request:request]; +} + - (void)onSetDisplayLayout:(SDLSetDisplayLayout *)request { [self postRPCRequestNotification:SDLDidReceiveSetDisplayLayoutRequest request:request]; } diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index c1f86f02d..63ce31db1 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -263,11 +263,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setCloudAppVehicleID:(nullable NSString *)cloudAppVehicleID { - [parameters sdl_setObject:cloudAppVehicleID forName:SDLNameCloudAppVehicleID]; + [parameters sdl_setObject:cloudAppVehicleID forName:SDLRPCParameterNameCloudAppVehicleID]; } - (nullable NSString *)cloudAppVehicleID { - return [parameters sdl_objectForName:SDLNameCloudAppVehicleID]; + return [parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID]; } @end diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m index e78853887..a9aa3d957 100644 --- a/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink/SDLProxy.m @@ -731,7 +731,7 @@ static float DefaultConnectionTimeout = 45.0; } SDLSystemRequest *iconURLSystemRequest = [[SDLSystemRequest alloc] initWithType:SDLRequestTypeIconURL fileName:request.url]; - iconURLSystemRequest.requestSubType = SDLNameId; + iconURLSystemRequest.requestSubType = SDLRPCParameterNameId; iconURLSystemRequest.bulkData = data; [strongSelf sendRPC:iconURLSystemRequest]; diff --git a/SmartDeviceLink/SDLProxyListener.h b/SmartDeviceLink/SDLProxyListener.h index 21a73c8b1..7625d46a2 100644 --- a/SmartDeviceLink/SDLProxyListener.h +++ b/SmartDeviceLink/SDLProxyListener.h @@ -168,19 +168,6 @@ NS_ASSUME_NONNULL_BEGIN @optional #pragma mark - Responses -/** - * Called when a `SetCloudAppProperties` request is received from Core - * - * @param request A SDLSetCloudAppProperties object - */ -- (void)onSetCloudAppProperties:(SDLSetCloudAppProperties *)request; - -/** - * Called when a `GetCloudAppProperties` request is received from Core - * - * @param request A SDLGetCloudAppProperties object - */ -- (void)onGetCloudAppProperties:(SDLGetCloudAppProperties *)request; /** * Called when an Add Command Response is received from Core @@ -575,6 +562,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)onUnsubscribeWayPointsResponse:(SDLUnsubscribeWayPointsResponse *)response; #pragma mark - Requests + /** * Called when a `AddCommand` request is received from Core * @@ -688,6 +676,13 @@ NS_ASSUME_NONNULL_BEGIN - (void)onGetAppServiceData:(SDLGetAppServiceData *)request; /** + * Called when a `GetCloudAppProperties` request is received from Core + * + * @param request A SDLGetCloudAppProperties object + */ +- (void)onGetCloudAppProperties:(SDLGetCloudAppProperties *)request; + +/** * Called when a `GetDTCs` request is received from Core * * @param request A SDLGetDTCs object @@ -821,6 +816,13 @@ NS_ASSUME_NONNULL_BEGIN - (void)onSetAppIcon:(SDLSetAppIcon *)request; /** + * Called when a `SetCloudAppProperties` request is received from Core + * + * @param request A SDLSetCloudAppProperties object + */ +- (void)onSetCloudAppProperties:(SDLSetCloudAppProperties *)request; + +/** * Called when a `SetDisplayLayout` request is received from Core * * @param request A SDLSetDisplayLayout object diff --git a/SmartDeviceLink/SDLRPCFunctionNames.h b/SmartDeviceLink/SDLRPCFunctionNames.h index 9fdeda330..52318c3bd 100644 --- a/SmartDeviceLink/SDLRPCFunctionNames.h +++ b/SmartDeviceLink/SDLRPCFunctionNames.h @@ -32,6 +32,7 @@ extern SDLRPCFunctionName const SDLRPCFunctionNameGenericResponse; extern SDLRPCFunctionName const SDLRPCFunctionNameGetAppServiceData; extern SDLRPCFunctionName const SDLRPCFunctionNameGetDTCs; extern SDLRPCFunctionName const SDLRPCFunctionNameGetFile; +extern SDLRPCFunctionName const SDLRPCFunctionNameGetCloudAppProperties; extern SDLRPCFunctionName const SDLRPCFunctionNameGetInteriorVehicleData; extern SDLRPCFunctionName const SDLRPCFunctionNameGetSystemCapability; extern SDLRPCFunctionName const SDLRPCFunctionNameGetVehicleData; @@ -73,6 +74,7 @@ extern SDLRPCFunctionName const SDLRPCFunctionNameScrollableMessage; extern SDLRPCFunctionName const SDLRPCFunctionNameSendHapticData; extern SDLRPCFunctionName const SDLRPCFunctionNameSendLocation; extern SDLRPCFunctionName const SDLRPCFunctionNameSetAppIcon; +extern SDLRPCFunctionName const SDLRPCFunctionNameSetCloudAppProperties; extern SDLRPCFunctionName const SDLRPCFunctionNameSetDisplayLayout; extern SDLRPCFunctionName const SDLRPCFunctionNameSetGlobalProperties; extern SDLRPCFunctionName const SDLRPCFunctionNameSetInteriorVehicleData; diff --git a/SmartDeviceLink/SDLRPCFunctionNames.m b/SmartDeviceLink/SDLRPCFunctionNames.m index 8416ac7a3..c51e98be0 100644 --- a/SmartDeviceLink/SDLRPCFunctionNames.m +++ b/SmartDeviceLink/SDLRPCFunctionNames.m @@ -27,6 +27,7 @@ SDLRPCFunctionName const SDLRPCFunctionNameGenericResponse = @"GenericResponse"; SDLRPCFunctionName const SDLRPCFunctionNameGetAppServiceData = @"GetAppServiceData"; SDLRPCFunctionName const SDLRPCFunctionNameGetDTCs = @"GetDTCs"; SDLRPCFunctionName const SDLRPCFunctionNameGetFile = @"GetFile"; +SDLRPCFunctionName const SDLRPCFunctionNameGetCloudAppProperties = @"GetCloudAppProperties"; SDLRPCFunctionName const SDLRPCFunctionNameGetInteriorVehicleData = @"GetInteriorVehicleData"; SDLRPCFunctionName const SDLRPCFunctionNameGetSystemCapability = @"GetSystemCapability"; SDLRPCFunctionName const SDLRPCFunctionNameGetVehicleData = @"GetVehicleData"; @@ -68,6 +69,7 @@ SDLRPCFunctionName const SDLRPCFunctionNameScrollableMessage = @"ScrollableMessa SDLRPCFunctionName const SDLRPCFunctionNameSendHapticData = @"SendHapticData"; SDLRPCFunctionName const SDLRPCFunctionNameSendLocation = @"SendLocation"; SDLRPCFunctionName const SDLRPCFunctionNameSetAppIcon = @"SetAppIcon"; +SDLRPCFunctionName const SDLRPCFunctionNameSetCloudAppProperties = @"SetCloudAppProperties"; SDLRPCFunctionName const SDLRPCFunctionNameSetDisplayLayout = @"SetDisplayLayout"; SDLRPCFunctionName const SDLRPCFunctionNameSetGlobalProperties = @"SetGlobalProperties"; SDLRPCFunctionName const SDLRPCFunctionNameSetInteriorVehicleData = @"SetInteriorVehicleData"; diff --git a/SmartDeviceLink/SDLRPCParameterNames.h b/SmartDeviceLink/SDLRPCParameterNames.h index 5c285bf97..6d688837f 100644 --- a/SmartDeviceLink/SDLRPCParameterNames.h +++ b/SmartDeviceLink/SDLRPCParameterNames.h @@ -55,6 +55,7 @@ extern SDLRPCParameterName const SDLRPCParameterNameAudioPassThruDisplayText2; extern SDLRPCParameterName const SDLRPCParameterNameAudioStreamingIndicator; extern SDLRPCParameterName const SDLRPCParameterNameAudioStreamingState; extern SDLRPCParameterName const SDLRPCParameterNameAudioType; +extern SDLRPCParameterName const SDLRPCParameterNameAuthToken; extern SDLRPCParameterName const SDLRPCParameterNameAutoCompleteText; extern SDLRPCParameterName const SDLRPCParameterNameAutoModeEnable; extern SDLRPCParameterName const SDLRPCParameterNameAutoModeEnableAvailable; @@ -109,6 +110,8 @@ extern SDLRPCParameterName const SDLRPCParameterNameCountryCode; extern SDLRPCParameterName const SDLRPCParameterNameCountryName; extern SDLRPCParameterName const SDLRPCParameterNameCRC; extern SDLRPCParameterName const SDLRPCParameterNameClockText; +extern SDLRPCParameterName const SDLRPCParameterNameCloudAppVehicleID; +extern SDLRPCParameterName const SDLRPCParameterNameCloudTransportType; extern SDLRPCParameterName const SDLRPCParameterNameCurrentForecast; extern SDLRPCParameterName const SDLRPCParameterNameCurrentForecastSupported; extern SDLRPCParameterName const SDLRPCParameterNameCurrentTemperature; @@ -173,6 +176,8 @@ extern SDLRPCParameterName const SDLRPCParameterNameECUName; extern SDLRPCParameterName const SDLRPCParameterNameElectronicParkBrakeStatus; extern SDLRPCParameterName const SDLRPCParameterNameEmergencyEvent; extern SDLRPCParameterName const SDLRPCParameterNameEmergencyEventType; +extern SDLRPCParameterName const SDLRPCParameterNameEnabled; +extern SDLRPCParameterName const SDLRPCParameterNameEndpoint; extern SDLRPCParameterName const SDLRPCParameterNameEndTime; extern SDLRPCParameterName const SDLRPCParameterNameEngineOilLife; extern SDLRPCParameterName const SDLRPCParameterNameEngineTorque; @@ -252,6 +257,7 @@ extern SDLRPCParameterName const SDLRPCParameterNameHour; extern SDLRPCParameterName const SDLRPCParameterNameHourlyForecast; extern SDLRPCParameterName const SDLRPCParameterNameHours; extern SDLRPCParameterName const SDLRPCParameterNameHumidity; +extern SDLRPCParameterName const SDLRPCParameterNameHybridAppPreference; extern SDLRPCParameterName const SDLRPCParameterNameIconResumed; extern SDLRPCParameterName const SDLRPCParameterNameId; extern SDLRPCParameterName const SDLRPCParameterNameIgnitionStableStatus; @@ -392,6 +398,7 @@ extern SDLRPCParameterName const SDLRPCParameterNameNextInstructionDistanceScale extern SDLRPCParameterName const SDLRPCParameterNameNextInstructionETA; extern SDLRPCParameterName const SDLRPCParameterNameNextTurnIcon; extern SDLRPCParameterName const SDLRPCParameterNameNGNMediaScreenAppName; +extern SDLRPCParameterName const SDLRPCParameterNameNicknames; extern SDLRPCParameterName const SDLRPCParameterNameNightColorScheme; extern SDLRPCParameterName const SDLRPCParameterNameNotification; extern SDLRPCParameterName const SDLRPCParameterNameNumber; diff --git a/SmartDeviceLink/SDLRPCParameterNames.m b/SmartDeviceLink/SDLRPCParameterNames.m index 20fe849d7..7a241ae57 100644 --- a/SmartDeviceLink/SDLRPCParameterNames.m +++ b/SmartDeviceLink/SDLRPCParameterNames.m @@ -53,6 +53,7 @@ SDLRPCParameterName const SDLRPCParameterNameAudioPassThruDisplayText2 = @"audio SDLRPCParameterName const SDLRPCParameterNameAudioStreamingIndicator = @"audioStreamingIndicator"; SDLRPCParameterName const SDLRPCParameterNameAudioStreamingState = @"audioStreamingState"; SDLRPCParameterName const SDLRPCParameterNameAudioType = @"audioType"; +SDLRPCParameterName const SDLRPCParameterNameAuthToken = @"authToken"; SDLRPCParameterName const SDLRPCParameterNameAutoCompleteText = @"autoCompleteText"; SDLRPCParameterName const SDLRPCParameterNameAutoModeEnable = @"autoModeEnable"; SDLRPCParameterName const SDLRPCParameterNameAutoModeEnableAvailable = @"autoModeEnableAvailable"; @@ -107,6 +108,8 @@ SDLRPCParameterName const SDLRPCParameterNameCountryCode = @"countryCode"; SDLRPCParameterName const SDLRPCParameterNameCountryName = @"countryName"; SDLRPCParameterName const SDLRPCParameterNameCRC = @"crc"; SDLRPCParameterName const SDLRPCParameterNameClockText = @"CT"; +SDLRPCParameterName const SDLRPCParameterNameCloudAppVehicleID = @"cloudAppVehicleID"; +SDLRPCParameterName const SDLRPCParameterNameCloudTransportType = @"cloudTransportType"; SDLRPCParameterName const SDLRPCParameterNameCurrentForecast = @"currentForecast"; SDLRPCParameterName const SDLRPCParameterNameCurrentForecastSupported = @"currentForecastSupported"; SDLRPCParameterName const SDLRPCParameterNameCurrentTemperature = @"currentTemperature"; @@ -170,6 +173,8 @@ SDLRPCParameterName const SDLRPCParameterNameECUName = @"ecuName"; SDLRPCParameterName const SDLRPCParameterNameElectronicParkBrakeStatus = @"electronicParkBrakeStatus"; SDLRPCParameterName const SDLRPCParameterNameEmergencyEvent = @"emergencyEvent"; SDLRPCParameterName const SDLRPCParameterNameEmergencyEventType = @"emergencyEventType"; +SDLRPCParameterName const SDLRPCParameterNameEnabled = @"enabled"; +SDLRPCParameterName const SDLRPCParameterNameEndpoint = @"endpoint"; SDLRPCParameterName const SDLRPCParameterNameEndTime = @"endTime"; SDLRPCParameterName const SDLRPCParameterNameEngineOilLife = @"engineOilLife"; SDLRPCParameterName const SDLRPCParameterNameEngineTorque = @"engineTorque"; @@ -250,6 +255,7 @@ SDLRPCParameterName const SDLRPCParameterNameHour = @"hour"; SDLRPCParameterName const SDLRPCParameterNameHourlyForecast = @"hourlyForecast"; SDLRPCParameterName const SDLRPCParameterNameHours = @"hours"; SDLRPCParameterName const SDLRPCParameterNameHumidity = @"humidity"; +SDLRPCParameterName const SDLRPCParameterNameHybridAppPreference = @"hybridAppPreference"; SDLRPCParameterName const SDLRPCParameterNameIconResumed = @"iconResumed"; SDLRPCParameterName const SDLRPCParameterNameId = @"id"; SDLRPCParameterName const SDLRPCParameterNameIgnitionStableStatus = @"ignitionStableStatus"; @@ -386,6 +392,7 @@ SDLRPCParameterName const SDLRPCParameterNameNextInstructionDistanceScale = @"ne SDLRPCParameterName const SDLRPCParameterNameNextInstructionETA = @"nextInstructionETA"; SDLRPCParameterName const SDLRPCParameterNameNextTurnIcon = @"nextTurnIcon"; SDLRPCParameterName const SDLRPCParameterNameNGNMediaScreenAppName = @"ngnMediaScreenAppName"; +SDLRPCParameterName const SDLRPCParameterNameNicknames = @"nicknames"; SDLRPCParameterName const SDLRPCParameterNameNightColorScheme = @"nightColorScheme"; SDLRPCParameterName const SDLRPCParameterNameNotification = @"notification"; SDLRPCParameterName const SDLRPCParameterNameNumber = @"number"; diff --git a/SmartDeviceLink/SDLSetCloudAppProperties.m b/SmartDeviceLink/SDLSetCloudAppProperties.m index 9d5cd076f..9074ea55f 100644 --- a/SmartDeviceLink/SDLSetCloudAppProperties.m +++ b/SmartDeviceLink/SDLSetCloudAppProperties.m @@ -10,7 +10,8 @@ #import "NSMutableDictionary+Store.h" #import "SDLCloudAppProperties.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @@ -18,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSetCloudAppProperties - (instancetype)init { - if (self = [super initWithName:SDLNameSetCloudAppProperties]) { + if (self = [super initWithName:SDLRPCFunctionNameSetCloudAppProperties]) { } return self; } @@ -35,11 +36,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setProperties:(SDLCloudAppProperties *)properties { - [parameters sdl_setObject:properties forName:SDLNameProperties]; + [parameters sdl_setObject:properties forName:SDLRPCParameterNameProperties]; } - (SDLCloudAppProperties *)properties { - return [parameters sdl_objectForName:SDLNameProperties ofClass:SDLCloudAppProperties.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameProperties ofClass:SDLCloudAppProperties.class]; } @end diff --git a/SmartDeviceLink/SDLSetCloudAppPropertiesResponse.m b/SmartDeviceLink/SDLSetCloudAppPropertiesResponse.m index d7999b6c6..94476a335 100644 --- a/SmartDeviceLink/SDLSetCloudAppPropertiesResponse.m +++ b/SmartDeviceLink/SDLSetCloudAppPropertiesResponse.m @@ -8,14 +8,14 @@ #import "SDLSetCloudAppPropertiesResponse.h" -#import "SDLNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSetCloudAppPropertiesResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSetCloudAppProperties]) { + if (self = [super initWithName:SDLRPCFunctionNameSetCloudAppProperties]) { } return self; } diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m index 6b6debfe9..16efd85d1 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.m +++ b/SmartDeviceLink/SDLSubscribeVehicleData.m @@ -290,11 +290,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setCloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID { - [parameters sdl_setObject:cloudAppVehicleID forName:SDLNameCloudAppVehicleID]; + [parameters sdl_setObject:cloudAppVehicleID forName:SDLRPCParameterNameCloudAppVehicleID]; } - (nullable NSNumber<SDLBool> *)cloudAppVehicleID { - return [parameters sdl_objectForName:SDLNameCloudAppVehicleID]; + return [parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID]; } @end diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m index 3e15a3821..b845d4910 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m @@ -244,11 +244,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setCloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID { - [parameters sdl_setObject:cloudAppVehicleID forName:SDLNameCloudAppVehicleID]; + [parameters sdl_setObject:cloudAppVehicleID forName:SDLRPCParameterNameCloudAppVehicleID]; } - (nullable SDLVehicleDataResult *)cloudAppVehicleID { - return [parameters sdl_objectForName:SDLNameCloudAppVehicleID ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:SDLVehicleDataResult.class]; } @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m index d3a03cb60..8f32bee3c 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m @@ -290,11 +290,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setCloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID { - [parameters sdl_setObject:cloudAppVehicleID forName:SDLNameCloudAppVehicleID]; + [parameters sdl_setObject:cloudAppVehicleID forName:SDLRPCParameterNameCloudAppVehicleID]; } - (nullable NSNumber<SDLBool> *)cloudAppVehicleID { - return [parameters sdl_objectForName:SDLNameCloudAppVehicleID]; + return [parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID]; } @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m index 6c8448790..ae299318c 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m @@ -244,11 +244,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setCloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID { - [parameters sdl_setObject:cloudAppVehicleID forName:SDLNameCloudAppVehicleID]; + [parameters sdl_setObject:cloudAppVehicleID forName:SDLRPCParameterNameCloudAppVehicleID]; } - (nullable SDLVehicleDataResult *)cloudAppVehicleID { - return [parameters sdl_objectForName:SDLNameCloudAppVehicleID ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:SDLVehicleDataResult.class]; } @end diff --git a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m index e1b32df29..6ae21e4cb 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m @@ -62,6 +62,8 @@ describe(@"GetFunctionName Tests", ^ { expect([functionID functionNameForId:47]).to(equal(SDLRPCFunctionNameUnsubscribeWayPoints)); expect([functionID functionNameForId:48]).to(equal(SDLRPCFunctionNameGetSystemCapability)); expect([functionID functionNameForId:49]).to(equal(SDLRPCFunctionNameSendHapticData)); + expect([functionID functionNameForId:50]).to(equal(SDLRPCFunctionNameSetCloudAppProperties)); + expect([functionID functionNameForId:51]).to(equal(SDLRPCFunctionNameGetCloudAppProperties)); expect([functionID functionNameForId:52]).to(equal(SDLRPCFunctionNamePublishAppService)); expect([functionID functionNameForId:53]).to(equal(SDLRPCFunctionNameGetAppServiceData)); expect([functionID functionNameForId:54]).to(equal(SDLRPCFunctionNameGetFile)); @@ -142,6 +144,12 @@ describe(@"GetFunctionID Tests", ^ { expect([functionID functionIdForName:SDLRPCFunctionNameUnsubscribeWayPoints]).to(equal(@47)); expect([functionID functionIdForName:SDLRPCFunctionNameGetSystemCapability]).to(equal(@48)); expect([functionID functionIdForName:SDLRPCFunctionNameSendHapticData]).to(equal(@49)); + expect([functionID functionIdForName:SDLRPCFunctionNameSetCloudAppProperties]).to(equal(@50)); + expect([functionID functionIdForName:SDLRPCFunctionNameGetCloudAppProperties]).to(equal(@51)); + expect([functionID functionIdForName:SDLRPCFunctionNamePublishAppService]).to(equal(@52)); + expect([functionID functionIdForName:SDLRPCFunctionNameGetAppServiceData]).to(equal(@53)); + expect([functionID functionIdForName:SDLRPCFunctionNameGetFile]).to(equal(@54)); + expect([functionID functionIdForName:SDLRPCFunctionNamePerformAppServiceInteraction]).to(equal(@55)); expect([functionID functionIdForName:SDLRPCFunctionNameOnHMIStatus]).to(equal(@32768)); expect([functionID functionIdForName:SDLRPCFunctionNameOnAppInterfaceUnregistered]).to(equal(@32769)); expect([functionID functionIdForName:SDLRPCFunctionNameOnButtonEvent]).to(equal(@32770)); @@ -159,7 +167,9 @@ describe(@"GetFunctionID Tests", ^ { expect([functionID functionIdForName:SDLRPCFunctionNameOnHashChange]).to(equal(@32782)); expect([functionID functionIdForName:SDLRPCFunctionNameOnWayPointChange]).to(equal(@32784)); expect([functionID functionIdForName:SDLRPCFunctionNameOnRCStatus]).to(equal(@32785)); - + expect([functionID functionIdForName:SDLRPCFunctionNameOnAppServiceData]).to(equal(@32786)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnSystemCapabilityUpdated]).to(equal(@32787)); + //Not listed in Spec expect([functionID functionIdForName:SDLRPCFunctionNameEncodedSyncPData]).to(equal(@65536)); expect([functionID functionIdForName:SDLRPCFunctionNameSyncPData]).to(equal(@65537)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetCloudAppPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetCloudAppPropertiesSpec.m index 85c27c6ba..37c1810a2 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetCloudAppPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetCloudAppPropertiesSpec.m @@ -11,7 +11,8 @@ #import "SDLGetDTCs.h" #import "SDLGetCloudAppProperties.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLGetCloudAppPropertiesSpec) @@ -31,14 +32,15 @@ describe(@"Getter/Setter Tests", ^{ }); it(@"Should initialize correctly with a dictionary", ^{ - NSDictionary *dict = @{SDLNameRequest:@{ - SDLNameParameters:@{ - SDLNameAppId:testAppID + NSDictionary *dict = @{SDLRPCParameterNameRequest:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameAppId:testAppID }, - SDLNameOperationName:SDLNameGetCloudAppProperties}}; + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetCloudAppProperties}}; SDLGetCloudAppProperties *testRequest = [[SDLGetCloudAppProperties alloc] initWithDictionary:dict]; expect(testRequest.appID).to(equal(testAppID)); + expect(testRequest.getFunctionName).to(equal(SDLRPCFunctionNameGetCloudAppProperties)); }); it(@"Should initialize correctly with the convenience init", ^{ diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 36c28f921..4945d87fd 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -86,7 +86,7 @@ describe(@"Getter/Setter Tests", ^ { SDLRPCParameterNameAirbagStatus:@YES, SDLRPCParameterNameBeltStatus:@YES, SDLRPCParameterNameBodyInformation:@YES, - SDLRPCParameterCloudAppVehicleID:@YES, + SDLRPCParameterNameCloudAppVehicleID:@YES, SDLRPCParameterNameClusterModeStatus:@YES, SDLRPCParameterNameDeviceStatus:@YES, SDLRPCParameterNameDriverBraking:@YES, diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetCloudAppPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetCloudAppPropertiesSpec.m index 8b6697038..974170a3d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetCloudAppPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetCloudAppPropertiesSpec.m @@ -10,7 +10,8 @@ #import <Nimble/Nimble.h> #import "SDLCloudAppProperties.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSetCloudAppProperties.h" QuickSpecBegin(SDLSetCloudAppPropertiesSpec) @@ -30,11 +31,11 @@ describe(@"Getter/Setter Tests", ^{ }); it(@"Should initialize correctly with a dictionary", ^{ - NSDictionary *dict = @{SDLNameRequest:@{ - SDLNameParameters:@{ - SDLNameProperties:testProperties + NSDictionary *dict = @{SDLRPCParameterNameRequest:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameProperties:testProperties }, - SDLNameOperationName:SDLNameSetCloudAppProperties}}; + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSetCloudAppProperties}}; SDLSetCloudAppProperties *testRequest = [[SDLSetCloudAppProperties alloc] initWithDictionary:dict]; expect(testRequest.properties).to(equal(testProperties)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetCloudAppPropertiesResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetCloudAppPropertiesResponseSpec.m index bdc69487c..4da3f7c89 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetCloudAppPropertiesResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetCloudAppPropertiesResponseSpec.m @@ -11,7 +11,8 @@ #import "SDLCloudAppProperties.h" #import "SDLGetCloudAppPropertiesResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLGetCloudAppPropertiesResponseSpec) @@ -30,15 +31,15 @@ describe(@"Getter/Setter Tests", ^{ }); it(@"Should initialize correctly with a dictionary", ^{ - NSDictionary *dict = @{SDLNameResponse:@{ - SDLNameParameters:@{ - SDLNameProperties:testProperties + NSDictionary *dict = @{SDLRPCParameterNameResponse:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameProperties:testProperties }, - SDLNameOperationName:SDLNameSetCloudAppProperties}}; + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSetCloudAppProperties}}; SDLGetCloudAppPropertiesResponse *testResponse = [[SDLGetCloudAppPropertiesResponse alloc] initWithDictionary:dict]; expect(testResponse.properties).to(equal(testProperties)); - expect(testResponse.name).to(equal(SDLNameSetCloudAppProperties)); + expect(testResponse.name).to(equal(SDLRPCFunctionNameSetCloudAppProperties)); }); it(@"Should initialize correctly with the convenience init", ^{ diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index 02ac2ab85..9d672c532 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -146,7 +146,7 @@ describe(@"Getter/Setter Tests", ^ { SDLRPCParameterNameSteeringWheelAngle:@-1500, SDLRPCParameterNameTirePressure:tires, SDLRPCParameterNameTurnSignal:SDLTurnSignalOff, - SDLRPCParameterNameVIN:@"6574839201", + SDLRPCParameterNameVIN:vin, SDLRPCParameterNameWiperStatus:SDLWiperStatusAutomaticHigh}, SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetVehicleData}} mutableCopy]; SDLGetVehicleDataResponse* testResponse = [[SDLGetVehicleDataResponse alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetCloudAppPropertiesResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetCloudAppPropertiesResponseSpec.m index 2644178ce..fdcf9144e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetCloudAppPropertiesResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetCloudAppPropertiesResponseSpec.m @@ -9,7 +9,8 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSetCloudAppPropertiesResponse.h" QuickSpecBegin(SDLSetCloudAppPropertiesResponseSpec) @@ -22,13 +23,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized with a dictionary", ^{ - NSDictionary *dict = @{SDLNameResponse:@{ - SDLNameParameters:@{}, - SDLNameOperationName:SDLNameSetCloudAppProperties}}; + NSDictionary *dict = @{SDLRPCParameterNameResponse:@{ + SDLRPCParameterNameParameters:@{}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSetCloudAppProperties}}; SDLSetCloudAppPropertiesResponse *testResponse = [[SDLSetCloudAppPropertiesResponse alloc] initWithDictionary:dict]; expect(testResponse).toNot(beNil()); - expect(testResponse.name).to(equal(SDLNameSetCloudAppProperties)); + expect(testResponse.name).to(equal(SDLRPCFunctionNameSetCloudAppProperties)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLCloudAppPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLCloudAppPropertiesSpec.m index 66599eb3b..f12868f92 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLCloudAppPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLCloudAppPropertiesSpec.m @@ -11,7 +11,8 @@ #import "SDLCloudAppProperties.h" #import "SDLHybridAppPreference.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLCloudAppPropertiesSpec) @@ -54,13 +55,13 @@ describe(@"Getter/Setter Tests", ^{ }); it(@"Should get correctly when initialized with a dictionary", ^{ - NSDictionary *dict = @{SDLNameNicknames:testNicknames, - SDLNameAppId:testAppID, - SDLNameEnabled:@(testEnabled), - SDLNameAuthToken:testAuthToken, - SDLNameCloudTransportType:testCloudTransportType, - SDLNameHybridAppPreference:testHybridAppPreference, - SDLNameEndpoint:testEndpoint + NSDictionary *dict = @{SDLRPCParameterNameNicknames:testNicknames, + SDLRPCParameterNameAppId:testAppID, + SDLRPCParameterNameEnabled:@(testEnabled), + SDLRPCParameterNameAuthToken:testAuthToken, + SDLRPCParameterNameCloudTransportType:testCloudTransportType, + SDLRPCParameterNameHybridAppPreference:testHybridAppPreference, + SDLRPCParameterNameEndpoint:testEndpoint }; SDLCloudAppProperties *testStruct = [[SDLCloudAppProperties alloc] initWithDictionary:dict]; |