From 37b500a2cab026cd01c466d9110650a0cb8cd4c9 Mon Sep 17 00:00:00 2001 From: piyushkhosla Date: Fri, 7 Jun 2019 15:44:05 +0530 Subject: [PATCH 01/50] Changes for Reading Generic Network Signal data --- SmartDeviceLink/SDLGetVehicleData.h | 4 ++++ SmartDeviceLink/SDLGetVehicleData.m | 8 ++++++++ SmartDeviceLink/SDLGetVehicleDataResponse.h | 4 ++++ SmartDeviceLink/SDLGetVehicleDataResponse.m | 8 ++++++++ SmartDeviceLink/SDLOnVehicleData.h | 4 ++++ SmartDeviceLink/SDLOnVehicleData.m | 8 ++++++++ SmartDeviceLink/SDLRPCParameterNames.h | 1 + SmartDeviceLink/SDLRPCParameterNames.m | 1 + SmartDeviceLink/SDLSubscribeVehicleData.h | 6 ++++++ SmartDeviceLink/SDLSubscribeVehicleData.m | 8 ++++++++ SmartDeviceLink/SDLSubscribeVehicleDataResponse.h | 4 ++++ SmartDeviceLink/SDLSubscribeVehicleDataResponse.m | 8 ++++++++ SmartDeviceLink/SDLUnsubscribeVehicleData.h | 3 +++ SmartDeviceLink/SDLUnsubscribeVehicleData.m | 8 ++++++++ SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h | 4 ++++ SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m | 8 ++++++++ SmartDeviceLink/SDLVehicleDataResult.h | 7 ++++++- SmartDeviceLink/SDLVehicleDataResult.m | 9 +++++++++ .../NotificationSpecs/SDLOnVehicleDataSpec.m | 11 +++++++++++ .../RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m | 12 ++++++++++++ .../RequestSpecs/SDLSubscribeVehicleDataSpec.m | 11 +++++++++++ .../RequestSpecs/SDLUnsubscribeVehicleDataSpec.m | 11 +++++++++++ .../ResponseSpecs/SDLGetVehicleDataResponseSpec.m | 11 +++++++++++ .../SDLSubscribeVehicleDataResponseSpec.m | 11 +++++++++++ .../SDLUnsubscribeVehicleDataResponseSpec.m | 11 +++++++++++ .../RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m | 8 +++++++- 26 files changed, 187 insertions(+), 2 deletions(-) diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index b9e0fca30..9c8611cfb 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -272,6 +272,10 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nullable, strong, nonatomic) NSNumber *cloudAppVehicleID; +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; + +- (NSNumber *)genericNetworkData:(NSString *)vehicleDataName; + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m index 7ed2bb189..4f0de0ea8 100644 --- a/SmartDeviceLink/SDLGetVehicleData.m +++ b/SmartDeviceLink/SDLGetVehicleData.m @@ -309,6 +309,14 @@ - (void)setCloudAppVehicleID:(nullable NSNumber *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSNumber.class error:nil]; } +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState { + [self.parameters sdl_setObject:@(vehicleDataState) forName:vehicleDataName]; +} + +- (NSNumber *)genericNetworkData:(NSString *)vehicleDataName { + return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSNumber.class error:nil]; +} + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 78801ae55..375f95180 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -186,6 +186,10 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nullable, strong, nonatomic) NSString *cloudAppVehicleID; +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; + +- (id)genericNetworkData:(NSString *)vehicleDataName; + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index 2b47a92b3..a14af961c 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -273,6 +273,14 @@ - (nullable NSString *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSString.class error:nil]; } +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState { + [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName]; +} + +- (id)genericNetworkData:(NSString *)vehicleDataName { + return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSObject.class error:nil]; +} + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 463245d30..6ecf15738 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -186,6 +186,10 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nullable, strong, nonatomic) NSString *cloudAppVehicleID; +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; + +- (id)genericNetworkData:(NSString *)vehicleDataName; + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index 6dc6b0aa5..f8a7e17dd 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -272,6 +272,14 @@ - (nullable NSString *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSString.class error:nil]; } +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState { + [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName]; +} + +- (id)genericNetworkData:(NSString *)vehicleDataName { + return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSObject.class error:nil]; +} + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLRPCParameterNames.h b/SmartDeviceLink/SDLRPCParameterNames.h index 6e346e357..a20b420c1 100644 --- a/SmartDeviceLink/SDLRPCParameterNames.h +++ b/SmartDeviceLink/SDLRPCParameterNames.h @@ -118,6 +118,7 @@ extern SDLRPCParameterName const SDLRPCParameterNameCurrentTemperature; extern SDLRPCParameterName const SDLRPCParameterNameCushion; extern SDLRPCParameterName const SDLRPCParameterNameCustomButtonId; extern SDLRPCParameterName const SDLRPCParameterNameCustomPresets; +extern SDLRPCParameterName const SDLRPCParameterNameCustomDataType; extern SDLRPCParameterName const SDLRPCParameterNameData; extern SDLRPCParameterName const SDLRPCParameterNameDataResult; extern SDLRPCParameterName const SDLRPCParameterNameDataType; diff --git a/SmartDeviceLink/SDLRPCParameterNames.m b/SmartDeviceLink/SDLRPCParameterNames.m index 0aae8440d..965b4c8bf 100644 --- a/SmartDeviceLink/SDLRPCParameterNames.m +++ b/SmartDeviceLink/SDLRPCParameterNames.m @@ -116,6 +116,7 @@ SDLRPCParameterName const SDLRPCParameterNameCushion = @"cushion"; SDLRPCParameterName const SDLRPCParameterNameCustomButtonId = @"customButtonID"; SDLRPCParameterName const SDLRPCParameterNameCustomPresets = @"customPresets"; +SDLRPCParameterName const SDLRPCParameterNameCustomDataType = @"customDataType"; SDLRPCParameterName const SDLRPCParameterNameData = @"data"; SDLRPCParameterName const SDLRPCParameterNameDataResult = @"dataResult"; SDLRPCParameterName const SDLRPCParameterNameDataType = @"dataType"; diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index 31d1dce6f..1b0a4d847 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -266,6 +266,12 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) NSNumber *cloudAppVehicleID; +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; + +- (NSNumber *)genericNetworkData:(NSString *)vehicleDataName; + + + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m index cf2b650ae..5656fb6cc 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.m +++ b/SmartDeviceLink/SDLSubscribeVehicleData.m @@ -300,6 +300,14 @@ - (void)setCloudAppVehicleID:(nullable NSNumber *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSNumber.class error:nil]; } +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState { + [self.parameters sdl_setObject:@(vehicleDataState) forName:vehicleDataName]; +} + +- (NSNumber *)genericNetworkData:(NSString *)vehicleDataName { + return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSNumber.class error:nil]; +} + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 0fbf17c0b..4db63e282 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -219,6 +219,10 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) SDLVehicleDataResult *cloudAppVehicleID; +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; + +- (SDLVehicleDataResult *)genericNetworkData:(NSString *)vehicleDataName; + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m index 648d5356e..6518bc606 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m @@ -254,6 +254,14 @@ - (nullable SDLVehicleDataResult *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:SDLVehicleDataResult.class error:nil]; } +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState { + [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName]; +} + +- (SDLVehicleDataResult *)genericNetworkData:(NSString *)vehicleDataName { + return [self.parameters sdl_objectForName:vehicleDataName ofClass:SDLVehicleDataResult.class error:nil]; +} + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index 322b12347..9c71baba4 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -268,6 +268,9 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) NSNumber *cloudAppVehicleID; +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; + +- (NSNumber *)genericNetworkData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m index 1df1d2a5f..f477ce43a 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m @@ -300,6 +300,14 @@ - (void)setCloudAppVehicleID:(nullable NSNumber *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSNumber.class error:nil]; } +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState { + [self.parameters sdl_setObject:@(vehicleDataState) forName:vehicleDataName]; +} + +- (NSNumber *)genericNetworkData:(NSString *)vehicleDataName { + return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSNumber.class error:nil]; +} + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index 32f51cf76..84bcf3e44 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -218,6 +218,10 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) SDLVehicleDataResult *cloudAppVehicleID; +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; + +- (SDLVehicleDataResult *)genericNetworkData:(NSString *)vehicleDataName; + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m index b7bddc70d..ffb212b87 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m @@ -254,6 +254,14 @@ - (nullable SDLVehicleDataResult *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:SDLVehicleDataResult.class error:nil]; } +- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState { + [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName]; +} + +- (SDLVehicleDataResult *)genericNetworkData:(NSString *)vehicleDataName { + return [self.parameters sdl_objectForName:vehicleDataName ofClass:SDLVehicleDataResult.class error:nil]; +} + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLVehicleDataResult.h b/SmartDeviceLink/SDLVehicleDataResult.h index 44d43b70b..c668ac2a5 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.h +++ b/SmartDeviceLink/SDLVehicleDataResult.h @@ -16,7 +16,12 @@ NS_ASSUME_NONNULL_BEGIN /** Defined published data element type */ -@property (strong, nonatomic) SDLVehicleDataType dataType; +@property (strong, nonatomic) SDLVehicleDataType dataType __deprecated_msg("Use customDataType parameter"); + +/** + Defined published data element type + */ +@property (strong, nonatomic) NSString *customDataType; /** Published data result code diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m index 0dfd9b1f3..0bc98a371 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.m +++ b/SmartDeviceLink/SDLVehicleDataResult.m @@ -28,6 +28,15 @@ - (SDLVehicleDataResultCode)resultCode { return [self.store sdl_enumForName:SDLRPCParameterNameResultCode error:&error]; } +- (NSString *)customDataType { + NSError *error = nil; + return [self.store sdl_enumForName:SDLRPCParameterNameCustomDataType error:&error]; +} + +- (void)setCustomDataType:(NSString *)customDataType { + [self.store sdl_setObject:customDataType forName:SDLRPCParameterNameCustomDataType]; +} + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m index d835c5f9b..7929bbe54 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -217,6 +217,17 @@ expect(testNotification.vin).to(beNil()); expect(testNotification.wiperStatus).to(beNil()); }); + + it(@"should set and get generic Network data", ^{ + SDLOnVehicleData *testRequest = [[SDLOnVehicleData alloc] init]; + + [testRequest setGenericNetworkData:@"speed" withVehicleDataState:@100]; + [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:SDLTurnSignalOff]; + + expect([testRequest genericNetworkData:@"speed"]).to(equal(@100)); + expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(SDLTurnSignalOff)); + + }); }); QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index eab7f6210..e24178c1c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -290,6 +290,18 @@ expect(testRequest.turnSignal).to(equal(@YES)); expect(testRequest.wiperStatus).to(equal(@YES)); }); + + context(@"should set and get generic Network data", ^{ + SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] init]; + + [testRequest setGenericNetworkData:@"GPS" withVehicleDataState:NO]; + [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:YES]; + + expect([testRequest genericNetworkData:@"GPS"]).to(equal(NO)); + expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(@YES)); + + }); + }); QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index b4d677936..d111ca605 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -290,6 +290,17 @@ expect(testRequest.wiperStatus).to(equal(@YES)); #pragma clang diagnostic pop }); + + context(@"should set and get generic Network data", ^{ + SDLSubscribeVehicleData *testRequest = [[SDLSubscribeVehicleData alloc] init]; + + [testRequest setGenericNetworkData:@"GPS" withVehicleDataState:NO]; + [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:YES]; + + expect([testRequest genericNetworkData:@"GPS"]).to(equal(NO)); + expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(@YES)); + + }); }); QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index adb9307bd..036bbfa86 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -288,6 +288,17 @@ expect(testRequest.wiperStatus).to(equal(@YES)); #pragma clang diagnostic pop }); + + context(@"should set and get generic Network data", ^{ + SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] init]; + + [testRequest setGenericNetworkData:@"GPS" withVehicleDataState:NO]; + [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:YES]; + + expect([testRequest genericNetworkData:@"GPS"]).to(equal(NO)); + expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(@YES)); + + }); }); QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index ed1db8343..01852c649 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -220,6 +220,17 @@ expect(testResponse.vin).to(beNil()); expect(testResponse.wiperStatus).to(beNil()); }); + + it(@"should set and get generic Network data", ^{ + SDLGetVehicleDataResponse *testRequest = [[SDLGetVehicleDataResponse alloc] init]; + + [testRequest setGenericNetworkData:@"speed" withVehicleDataState:@100]; + [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:SDLTurnSignalOff]; + + expect([testRequest genericNetworkData:@"speed"]).to(equal(@100)); + expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(SDLTurnSignalOff)); + + }); }); QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index 6b1f4303b..b468706e1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -185,6 +185,17 @@ expect(testResponse.turnSignal).to(beNil()); expect(testResponse.wiperStatus).to(beNil()); }); + + it(@"should set and get generic Network data", ^{ + SDLSubscribeVehicleDataResponse *testRequest = [[SDLSubscribeVehicleDataResponse alloc] init]; + + [testRequest setGenericNetworkData:@"speed" withVehicleDataState:vehicleDataResult]; + [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:vehicleDataResult]; + + expect([testRequest genericNetworkData:@"speed"]).to(equal(vehicleDataResult)); + expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(vehicleDataResult)); + + }); }); QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 8e91afc1d..475a841b4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -186,6 +186,17 @@ expect(testResponse.turnSignal).to(beNil()); expect(testResponse.cloudAppVehicleID).to(beNil()); }); + + it(@"should set and get generic Network data", ^{ + SDLUnsubscribeVehicleDataResponse *testRequest = [[SDLUnsubscribeVehicleDataResponse alloc] init]; + + [testRequest setGenericNetworkData:@"speed" withVehicleDataState:vehicleDataResult]; + [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:vehicleDataResult]; + + expect([testRequest genericNetworkData:@"speed"]).to(equal(vehicleDataResult)); + expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(vehicleDataResult)); + + }); }); QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m index 8a504b85b..07523e2fe 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m @@ -20,21 +20,26 @@ SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] init]; testStruct.dataType = SDLVehicleDataTypeAirbagStatus; + testStruct.customDataType = SDLVehicleDataTypeAirbagStatus; testStruct.resultCode = SDLVehicleDataResultCodeDisallowed; expect(testStruct.dataType).to(equal(SDLVehicleDataTypeAirbagStatus)); + expect(testStruct.customDataType).to(equal(SDLVehicleDataTypeAirbagStatus)); expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); }); it(@"Should get correctly when initialized", ^ { NSMutableDictionary* dict = [@{SDLRPCParameterNameDataType:SDLVehicleDataTypeAirbagStatus, - SDLRPCParameterNameResultCode:SDLVehicleDataResultCodeDisallowed} mutableCopy]; + SDLRPCParameterNameResultCode:SDLVehicleDataResultCodeDisallowed, + SDLRPCParameterNameCustomDataType:SDLVehicleDataTypeRPM + } mutableCopy]; #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithDictionary:dict]; #pragma clang diagnostic pop expect(testStruct.dataType).to(equal(SDLVehicleDataTypeAirbagStatus)); + expect(testStruct.customDataType).to(equal(SDLVehicleDataTypeRPM)); expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); }); @@ -42,6 +47,7 @@ SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] init]; expect(testStruct.dataType).to(beNil()); + expect(testStruct.customDataType).to(beNil()); expect(testStruct.resultCode).to(beNil()); }); }); From c1a0a6e7ca203313f0a3b178cb6ddafc1dadadc2 Mon Sep 17 00:00:00 2001 From: piyushkhosla Date: Wed, 24 Jul 2019 16:33:19 +0530 Subject: [PATCH 02/50] updating function name from "setGenericNetworkData" to "setOEMCustomVehicleData" and "genericNetworkData" to "getOEMCustomVehicleData" --- SmartDeviceLink/SDLGetVehicleData.h | 4 ++-- SmartDeviceLink/SDLGetVehicleData.m | 4 ++-- SmartDeviceLink/SDLGetVehicleDataResponse.h | 4 ++-- SmartDeviceLink/SDLGetVehicleDataResponse.m | 4 ++-- SmartDeviceLink/SDLOnVehicleData.h | 4 ++-- SmartDeviceLink/SDLOnVehicleData.m | 4 ++-- SmartDeviceLink/SDLSubscribeVehicleData.h | 4 ++-- SmartDeviceLink/SDLSubscribeVehicleData.m | 4 ++-- SmartDeviceLink/SDLSubscribeVehicleDataResponse.h | 4 ++-- SmartDeviceLink/SDLSubscribeVehicleDataResponse.m | 4 ++-- SmartDeviceLink/SDLUnsubscribeVehicleData.h | 4 ++-- SmartDeviceLink/SDLUnsubscribeVehicleData.m | 4 ++-- SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h | 4 ++-- SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m | 4 ++-- .../RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m | 8 ++++---- .../RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m | 8 ++++---- .../RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m | 8 ++++---- .../RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m | 8 ++++---- .../ResponseSpecs/SDLGetVehicleDataResponseSpec.m | 8 ++++---- .../ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m | 8 ++++---- .../ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m | 8 ++++---- 21 files changed, 56 insertions(+), 56 deletions(-) diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index 9c8611cfb..a4394be91 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -272,9 +272,9 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nullable, strong, nonatomic) NSNumber *cloudAppVehicleID; -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; -- (NSNumber *)genericNetworkData:(NSString *)vehicleDataName; +- (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m index 4f0de0ea8..100f0f979 100644 --- a/SmartDeviceLink/SDLGetVehicleData.m +++ b/SmartDeviceLink/SDLGetVehicleData.m @@ -309,11 +309,11 @@ - (void)setCloudAppVehicleID:(nullable NSNumber *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSNumber.class error:nil]; } -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState { +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState { [self.parameters sdl_setObject:@(vehicleDataState) forName:vehicleDataName]; } -- (NSNumber *)genericNetworkData:(NSString *)vehicleDataName { +- (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName { return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSNumber.class error:nil]; } diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 375f95180..451c90bf9 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -186,9 +186,9 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nullable, strong, nonatomic) NSString *cloudAppVehicleID; -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; -- (id)genericNetworkData:(NSString *)vehicleDataName; +- (id)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index a14af961c..868e7f8be 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -273,11 +273,11 @@ - (nullable NSString *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSString.class error:nil]; } -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState { +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState { [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName]; } -- (id)genericNetworkData:(NSString *)vehicleDataName { +- (id)getOEMCustomVehicleData:(NSString *)vehicleDataName { return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSObject.class error:nil]; } diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 6ecf15738..991bb6573 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -186,9 +186,9 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nullable, strong, nonatomic) NSString *cloudAppVehicleID; -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; -- (id)genericNetworkData:(NSString *)vehicleDataName; +- (id)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index f8a7e17dd..e4596fc78 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -272,11 +272,11 @@ - (nullable NSString *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSString.class error:nil]; } -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState { +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState { [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName]; } -- (id)genericNetworkData:(NSString *)vehicleDataName { +- (id)getOEMCustomVehicleData:(NSString *)vehicleDataName { return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSObject.class error:nil]; } diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index 1b0a4d847..af02fce96 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -266,9 +266,9 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) NSNumber *cloudAppVehicleID; -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; -- (NSNumber *)genericNetworkData:(NSString *)vehicleDataName; +- (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m index 5656fb6cc..a5224be5c 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.m +++ b/SmartDeviceLink/SDLSubscribeVehicleData.m @@ -300,11 +300,11 @@ - (void)setCloudAppVehicleID:(nullable NSNumber *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSNumber.class error:nil]; } -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState { +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState { [self.parameters sdl_setObject:@(vehicleDataState) forName:vehicleDataName]; } -- (NSNumber *)genericNetworkData:(NSString *)vehicleDataName { +- (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName { return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSNumber.class error:nil]; } diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 4db63e282..97c43d108 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -219,9 +219,9 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) SDLVehicleDataResult *cloudAppVehicleID; -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; -- (SDLVehicleDataResult *)genericNetworkData:(NSString *)vehicleDataName; +- (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m index 6518bc606..cfa785e86 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m @@ -254,11 +254,11 @@ - (nullable SDLVehicleDataResult *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:SDLVehicleDataResult.class error:nil]; } -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState { +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState { [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName]; } -- (SDLVehicleDataResult *)genericNetworkData:(NSString *)vehicleDataName { +- (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName { return [self.parameters sdl_objectForName:vehicleDataName ofClass:SDLVehicleDataResult.class error:nil]; } diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index 9c71baba4..291c2540b 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -268,9 +268,9 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) NSNumber *cloudAppVehicleID; -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; -- (NSNumber *)genericNetworkData:(NSString *)vehicleDataName; +- (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m index f477ce43a..ec895d667 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m @@ -300,11 +300,11 @@ - (void)setCloudAppVehicleID:(nullable NSNumber *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSNumber.class error:nil]; } -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState { +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState { [self.parameters sdl_setObject:@(vehicleDataState) forName:vehicleDataName]; } -- (NSNumber *)genericNetworkData:(NSString *)vehicleDataName { +- (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName { return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSNumber.class error:nil]; } diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index 84bcf3e44..1c639e369 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -218,9 +218,9 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) SDLVehicleDataResult *cloudAppVehicleID; -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; -- (SDLVehicleDataResult *)genericNetworkData:(NSString *)vehicleDataName; +- (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m index ffb212b87..10f8d4a78 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m @@ -254,11 +254,11 @@ - (nullable SDLVehicleDataResult *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:SDLVehicleDataResult.class error:nil]; } -- (void)setGenericNetworkData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState { +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState { [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName]; } -- (SDLVehicleDataResult *)genericNetworkData:(NSString *)vehicleDataName { +- (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName { return [self.parameters sdl_objectForName:vehicleDataName ofClass:SDLVehicleDataResult.class error:nil]; } diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m index 7929bbe54..16cc4fc0c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -221,11 +221,11 @@ it(@"should set and get generic Network data", ^{ SDLOnVehicleData *testRequest = [[SDLOnVehicleData alloc] init]; - [testRequest setGenericNetworkData:@"speed" withVehicleDataState:@100]; - [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:SDLTurnSignalOff]; + [testRequest setOEMCustomVehicleData:@"speed" withVehicleDataState:@100]; + [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:SDLTurnSignalOff]; - expect([testRequest genericNetworkData:@"speed"]).to(equal(@100)); - expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(SDLTurnSignalOff)); + expect([testRequest getOEMCustomVehicleData:@"speed"]).to(equal(@100)); + expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(SDLTurnSignalOff)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index e24178c1c..490d968c9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -294,11 +294,11 @@ context(@"should set and get generic Network data", ^{ SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] init]; - [testRequest setGenericNetworkData:@"GPS" withVehicleDataState:NO]; - [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:YES]; + [testRequest setOEMCustomVehicleData:@"GPS" withVehicleDataState:NO]; + [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:YES]; - expect([testRequest genericNetworkData:@"GPS"]).to(equal(NO)); - expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(@YES)); + expect([testRequest getOEMCustomVehicleData:@"GPS"]).to(equal(NO)); + expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(@YES)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index d111ca605..5847feaa0 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -294,11 +294,11 @@ context(@"should set and get generic Network data", ^{ SDLSubscribeVehicleData *testRequest = [[SDLSubscribeVehicleData alloc] init]; - [testRequest setGenericNetworkData:@"GPS" withVehicleDataState:NO]; - [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:YES]; + [testRequest setOEMCustomVehicleData:@"GPS" withVehicleDataState:NO]; + [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:YES]; - expect([testRequest genericNetworkData:@"GPS"]).to(equal(NO)); - expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(@YES)); + expect([testRequest getOEMCustomVehicleData:@"GPS"]).to(equal(NO)); + expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(@YES)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index 036bbfa86..e0d118483 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -292,11 +292,11 @@ context(@"should set and get generic Network data", ^{ SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] init]; - [testRequest setGenericNetworkData:@"GPS" withVehicleDataState:NO]; - [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:YES]; + [testRequest setOEMCustomVehicleData:@"GPS" withVehicleDataState:NO]; + [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:YES]; - expect([testRequest genericNetworkData:@"GPS"]).to(equal(NO)); - expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(@YES)); + expect([testRequest getOEMCustomVehicleData:@"GPS"]).to(equal(NO)); + expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(@YES)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index 01852c649..eeab01df5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -224,11 +224,11 @@ it(@"should set and get generic Network data", ^{ SDLGetVehicleDataResponse *testRequest = [[SDLGetVehicleDataResponse alloc] init]; - [testRequest setGenericNetworkData:@"speed" withVehicleDataState:@100]; - [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:SDLTurnSignalOff]; + [testRequest setOEMCustomVehicleData:@"speed" withVehicleDataState:@100]; + [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:SDLTurnSignalOff]; - expect([testRequest genericNetworkData:@"speed"]).to(equal(@100)); - expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(SDLTurnSignalOff)); + expect([testRequest getOEMCustomVehicleData:@"speed"]).to(equal(@100)); + expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(SDLTurnSignalOff)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index b468706e1..2f6f3c9e0 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -189,11 +189,11 @@ it(@"should set and get generic Network data", ^{ SDLSubscribeVehicleDataResponse *testRequest = [[SDLSubscribeVehicleDataResponse alloc] init]; - [testRequest setGenericNetworkData:@"speed" withVehicleDataState:vehicleDataResult]; - [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:vehicleDataResult]; + [testRequest setOEMCustomVehicleData:@"speed" withVehicleDataState:vehicleDataResult]; + [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:vehicleDataResult]; - expect([testRequest genericNetworkData:@"speed"]).to(equal(vehicleDataResult)); - expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(vehicleDataResult)); + expect([testRequest getOEMCustomVehicleData:@"speed"]).to(equal(vehicleDataResult)); + expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(vehicleDataResult)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 475a841b4..7b4f11389 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -190,11 +190,11 @@ it(@"should set and get generic Network data", ^{ SDLUnsubscribeVehicleDataResponse *testRequest = [[SDLUnsubscribeVehicleDataResponse alloc] init]; - [testRequest setGenericNetworkData:@"speed" withVehicleDataState:vehicleDataResult]; - [testRequest setGenericNetworkData:@"turnSignal" withVehicleDataState:vehicleDataResult]; + [testRequest setOEMCustomVehicleData:@"speed" withVehicleDataState:vehicleDataResult]; + [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:vehicleDataResult]; - expect([testRequest genericNetworkData:@"speed"]).to(equal(vehicleDataResult)); - expect([testRequest genericNetworkData:@"turnSignal"]).to(equal(vehicleDataResult)); + expect([testRequest getOEMCustomVehicleData:@"speed"]).to(equal(vehicleDataResult)); + expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(vehicleDataResult)); }); }); From c39d0e7af3ea967a41282ef5fb1978ffa1708fa4 Mon Sep 17 00:00:00 2001 From: piyushkhosla Date: Fri, 26 Jul 2019 14:33:18 +0530 Subject: [PATCH 03/50] updating methods and test cases. --- SmartDeviceLink/SDLVehicleDataResult.h | 6 ++++- SmartDeviceLink/SDLVehicleDataResult.m | 24 +++++++++++++++++++ .../RequestSpecs/SDLGetVehicleDataSpec.m | 6 ++--- .../SDLGetVehicleDataResponseSpec.m | 7 +++--- .../SDLSubscribeVehicleDataResponseSpec.m | 10 ++++---- .../SDLUnsubscribeVehicleDataResponseSpec.m | 11 +++++---- .../StructSpecs/SDLVehicleDataResultSpec.m | 14 +++++++++++ 7 files changed, 60 insertions(+), 18 deletions(-) diff --git a/SmartDeviceLink/SDLVehicleDataResult.h b/SmartDeviceLink/SDLVehicleDataResult.h index c668ac2a5..009bdaaa5 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.h +++ b/SmartDeviceLink/SDLVehicleDataResult.h @@ -13,10 +13,14 @@ NS_ASSUME_NONNULL_BEGIN */ @interface SDLVehicleDataResult : SDLRPCStruct +- (instancetype)initWithDataType:(SDLVehicleDataType)dataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode; + +- (instancetype)initWithCustomDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode; + /** Defined published data element type */ -@property (strong, nonatomic) SDLVehicleDataType dataType __deprecated_msg("Use customDataType parameter"); +@property (strong, nonatomic) SDLVehicleDataType dataType; /** Defined published data element type diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m index 0bc98a371..688baa3c2 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.m +++ b/SmartDeviceLink/SDLVehicleDataResult.m @@ -10,6 +10,30 @@ @implementation SDLVehicleDataResult +- (instancetype)initWithDataType:(SDLVehicleDataType)dataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode { + self = [self init]; + if (!self) { + return nil; + } + + self.dataType = dataType; + self.resultCode = resultCode; + + return self; +} + +- (instancetype)initWithCustomDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode{ + self = [self init]; + if (!self) { + return nil; + } + + self.customDataType = customDataType; + self.resultCode = resultCode; + + return self; +} + - (void)setDataType:(SDLVehicleDataType)dataType { [self.store sdl_setObject:dataType forName:SDLRPCParameterNameDataType]; } diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 490d968c9..75e405e06 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -294,11 +294,9 @@ context(@"should set and get generic Network data", ^{ SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] init]; - [testRequest setOEMCustomVehicleData:@"GPS" withVehicleDataState:NO]; - [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:YES]; + [testRequest setOEMCustomVehicleData:@"OEMCustomVehicleData" withVehicleDataState:NO]; - expect([testRequest getOEMCustomVehicleData:@"GPS"]).to(equal(NO)); - expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(@YES)); + expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData"]).to(equal(@NO)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index eeab01df5..dd82920b0 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -30,6 +30,7 @@ __block SDLFuelRange* fuelRange = nil; __block NSString* vin = nil; __block NSString* cloudAppVehicleID = nil; + beforeEach(^{ gps = [[SDLGPSData alloc] init]; @@ -224,11 +225,9 @@ it(@"should set and get generic Network data", ^{ SDLGetVehicleDataResponse *testRequest = [[SDLGetVehicleDataResponse alloc] init]; - [testRequest setOEMCustomVehicleData:@"speed" withVehicleDataState:@100]; - [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:SDLTurnSignalOff]; + [testRequest setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:@"OEMVehicleDataState"]; - expect([testRequest getOEMCustomVehicleData:@"speed"]).to(equal(@100)); - expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(SDLTurnSignalOff)); + expect([testRequest getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(@"OEMVehicleDataState")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index 2f6f3c9e0..d75f5f1d3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -12,11 +12,14 @@ #import "SDLRPCFunctionNames.h" #import "SDLSubscribeVehicleDataResponse.h" #import "SDLVehicleDataResult.h" +#import "SDLVehicleDataResultCode.h" QuickSpecBegin(SDLSubscribeVehicleDataResponseSpec) SDLVehicleDataResult* vehicleDataResult = [[SDLVehicleDataResult alloc] init]; +SDLVehicleDataResult* customOEMvehicleDataResult = [[SDLVehicleDataResult alloc] initWithCustomDataType:@"customOEMVehicleData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeSuccess]; + describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { @@ -189,11 +192,10 @@ it(@"should set and get generic Network data", ^{ SDLSubscribeVehicleDataResponse *testRequest = [[SDLSubscribeVehicleDataResponse alloc] init]; - [testRequest setOEMCustomVehicleData:@"speed" withVehicleDataState:vehicleDataResult]; - [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:vehicleDataResult]; - expect([testRequest getOEMCustomVehicleData:@"speed"]).to(equal(vehicleDataResult)); - expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(vehicleDataResult)); + [testRequest setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult]; + + expect([testRequest getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(customOEMvehicleDataResult)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 7b4f11389..58b0d54d3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -12,11 +12,12 @@ #import "SDLRPCParameterNames.h" #import "SDLRPCFunctionNames.h" #import "SDLVehicleDataResult.h" - +#import "SDLVehicleDataResultCode.h" QuickSpecBegin(SDLUnsubscribeVehicleDataResponseSpec) SDLVehicleDataResult* vehicleDataResult = [[SDLVehicleDataResult alloc] init]; +SDLVehicleDataResult* customOEMvehicleDataResult = [[SDLVehicleDataResult alloc] initWithCustomDataType:@"customOEMVehicleData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeSuccess]; describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { @@ -187,14 +188,14 @@ expect(testResponse.cloudAppVehicleID).to(beNil()); }); + it(@"should set and get generic Network data", ^{ SDLUnsubscribeVehicleDataResponse *testRequest = [[SDLUnsubscribeVehicleDataResponse alloc] init]; - [testRequest setOEMCustomVehicleData:@"speed" withVehicleDataState:vehicleDataResult]; - [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:vehicleDataResult]; - expect([testRequest getOEMCustomVehicleData:@"speed"]).to(equal(vehicleDataResult)); - expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(vehicleDataResult)); + [testRequest setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult]; + + expect([testRequest getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(customOEMvehicleDataResult)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m index 07523e2fe..61588d31a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m @@ -27,6 +27,20 @@ expect(testStruct.customDataType).to(equal(SDLVehicleDataTypeAirbagStatus)); expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); }); + + it(@"Should set and get correctly", ^ { + SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithDataType:SDLVehicleDataTypeAirbagStatus SDLVehicleDataResultCode:SDLVehicleDataResultCodeDisallowed]; + + expect(testStruct.dataType).to(equal(SDLVehicleDataTypeAirbagStatus)); + expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); + }); + + it(@"Should set and get correctly", ^ { + SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithCustomDataType:@"CustomOEMData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeDisallowed]; + + expect(testStruct.customDataType).to(equal(@"CustomOEMData")); + expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); + }); it(@"Should get correctly when initialized", ^ { NSMutableDictionary* dict = [@{SDLRPCParameterNameDataType:SDLVehicleDataTypeAirbagStatus, From 34a1c5fe4790c6b557fcbbe5be111bb7d6f3478c Mon Sep 17 00:00:00 2001 From: piyushkhosla Date: Thu, 1 Aug 2019 18:21:01 +0530 Subject: [PATCH 04/50] updating naming for customDataType to oemCustomDataType --- SmartDeviceLink/SDLVehicleDataResult.h | 2 +- .../RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SmartDeviceLink/SDLVehicleDataResult.h b/SmartDeviceLink/SDLVehicleDataResult.h index 009bdaaa5..0cbad1213 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.h +++ b/SmartDeviceLink/SDLVehicleDataResult.h @@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN /** Defined published data element type */ -@property (strong, nonatomic) NSString *customDataType; +@property (nullable, strong, nonatomic) NSString *oemCustomDataType; /** Published data result code diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m index 61588d31a..5eab73c5a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m @@ -20,7 +20,7 @@ SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] init]; testStruct.dataType = SDLVehicleDataTypeAirbagStatus; - testStruct.customDataType = SDLVehicleDataTypeAirbagStatus; + testStruct.oemCustomDataType = SDLVehicleDataTypeAirbagStatus; testStruct.resultCode = SDLVehicleDataResultCodeDisallowed; expect(testStruct.dataType).to(equal(SDLVehicleDataTypeAirbagStatus)); @@ -38,7 +38,7 @@ it(@"Should set and get correctly", ^ { SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithCustomDataType:@"CustomOEMData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeDisallowed]; - expect(testStruct.customDataType).to(equal(@"CustomOEMData")); + expect(testStruct.oemCustomDataType).to(equal(@"CustomOEMData")); expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); }); @@ -53,7 +53,7 @@ #pragma clang diagnostic pop expect(testStruct.dataType).to(equal(SDLVehicleDataTypeAirbagStatus)); - expect(testStruct.customDataType).to(equal(SDLVehicleDataTypeRPM)); + expect(testStruct.oemCustomDataType).to(equal(SDLVehicleDataTypeRPM)); expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); }); @@ -61,7 +61,7 @@ SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] init]; expect(testStruct.dataType).to(beNil()); - expect(testStruct.customDataType).to(beNil()); + expect(testStruct.oemCustomDataType).to(beNil()); expect(testStruct.resultCode).to(beNil()); }); }); From 3883c5a414086cc3388324329f994af0d1f90be0 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Fri, 2 Aug 2019 08:55:44 -0400 Subject: [PATCH 05/50] Small changes to add SDLVehicleDataTypeOEMVehicleDataType and update unit test. --- SmartDeviceLink/SDLVehicleDataType.h | 4 ++++ SmartDeviceLink/SDLVehicleDataType.m | 1 + .../RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/SmartDeviceLink/SDLVehicleDataType.h b/SmartDeviceLink/SDLVehicleDataType.h index 1da4ad500..84941a6f0 100644 --- a/SmartDeviceLink/SDLVehicleDataType.h +++ b/SmartDeviceLink/SDLVehicleDataType.h @@ -163,3 +163,7 @@ extern SDLVehicleDataType const SDLVehicleDataTypeTurnSignal; The cloud application vehicle id. Used by cloud apps to identify a head unit */ extern SDLVehicleDataType const SDLVehicleDataTypeCloudAppVehicleID; +/** + Vehicle Custom OEM Vehicle data + */ +extern SDLVehicleDataType const SDLVehicleDataTypeOEMVehicleDataType; \ No newline at end of file diff --git a/SmartDeviceLink/SDLVehicleDataType.m b/SmartDeviceLink/SDLVehicleDataType.m index a64497b2a..d5b1e525b 100644 --- a/SmartDeviceLink/SDLVehicleDataType.m +++ b/SmartDeviceLink/SDLVehicleDataType.m @@ -35,4 +35,5 @@ SDLVehicleDataType const SDLVehicleDataTypeElectronicParkBrakeStatus = @"VEHICLEDATA_ELECTRONICPARKBRAKESTATUS"; SDLVehicleDataType const SDLVehicleDataTypeTurnSignal = @"VEHICLEDATA_TURNSIGNAL"; SDLVehicleDataType const SDLVehicleDataTypeCloudAppVehicleID = @"VEHICLEDATA_CLOUDAPPVEHICLEID"; +SDLVehicleDataType const SDLVehicleDataTypeOEMVehicleDataType = @"VEHICLEDATA_OEM_VEHICLE_DATA_TYPE"; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m index 5eab73c5a..0a55cf83c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m @@ -20,11 +20,11 @@ SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] init]; testStruct.dataType = SDLVehicleDataTypeAirbagStatus; - testStruct.oemCustomDataType = SDLVehicleDataTypeAirbagStatus; + testStruct.oemCustomDataType = @"CustomOEMData"; testStruct.resultCode = SDLVehicleDataResultCodeDisallowed; expect(testStruct.dataType).to(equal(SDLVehicleDataTypeAirbagStatus)); - expect(testStruct.customDataType).to(equal(SDLVehicleDataTypeAirbagStatus)); + expect(testStruct.oemCustomDataType).to(equal(@"CustomOEMData")); expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); }); From bb6c52ffd10a55b5ea0e415b1df6878150c730b5 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Fri, 2 Aug 2019 09:44:45 -0400 Subject: [PATCH 06/50] more refactoring --- SmartDeviceLink/SDLRPCParameterNames.h | 2 +- SmartDeviceLink/SDLRPCParameterNames.m | 2 +- SmartDeviceLink/SDLVehicleDataResult.h | 2 +- SmartDeviceLink/SDLVehicleDataResult.m | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SmartDeviceLink/SDLRPCParameterNames.h b/SmartDeviceLink/SDLRPCParameterNames.h index 542094a32..6e2b5843d 100644 --- a/SmartDeviceLink/SDLRPCParameterNames.h +++ b/SmartDeviceLink/SDLRPCParameterNames.h @@ -120,7 +120,7 @@ extern SDLRPCParameterName const SDLRPCParameterNameCurrentTemperature; extern SDLRPCParameterName const SDLRPCParameterNameCushion; extern SDLRPCParameterName const SDLRPCParameterNameCustomButtonId; extern SDLRPCParameterName const SDLRPCParameterNameCustomPresets; -extern SDLRPCParameterName const SDLRPCParameterNameCustomDataType; +extern SDLRPCParameterName const SDLRPCParameterNameOEMCustomDataType; extern SDLRPCParameterName const SDLRPCParameterNameData; extern SDLRPCParameterName const SDLRPCParameterNameDataResult; extern SDLRPCParameterName const SDLRPCParameterNameDataType; diff --git a/SmartDeviceLink/SDLRPCParameterNames.m b/SmartDeviceLink/SDLRPCParameterNames.m index 33d323381..53a3ab03d 100644 --- a/SmartDeviceLink/SDLRPCParameterNames.m +++ b/SmartDeviceLink/SDLRPCParameterNames.m @@ -118,7 +118,6 @@ SDLRPCParameterName const SDLRPCParameterNameCushion = @"cushion"; SDLRPCParameterName const SDLRPCParameterNameCustomButtonId = @"customButtonID"; SDLRPCParameterName const SDLRPCParameterNameCustomPresets = @"customPresets"; -SDLRPCParameterName const SDLRPCParameterNameCustomDataType = @"customDataType"; SDLRPCParameterName const SDLRPCParameterNameData = @"data"; SDLRPCParameterName const SDLRPCParameterNameDataResult = @"dataResult"; SDLRPCParameterName const SDLRPCParameterNameDataType = @"dataType"; @@ -404,6 +403,7 @@ SDLRPCParameterName const SDLRPCParameterNameNumberCustomPresetsAvailable = @"numCustomPresetsAvailable"; SDLRPCParameterName const SDLRPCParameterNameNumberTicks = @"numTicks"; SDLRPCParameterName const SDLRPCParameterNameOdometer = @"odometer"; +SDLRPCParameterName const SDLRPCParameterNameOEMCustomDataType = @"oemCustomDataType"; SDLRPCParameterName const SDLRPCParameterNameOffset = @"offset"; SDLRPCParameterName const SDLRPCParameterNameOnLockScreenStatus = @"OnLockScreenStatus"; SDLRPCParameterName const SDLRPCParameterNameOnScreenPresetsAvailable = @"onScreenPresetsAvailable"; diff --git a/SmartDeviceLink/SDLVehicleDataResult.h b/SmartDeviceLink/SDLVehicleDataResult.h index 0cbad1213..b530f8755 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.h +++ b/SmartDeviceLink/SDLVehicleDataResult.h @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithDataType:(SDLVehicleDataType)dataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode; -- (instancetype)initWithCustomDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode; +- (instancetype)initWithOEMCustomDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode; /** Defined published data element type diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m index 688baa3c2..be6cc0af5 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.m +++ b/SmartDeviceLink/SDLVehicleDataResult.m @@ -22,13 +22,13 @@ - (instancetype)initWithDataType:(SDLVehicleDataType)dataType SDLVehicleDataResu return self; } -- (instancetype)initWithCustomDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode{ +- (instancetype)initWithOEMCustomDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode{ self = [self init]; if (!self) { return nil; } - self.customDataType = customDataType; + self.oemCustomDataType = customDataType; self.resultCode = resultCode; return self; @@ -52,13 +52,13 @@ - (SDLVehicleDataResultCode)resultCode { return [self.store sdl_enumForName:SDLRPCParameterNameResultCode error:&error]; } -- (NSString *)customDataType { +- (nullable NSString *)oemCustomDataType { NSError *error = nil; - return [self.store sdl_enumForName:SDLRPCParameterNameCustomDataType error:&error]; + return [self.store sdl_enumForName:SDLRPCParameterNameOEMCustomDataType error:&error]; } -- (void)setCustomDataType:(NSString *)customDataType { - [self.store sdl_setObject:customDataType forName:SDLRPCParameterNameCustomDataType]; +- (void)setOemCustomDataType:(nullable NSString *)oemCustomDataType { + [self.store sdl_setObject:oemCustomDataType forName:SDLRPCParameterNameOEMCustomDataType]; } @end From 1081f1311a3e089d19fc091d77798db2973524cd Mon Sep 17 00:00:00 2001 From: mrapitis Date: Fri, 2 Aug 2019 11:14:22 -0400 Subject: [PATCH 07/50] more changes for unit tests --- SmartDeviceLink/SDLVehicleDataResult.h | 4 ++-- SmartDeviceLink/SDLVehicleDataResult.m | 8 ++++---- .../NotificationSpecs/SDLOnVehicleDataSpec.m | 6 ++---- .../RequestSpecs/SDLSubscribeVehicleDataSpec.m | 8 ++++---- .../RequestSpecs/SDLUnsubscribeVehicleDataSpec.m | 8 ++++---- .../ResponseSpecs/SDLGetVehicleDataResponseSpec.m | 7 +++---- .../SDLSubscribeVehicleDataResponseSpec.m | 2 +- .../SDLUnsubscribeVehicleDataResponseSpec.m | 2 +- .../StructSpecs/SDLVehicleDataResultSpec.m | 14 +++++++------- 9 files changed, 28 insertions(+), 31 deletions(-) diff --git a/SmartDeviceLink/SDLVehicleDataResult.h b/SmartDeviceLink/SDLVehicleDataResult.h index b530f8755..e729d32c4 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.h +++ b/SmartDeviceLink/SDLVehicleDataResult.h @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithDataType:(SDLVehicleDataType)dataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode; -- (instancetype)initWithOEMCustomDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode; +- (instancetype)initWithCustomOEMDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode; /** Defined published data element type @@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN /** Defined published data element type */ -@property (nullable, strong, nonatomic) NSString *oemCustomDataType; +@property (nullable, strong, nonatomic) NSString *customOEMDataType; /** Published data result code diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m index be6cc0af5..7c9b85e17 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.m +++ b/SmartDeviceLink/SDLVehicleDataResult.m @@ -22,13 +22,13 @@ - (instancetype)initWithDataType:(SDLVehicleDataType)dataType SDLVehicleDataResu return self; } -- (instancetype)initWithOEMCustomDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode{ +- (instancetype)initWithCustomOEMDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode{ self = [self init]; if (!self) { return nil; } - self.oemCustomDataType = customDataType; + self.customOEMDataType = customDataType; self.resultCode = resultCode; return self; @@ -52,12 +52,12 @@ - (SDLVehicleDataResultCode)resultCode { return [self.store sdl_enumForName:SDLRPCParameterNameResultCode error:&error]; } -- (nullable NSString *)oemCustomDataType { +- (nullable NSString *)customOEMDataType { NSError *error = nil; return [self.store sdl_enumForName:SDLRPCParameterNameOEMCustomDataType error:&error]; } -- (void)setOemCustomDataType:(nullable NSString *)oemCustomDataType { +- (void)setCustomOEMDataType:(nullable NSString *)oemCustomDataType { [self.store sdl_setObject:oemCustomDataType forName:SDLRPCParameterNameOEMCustomDataType]; } diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m index 16cc4fc0c..0f33b908b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -221,11 +221,9 @@ it(@"should set and get generic Network data", ^{ SDLOnVehicleData *testRequest = [[SDLOnVehicleData alloc] init]; - [testRequest setOEMCustomVehicleData:@"speed" withVehicleDataState:@100]; - [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:SDLTurnSignalOff]; + [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:@"oemVehicleData"]; - expect([testRequest getOEMCustomVehicleData:@"speed"]).to(equal(@100)); - expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(SDLTurnSignalOff)); + expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@"oemVehicleData")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index 5847feaa0..db752ea7f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -294,11 +294,11 @@ context(@"should set and get generic Network data", ^{ SDLSubscribeVehicleData *testRequest = [[SDLSubscribeVehicleData alloc] init]; - [testRequest setOEMCustomVehicleData:@"GPS" withVehicleDataState:NO]; - [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:YES]; + [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO]; + [testRequest setOEMCustomVehicleData:@"customVehicleData1" withVehicleDataState:YES]; - expect([testRequest getOEMCustomVehicleData:@"GPS"]).to(equal(NO)); - expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(@YES)); + expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(NO)); + expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(equal(@YES)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index e0d118483..ab10db0eb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -292,11 +292,11 @@ context(@"should set and get generic Network data", ^{ SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] init]; - [testRequest setOEMCustomVehicleData:@"GPS" withVehicleDataState:NO]; - [testRequest setOEMCustomVehicleData:@"turnSignal" withVehicleDataState:YES]; + [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO]; + [testRequest setOEMCustomVehicleData:@"customVehicleData1" withVehicleDataState:YES]; - expect([testRequest getOEMCustomVehicleData:@"GPS"]).to(equal(NO)); - expect([testRequest getOEMCustomVehicleData:@"turnSignal"]).to(equal(@YES)); + expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(NO)); + expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(equal(@YES)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index dd82920b0..225e398b4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -225,10 +225,9 @@ it(@"should set and get generic Network data", ^{ SDLGetVehicleDataResponse *testRequest = [[SDLGetVehicleDataResponse alloc] init]; - [testRequest setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:@"OEMVehicleDataState"]; - - expect([testRequest getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(@"OEMVehicleDataState")); - + [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:@"oemVehicleData"]; + + expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@"oemVehicleData")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index d75f5f1d3..a6616a340 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -18,7 +18,7 @@ QuickSpecBegin(SDLSubscribeVehicleDataResponseSpec) SDLVehicleDataResult* vehicleDataResult = [[SDLVehicleDataResult alloc] init]; -SDLVehicleDataResult* customOEMvehicleDataResult = [[SDLVehicleDataResult alloc] initWithCustomDataType:@"customOEMVehicleData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeSuccess]; +SDLVehicleDataResult* customOEMvehicleDataResult = [[SDLVehicleDataResult alloc] initWithCustomOEMDataType:@"customOEMVehicleData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeSuccess]; describe(@"Getter/Setter Tests", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 58b0d54d3..100eea5a8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -17,7 +17,7 @@ QuickSpecBegin(SDLUnsubscribeVehicleDataResponseSpec) SDLVehicleDataResult* vehicleDataResult = [[SDLVehicleDataResult alloc] init]; -SDLVehicleDataResult* customOEMvehicleDataResult = [[SDLVehicleDataResult alloc] initWithCustomDataType:@"customOEMVehicleData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeSuccess]; +SDLVehicleDataResult* customOEMvehicleDataResult = [[SDLVehicleDataResult alloc] initWithCustomOEMDataType:@"customOEMVehicleData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeSuccess]; describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m index 0a55cf83c..e485b14ac 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m @@ -20,11 +20,11 @@ SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] init]; testStruct.dataType = SDLVehicleDataTypeAirbagStatus; - testStruct.oemCustomDataType = @"CustomOEMData"; + testStruct.customOEMDataType = @"CustomOEMData"; testStruct.resultCode = SDLVehicleDataResultCodeDisallowed; expect(testStruct.dataType).to(equal(SDLVehicleDataTypeAirbagStatus)); - expect(testStruct.oemCustomDataType).to(equal(@"CustomOEMData")); + expect(testStruct.customOEMDataType).to(equal(@"CustomOEMData")); expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); }); @@ -36,16 +36,16 @@ }); it(@"Should set and get correctly", ^ { - SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithCustomDataType:@"CustomOEMData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeDisallowed]; + SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithCustomOEMDataType:@"CustomOEMData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeDisallowed]; - expect(testStruct.oemCustomDataType).to(equal(@"CustomOEMData")); + expect(testStruct.customOEMDataType).to(equal(@"CustomOEMData")); expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); }); it(@"Should get correctly when initialized", ^ { NSMutableDictionary* dict = [@{SDLRPCParameterNameDataType:SDLVehicleDataTypeAirbagStatus, SDLRPCParameterNameResultCode:SDLVehicleDataResultCodeDisallowed, - SDLRPCParameterNameCustomDataType:SDLVehicleDataTypeRPM + SDLRPCParameterNameOEMCustomDataType:@"CustomOEMData" } mutableCopy]; #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" @@ -53,7 +53,7 @@ #pragma clang diagnostic pop expect(testStruct.dataType).to(equal(SDLVehicleDataTypeAirbagStatus)); - expect(testStruct.oemCustomDataType).to(equal(SDLVehicleDataTypeRPM)); + expect(testStruct.customOEMDataType).to(equal(@"CustomOEMData")); expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); }); @@ -61,7 +61,7 @@ SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] init]; expect(testStruct.dataType).to(beNil()); - expect(testStruct.oemCustomDataType).to(beNil()); + expect(testStruct.customOEMDataType).to(beNil()); expect(testStruct.resultCode).to(beNil()); }); }); From fe5f3e6d432fc289175a35c5f07533aad914bc54 Mon Sep 17 00:00:00 2001 From: mrapitis Date: Fri, 2 Aug 2019 14:09:30 -0400 Subject: [PATCH 08/50] updated documentation --- SmartDeviceLink/SDLGetVehicleData.h | 12 +++++++++++- SmartDeviceLink/SDLGetVehicleDataResponse.h | 12 ++++++++++++ SmartDeviceLink/SDLOnVehicleData.h | 11 +++++++++++ SmartDeviceLink/SDLSubscribeVehicleData.h | 12 ++++++++++++ SmartDeviceLink/SDLSubscribeVehicleDataResponse.h | 12 ++++++++++++ SmartDeviceLink/SDLUnsubscribeVehicleData.h | 12 ++++++++++++ SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h | 12 ++++++++++++ .../RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m | 2 ++ 8 files changed, 84 insertions(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index a4394be91..6d0e9f149 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -271,9 +271,19 @@ NS_ASSUME_NONNULL_BEGIN A boolean value. If true, requests the Cloud App Vehicle ID. */ @property (nullable, strong, nonatomic) NSNumber *cloudAppVehicleID; +/** + Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. + @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @param vehicleDataState - a boolean value. If true, requests the OEM custom vehicle data item. + */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; - +/** + Gets the OEM custom vehicle data value for any given OEM custom vehicle data name. + + @param vehicleDataName - The name of the OEM custom vehicle data item. + @return an OEM custom vehicle data item for the given vehicle data name. + */ - (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 451c90bf9..2c9ab5559 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -186,8 +186,20 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nullable, strong, nonatomic) NSString *cloudAppVehicleID; +/** + Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. + + @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @param vehicleDataState - An object containing the OEM custom vehicle data item. + */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; +/** + Gets the OEM custom vehicle data item for any given OEM custom vehicle data name. + + @param vehicleDataName - The name of the OEM custom vehicle data item. + @return an OEM custom vehicle data item for the given vehicle data name. + */ - (id)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 991bb6573..2e580c028 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -186,8 +186,19 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nullable, strong, nonatomic) NSString *cloudAppVehicleID; +/** + Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. + + @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @param vehicleDataState - Sets the state of the OEM custom vehicle data item.. + */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; +/** + Gets the OEM custom vehicle data for any given OEM custom vehicle data name. + + @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + */ - (id)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index af02fce96..70a58b4ba 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -266,8 +266,20 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) NSNumber *cloudAppVehicleID; +/** + Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. + + @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @param vehicleDataState - a boolean value. If true, requests the OEM custom vehicle data item. + */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; +/** + Gets the OEM custom vehicle data value for any given OEM custom vehicle data name. + + @param vehicleDataName - The name of the OEM custom vehicle data item. + @return an OEM custom vehicle data item for the given vehicle data name. + */ - (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 97c43d108..46064f99c 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -219,8 +219,20 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) SDLVehicleDataResult *cloudAppVehicleID; +/** + Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. + + @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @param vehicleDataState - SDLVehicleDataResult object containing custom data type and result code information. + */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; +/** + Gets the OEM custom vehicle data state for any given OEM custom vehicle data name. + + @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @return SDLVehicleDataResult object containing custom data type and result code information. + */ - (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index 291c2540b..fae8fe26f 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -268,8 +268,20 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) NSNumber *cloudAppVehicleID; +/** + Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. + + @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @param vehicleDataState - a boolean value. If true, requests the OEM custom vehicle data item. + */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; +/** + Gets the OEM custom vehicle data state for any given OEM custom vehicle data name. + + @param vehicleDataName - The name of the OEM custom vehicle data item to unsubscribe for. + @return A boolean value indicating if an unsubscribe request will occur for the OEM custom vehicle data item. + */ - (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index 1c639e369..e9688bc98 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -218,8 +218,20 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) SDLVehicleDataResult *cloudAppVehicleID; +/** + Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. + + @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @param vehicleDataState - SDLVehicleDataResult object containing custom data type and result code information. + */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; +/** + Gets the OEM custom vehicle data state for any given OEM custom vehicle data name. + + @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @return SDLVehicleDataResult object containing custom data type and result code information. + */ - (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 75e405e06..870b938e6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -295,8 +295,10 @@ SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] init]; [testRequest setOEMCustomVehicleData:@"OEMCustomVehicleData" withVehicleDataState:NO]; + [testRequest setOEMCustomVehicleData:@"OEMCustomVehicleData1" withVehicleDataState:YES]; expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData"]).to(equal(@NO)); + expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData1"]).to(equal(@YES)); }); From 371ce16560de36a9c6beeffefaf69829157d28a0 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Mon, 5 Aug 2019 09:28:37 -0400 Subject: [PATCH 09/50] More doc updates. --- SmartDeviceLink/SDLGetVehicleData.h | 6 +++--- SmartDeviceLink/SDLGetVehicleDataResponse.h | 4 ++-- SmartDeviceLink/SDLOnVehicleData.h | 9 +++++---- SmartDeviceLink/SDLSubscribeVehicleData.h | 6 +++--- SmartDeviceLink/SDLSubscribeVehicleDataResponse.h | 6 +++--- SmartDeviceLink/SDLUnsubscribeVehicleData.h | 4 ++-- SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h | 6 +++--- SmartDeviceLink/SDLVehicleDataResult.h | 12 ++++++++++++ SmartDeviceLink/SDLVehicleDataType.h | 2 +- .../NotificationSpecs/SDLOnVehicleDataSpec.m | 2 +- .../RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m | 2 +- .../RequestSpecs/SDLSubscribeVehicleDataSpec.m | 2 +- .../RequestSpecs/SDLUnsubscribeVehicleDataSpec.m | 2 +- .../ResponseSpecs/SDLGetVehicleDataResponseSpec.m | 2 +- .../SDLSubscribeVehicleDataResponseSpec.m | 2 +- .../SDLUnsubscribeVehicleDataResponseSpec.m | 2 +- 16 files changed, 41 insertions(+), 28 deletions(-) diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index 6d0e9f149..fd974d1c0 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -274,15 +274,15 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - Sets the name of the OEM custom vehicle data item. - @param vehicleDataState - a boolean value. If true, requests the OEM custom vehicle data item. + @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataState - A boolean value. If true, requests the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; /** Gets the OEM custom vehicle data value for any given OEM custom vehicle data name. @param vehicleDataName - The name of the OEM custom vehicle data item. - @return an OEM custom vehicle data item for the given vehicle data name. + @return - The state of an OEM custom vehicle data item for the given vehicle data name. */ - (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 2c9ab5559..02d8f2b6f 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -189,7 +189,7 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @param vehicleDataName - The name of the OEM custom vehicle data item. @param vehicleDataState - An object containing the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; @@ -198,7 +198,7 @@ NS_ASSUME_NONNULL_BEGIN Gets the OEM custom vehicle data item for any given OEM custom vehicle data name. @param vehicleDataName - The name of the OEM custom vehicle data item. - @return an OEM custom vehicle data item for the given vehicle data name. + @return - An OEM custom vehicle data object for the given vehicle data name. */ - (id)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 2e580c028..14399e7a9 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -189,15 +189,16 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - Sets the name of the OEM custom vehicle data item. - @param vehicleDataState - Sets the state of the OEM custom vehicle data item.. + @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataState - An object containing the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; /** - Gets the OEM custom vehicle data for any given OEM custom vehicle data name. + Gets the OEM custom vehicle data item for any given OEM custom vehicle data name. - @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @param vehicleDataName - The name of the OEM custom vehicle data item. + @return - An OEM custom vehicle data object for the given vehicle data name. */ - (id)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index 70a58b4ba..129abdff0 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -269,8 +269,8 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - Sets the name of the OEM custom vehicle data item. - @param vehicleDataState - a boolean value. If true, requests the OEM custom vehicle data item. + @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataState - A boolean value. If true, requests the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; @@ -278,7 +278,7 @@ NS_ASSUME_NONNULL_BEGIN Gets the OEM custom vehicle data value for any given OEM custom vehicle data name. @param vehicleDataName - The name of the OEM custom vehicle data item. - @return an OEM custom vehicle data item for the given vehicle data name. + @return - The state of an OEM custom vehicle data item for the given vehicle data name. */ - (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 46064f99c..3da7d24ee 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -222,7 +222,7 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @param vehicleDataName - The name of the OEM custom vehicle data item. @param vehicleDataState - SDLVehicleDataResult object containing custom data type and result code information. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; @@ -230,8 +230,8 @@ NS_ASSUME_NONNULL_BEGIN /** Gets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - Sets the name of the OEM custom vehicle data item. - @return SDLVehicleDataResult object containing custom data type and result code information. + @param vehicleDataName - The name of the OEM custom vehicle data item. + @return SDLVehicleDataResult - An object containing custom data type and result code information. */ - (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index fae8fe26f..19bd1a359 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -271,8 +271,8 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - Sets the name of the OEM custom vehicle data item. - @param vehicleDataState - a boolean value. If true, requests the OEM custom vehicle data item. + @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataState - A boolean value. If true, requests an unsubscribes of the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index e9688bc98..032b01c12 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -221,7 +221,7 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - Sets the name of the OEM custom vehicle data item. + @param vehicleDataName - The name of the OEM custom vehicle data item. @param vehicleDataState - SDLVehicleDataResult object containing custom data type and result code information. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; @@ -229,8 +229,8 @@ NS_ASSUME_NONNULL_BEGIN /** Gets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - Sets the name of the OEM custom vehicle data item. - @return SDLVehicleDataResult object containing custom data type and result code information. + @param vehicleDataName - The name of the OEM custom vehicle data item. + @return SDLVehicleDataResult - object containing custom data type and result code information. */ - (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLVehicleDataResult.h b/SmartDeviceLink/SDLVehicleDataResult.h index e729d32c4..66fa2713e 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.h +++ b/SmartDeviceLink/SDLVehicleDataResult.h @@ -13,8 +13,20 @@ NS_ASSUME_NONNULL_BEGIN */ @interface SDLVehicleDataResult : SDLRPCStruct +/** + * Convenience init for creating a SDLVehicleDataResult with a dataType + * + * @param dataType - The Vehicle DataType data + * @param resultCode - The VehicleData ResultCode data + */ - (instancetype)initWithDataType:(SDLVehicleDataType)dataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode; +/** + * Convenience init for creating a SDLVehicleDataResult with a customDataType + * + * @param customDataType - The custom dataType data + * @param resultCode - The VehicleData ResultCode data + */ - (instancetype)initWithCustomOEMDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode; /** diff --git a/SmartDeviceLink/SDLVehicleDataType.h b/SmartDeviceLink/SDLVehicleDataType.h index 84941a6f0..1079d66e3 100644 --- a/SmartDeviceLink/SDLVehicleDataType.h +++ b/SmartDeviceLink/SDLVehicleDataType.h @@ -164,6 +164,6 @@ extern SDLVehicleDataType const SDLVehicleDataTypeTurnSignal; */ extern SDLVehicleDataType const SDLVehicleDataTypeCloudAppVehicleID; /** - Vehicle Custom OEM Vehicle data + Custom OEM Vehicle data */ extern SDLVehicleDataType const SDLVehicleDataTypeOEMVehicleDataType; \ No newline at end of file diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m index 0f33b908b..1e27c3c9f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -218,7 +218,7 @@ expect(testNotification.wiperStatus).to(beNil()); }); - it(@"should set and get generic Network data", ^{ + it(@"Should set and get generic Network Signal Data", ^{ SDLOnVehicleData *testRequest = [[SDLOnVehicleData alloc] init]; [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:@"oemVehicleData"]; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 870b938e6..1e6817a4b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -291,7 +291,7 @@ expect(testRequest.wiperStatus).to(equal(@YES)); }); - context(@"should set and get generic Network data", ^{ + context(@"Should set and get Generic Network Signal Data", ^{ SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] init]; [testRequest setOEMCustomVehicleData:@"OEMCustomVehicleData" withVehicleDataState:NO]; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index db752ea7f..9db038f16 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -291,7 +291,7 @@ #pragma clang diagnostic pop }); - context(@"should set and get generic Network data", ^{ + context(@"Should set and get Generic Network Signal Data", ^{ SDLSubscribeVehicleData *testRequest = [[SDLSubscribeVehicleData alloc] init]; [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO]; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index ab10db0eb..74739f4de 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -289,7 +289,7 @@ #pragma clang diagnostic pop }); - context(@"should set and get generic Network data", ^{ + context(@"Should set and get Generic Network Signal Data", ^{ SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] init]; [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO]; diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index 225e398b4..9f2858674 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -222,7 +222,7 @@ expect(testResponse.wiperStatus).to(beNil()); }); - it(@"should set and get generic Network data", ^{ + it(@"Should set and get Generic Network Signal Data", ^{ SDLGetVehicleDataResponse *testRequest = [[SDLGetVehicleDataResponse alloc] init]; [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:@"oemVehicleData"]; diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index a6616a340..98f60d804 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -189,7 +189,7 @@ expect(testResponse.wiperStatus).to(beNil()); }); - it(@"should set and get generic Network data", ^{ + it(@"Should set and get Generic Network Signal Data", ^{ SDLSubscribeVehicleDataResponse *testRequest = [[SDLSubscribeVehicleDataResponse alloc] init]; diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 100eea5a8..345713dc5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -189,7 +189,7 @@ }); - it(@"should set and get generic Network data", ^{ + it(@"Should set and get Generic Network Signal Data", ^{ SDLUnsubscribeVehicleDataResponse *testRequest = [[SDLUnsubscribeVehicleDataResponse alloc] init]; From 10db359bd44ce465672d95d237604b94b6c7b373 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:45:11 -0400 Subject: [PATCH 10/50] Update SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m Co-Authored-By: Joel Fischer --- .../ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m | 1 - 1 file changed, 1 deletion(-) diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 345713dc5..99e969e40 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -188,7 +188,6 @@ expect(testResponse.cloudAppVehicleID).to(beNil()); }); - it(@"Should set and get Generic Network Signal Data", ^{ SDLUnsubscribeVehicleDataResponse *testRequest = [[SDLUnsubscribeVehicleDataResponse alloc] init]; From a789d4fd243edb628013a9c19cdc3c5c79a71e46 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:45:34 -0400 Subject: [PATCH 11/50] Update SmartDeviceLink/SDLGetVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleData.h | 1 + 1 file changed, 1 insertion(+) diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index fd974d1c0..4f2ab486e 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -271,6 +271,7 @@ NS_ASSUME_NONNULL_BEGIN A boolean value. If true, requests the Cloud App Vehicle ID. */ @property (nullable, strong, nonatomic) NSNumber *cloudAppVehicleID; + /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. From c4b1e8ee49203de2321c65d8a6cd47dd1ec5b2a9 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:45:43 -0400 Subject: [PATCH 12/50] Update SmartDeviceLink/SDLGetVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleData.h | 1 + 1 file changed, 1 insertion(+) diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index 4f2ab486e..87474aff7 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -279,6 +279,7 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataState - A boolean value. If true, requests the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; + /** Gets the OEM custom vehicle data value for any given OEM custom vehicle data name. From 7b529320420f94aedbc238a8f7cc7fb345b32035 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:45:51 -0400 Subject: [PATCH 13/50] Update SmartDeviceLink/SDLGetVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index 87474aff7..2776f6283 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -284,7 +284,7 @@ NS_ASSUME_NONNULL_BEGIN Gets the OEM custom vehicle data value for any given OEM custom vehicle data name. @param vehicleDataName - The name of the OEM custom vehicle data item. - @return - The state of an OEM custom vehicle data item for the given vehicle data name. + @return The state of an OEM custom vehicle data item for the given vehicle data name. */ - (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; From 96136d9879733a1e203348a7a8fc2dddca376550 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:45:59 -0400 Subject: [PATCH 14/50] Update SmartDeviceLink/SDLSubscribeVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLSubscribeVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index 129abdff0..bd6fb54e5 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -269,7 +269,7 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState - A boolean value. If true, requests the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; From 43f595bd6109cd0eb7eab30984f52734c358d717 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:46:09 -0400 Subject: [PATCH 15/50] Update SmartDeviceLink/SDLSubscribeVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLSubscribeVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index bd6fb54e5..2fd66ee7c 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -270,7 +270,7 @@ NS_ASSUME_NONNULL_BEGIN Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. @param vehicleDataName The name of the OEM custom vehicle data item. - @param vehicleDataState - A boolean value. If true, requests the OEM custom vehicle data item. + @param vehicleDataState A boolean value. If true, requests the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; From e113d7e577b6a7d4d574eeffdbbec429a42eb087 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:46:20 -0400 Subject: [PATCH 16/50] Update SmartDeviceLink/SDLSubscribeVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLSubscribeVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index 2fd66ee7c..a78cb1502 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -277,7 +277,7 @@ NS_ASSUME_NONNULL_BEGIN /** Gets the OEM custom vehicle data value for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @return - The state of an OEM custom vehicle data item for the given vehicle data name. */ - (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; From 3d7e11aca23988a5e4fd45eb77ab5251ff8515fe Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:46:36 -0400 Subject: [PATCH 17/50] Update SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m Co-Authored-By: Joel Fischer --- .../ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m | 1 - 1 file changed, 1 deletion(-) diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 99e969e40..32590a23f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -195,7 +195,6 @@ [testRequest setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult]; expect([testRequest getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(customOEMvehicleDataResult)); - }); }); From e927b452bae6957964e9bc0bea62988442bd713b Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:46:51 -0400 Subject: [PATCH 18/50] Update SmartDeviceLink/SDLSubscribeVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLSubscribeVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index a78cb1502..8720708d7 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -278,7 +278,7 @@ NS_ASSUME_NONNULL_BEGIN Gets the OEM custom vehicle data value for any given OEM custom vehicle data name. @param vehicleDataName The name of the OEM custom vehicle data item. - @return - The state of an OEM custom vehicle data item for the given vehicle data name. + @return The state of an OEM custom vehicle data item for the given vehicle data name. */ - (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; From 4cd418eac03fd81b471cbf6e3ec03015ee010299 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:47:02 -0400 Subject: [PATCH 19/50] Update SmartDeviceLink/SDLUnsubscribeVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLUnsubscribeVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index 19bd1a359..3ba646f70 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -271,7 +271,7 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState - A boolean value. If true, requests an unsubscribes of the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; From eb0b108bd05aabebdb5bcd6c6dd5f8483e8c6e3c Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:47:13 -0400 Subject: [PATCH 20/50] Update SmartDeviceLink/SDLUnsubscribeVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLUnsubscribeVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index 3ba646f70..560d154dd 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -272,7 +272,7 @@ NS_ASSUME_NONNULL_BEGIN Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. @param vehicleDataName The name of the OEM custom vehicle data item. - @param vehicleDataState - A boolean value. If true, requests an unsubscribes of the OEM custom vehicle data item. + @param vehicleDataState A boolean value. If true, requests an unsubscribes of the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; From f574c1c93ebbf555fd8ecd1587c631d472505ab8 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:47:33 -0400 Subject: [PATCH 21/50] Update SmartDeviceLink/SDLUnsubscribeVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLUnsubscribeVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index 560d154dd..bbfb78e2a 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -279,7 +279,7 @@ NS_ASSUME_NONNULL_BEGIN /** Gets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item to unsubscribe for. + @param vehicleDataName The name of the OEM custom vehicle data item to unsubscribe for. @return A boolean value indicating if an unsubscribe request will occur for the OEM custom vehicle data item. */ - (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; From 51b45aaa29f3e830734020043e67221878137143 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:47:47 -0400 Subject: [PATCH 22/50] Update SmartDeviceLink/SDLGetVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 02d8f2b6f..501cc3c71 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -189,7 +189,7 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState - An object containing the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; From 0e3e24977d7c90030a08aa7737d9ca74e20c8a27 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:47:56 -0400 Subject: [PATCH 23/50] Update SmartDeviceLink/SDLGetVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 501cc3c71..2a04f9920 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -190,7 +190,7 @@ NS_ASSUME_NONNULL_BEGIN Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. @param vehicleDataName The name of the OEM custom vehicle data item. - @param vehicleDataState - An object containing the OEM custom vehicle data item. + @param vehicleDataState An object containing the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; From 85201bf07e4d431f7a3a712907f67ff58d8f6fb4 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:48:11 -0400 Subject: [PATCH 24/50] Update SmartDeviceLink/SDLGetVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 2a04f9920..a3bf72f95 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -197,7 +197,7 @@ NS_ASSUME_NONNULL_BEGIN /** Gets the OEM custom vehicle data item for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @return - An OEM custom vehicle data object for the given vehicle data name. */ - (id)getOEMCustomVehicleData:(NSString *)vehicleDataName; From 7d31ee27c2ffbe94cb2babe3ec91bcfc8df244df Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:48:23 -0400 Subject: [PATCH 25/50] Update SmartDeviceLink/SDLGetVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index a3bf72f95..36c577c6b 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -198,7 +198,7 @@ NS_ASSUME_NONNULL_BEGIN Gets the OEM custom vehicle data item for any given OEM custom vehicle data name. @param vehicleDataName The name of the OEM custom vehicle data item. - @return - An OEM custom vehicle data object for the given vehicle data name. + @return An OEM custom vehicle data object for the given vehicle data name. */ - (id)getOEMCustomVehicleData:(NSString *)vehicleDataName; From ed09a82ef95ec67341117dc401d9859c541f26b0 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:49:07 -0400 Subject: [PATCH 26/50] Update SmartDeviceLink/SDLGetVehicleDataResponse.m Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleDataResponse.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index 868e7f8be..cb549a531 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -277,7 +277,7 @@ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName]; } -- (id)getOEMCustomVehicleData:(NSString *)vehicleDataName { +- (NSObject *)getOEMCustomVehicleData:(NSString *)vehicleDataName { return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSObject.class error:nil]; } From 83127a71638a3453bf588a29c4eb23388a9664d6 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:49:48 -0400 Subject: [PATCH 27/50] Update SmartDeviceLink/SDLGetVehicleDataResponse.m Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleDataResponse.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index cb549a531..c75290d6a 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -273,7 +273,7 @@ - (nullable NSString *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSString.class error:nil]; } -- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState { +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(NSObject *)vehicleDataState { [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName]; } From 20c8994aa2ad144af316d4af93d9ed9d0be6b7f2 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:56:21 -0400 Subject: [PATCH 28/50] Update SmartDeviceLink/SDLGetVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 36c577c6b..dc4fe27fc 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -192,7 +192,7 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState An object containing the OEM custom vehicle data item. */ -- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(NSObject *)vehicleDataState; /** Gets the OEM custom vehicle data item for any given OEM custom vehicle data name. From c95b2f3bbb48f878d44b5282539fec2b22ff4650 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:56:47 -0400 Subject: [PATCH 29/50] Update SmartDeviceLink/SDLGetVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index dc4fe27fc..67a8f6241 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -200,7 +200,7 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @return An OEM custom vehicle data object for the given vehicle data name. */ -- (id)getOEMCustomVehicleData:(NSString *)vehicleDataName; +- (NSObject *)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end From 914e86025fc148711e8e47274b2edff4ca42cb16 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:57:12 -0400 Subject: [PATCH 30/50] Update SmartDeviceLink/SDLOnVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLOnVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 14399e7a9..3adb39a6c 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -189,7 +189,7 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState - An object containing the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; From fda1b74450a9f0e79b5d19c129b42f5c67a5d99e Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:57:35 -0400 Subject: [PATCH 31/50] Update SmartDeviceLink/SDLOnVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLOnVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 3adb39a6c..b406e64b5 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -190,7 +190,7 @@ NS_ASSUME_NONNULL_BEGIN Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. @param vehicleDataName The name of the OEM custom vehicle data item. - @param vehicleDataState - An object containing the OEM custom vehicle data item. + @param vehicleDataState An object containing the OEM custom vehicle data item. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; From c51de45fc19f436c046f0dfd0eed77cbe55557b8 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 11:57:49 -0400 Subject: [PATCH 32/50] Update SmartDeviceLink/SDLOnVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLOnVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index b406e64b5..2ede7ee6b 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -197,7 +197,7 @@ NS_ASSUME_NONNULL_BEGIN /** Gets the OEM custom vehicle data item for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @return - An OEM custom vehicle data object for the given vehicle data name. */ - (id)getOEMCustomVehicleData:(NSString *)vehicleDataName; From 7d221d41b2e913ce137db3517d2dc956dfcc1e8f Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:00:10 -0400 Subject: [PATCH 33/50] Update SmartDeviceLink/SDLOnVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLOnVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 2ede7ee6b..921184108 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -192,7 +192,7 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState An object containing the OEM custom vehicle data item. */ -- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState; +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(NSObject *)vehicleDataState; /** Gets the OEM custom vehicle data item for any given OEM custom vehicle data name. From 579eba3fc37264b9f23b44085283f1df20905850 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:00:27 -0400 Subject: [PATCH 34/50] Update SmartDeviceLink/SDLOnVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLOnVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 921184108..19aba15a5 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -198,7 +198,7 @@ NS_ASSUME_NONNULL_BEGIN Gets the OEM custom vehicle data item for any given OEM custom vehicle data name. @param vehicleDataName The name of the OEM custom vehicle data item. - @return - An OEM custom vehicle data object for the given vehicle data name. + @return An OEM custom vehicle data object for the given vehicle data name. */ - (id)getOEMCustomVehicleData:(NSString *)vehicleDataName; From ae2e4484e2d2472e46410ecf6375bd575313c784 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:01:02 -0400 Subject: [PATCH 35/50] Update SmartDeviceLink/SDLOnVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLOnVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 19aba15a5..0d619bdb6 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -200,7 +200,7 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @return An OEM custom vehicle data object for the given vehicle data name. */ -- (id)getOEMCustomVehicleData:(NSString *)vehicleDataName; +- (NSObject *)getOEMCustomVehicleData:(NSString *)vehicleDataName; @end From fbe54df07b3543e73c31c2be15bf50b3d613c3c1 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:01:20 -0400 Subject: [PATCH 36/50] Update SmartDeviceLink/SDLOnVehicleData.m Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLOnVehicleData.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index e4596fc78..809f06f40 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -276,7 +276,7 @@ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName]; } -- (id)getOEMCustomVehicleData:(NSString *)vehicleDataName { +- (NSObject *)getOEMCustomVehicleData:(NSString *)vehicleDataName { return [self.parameters sdl_objectForName:vehicleDataName ofClass:NSObject.class error:nil]; } From d752db3d9e922537a8e80136f419ccbb8f97a019 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:01:43 -0400 Subject: [PATCH 37/50] Update SmartDeviceLink/SDLOnVehicleData.m Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLOnVehicleData.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index 809f06f40..502d669b7 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -272,7 +272,7 @@ - (nullable NSString *)cloudAppVehicleID { return [self.parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:NSString.class error:nil]; } -- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(id)vehicleDataState { +- (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(NSObject *)vehicleDataState { [self.parameters sdl_setObject:vehicleDataState forName:vehicleDataName]; } From bf2753007be9bfa157a2e73cce4dc6297d4949ed Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:02:01 -0400 Subject: [PATCH 38/50] Update SmartDeviceLink/SDLSubscribeVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLSubscribeVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 3da7d24ee..9c15a3c08 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -222,7 +222,7 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState - SDLVehicleDataResult object containing custom data type and result code information. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; From 5aeed8bc97d1c5d932365297a0072d38108973ac Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:02:23 -0400 Subject: [PATCH 39/50] Update SmartDeviceLink/SDLSubscribeVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLSubscribeVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 9c15a3c08..966442fb1 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -223,7 +223,7 @@ NS_ASSUME_NONNULL_BEGIN Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. @param vehicleDataName The name of the OEM custom vehicle data item. - @param vehicleDataState - SDLVehicleDataResult object containing custom data type and result code information. + @param vehicleDataState SDLVehicleDataResult object containing custom data type and result code information. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; From f3787273afade10806bfcb4f42558d18864e4a5d Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:02:49 -0400 Subject: [PATCH 40/50] Update SmartDeviceLink/SDLSubscribeVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLSubscribeVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 966442fb1..174feb453 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -230,7 +230,7 @@ NS_ASSUME_NONNULL_BEGIN /** Gets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @return SDLVehicleDataResult - An object containing custom data type and result code information. */ - (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; From 25a039c713a40b943b8b9fd82ce2e8e86b7a1802 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:03:48 -0400 Subject: [PATCH 41/50] Update SmartDeviceLink/SDLSubscribeVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLSubscribeVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 174feb453..6844828b6 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -231,7 +231,7 @@ NS_ASSUME_NONNULL_BEGIN Gets the OEM custom vehicle data state for any given OEM custom vehicle data name. @param vehicleDataName The name of the OEM custom vehicle data item. - @return SDLVehicleDataResult - An object containing custom data type and result code information. + @return SDLVehicleDataResult An object containing custom data type and result code information. */ - (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; From bf0021574ad723a867eb420b012e7f77ccc7e093 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:04:04 -0400 Subject: [PATCH 42/50] Update SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index 032b01c12..cdc7989b1 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -221,7 +221,7 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState - SDLVehicleDataResult object containing custom data type and result code information. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; From 2a11b48d93d4907950958ff7b5257edd7091c450 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:04:19 -0400 Subject: [PATCH 43/50] Update SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index cdc7989b1..942bf4d22 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -222,7 +222,7 @@ NS_ASSUME_NONNULL_BEGIN Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. @param vehicleDataName The name of the OEM custom vehicle data item. - @param vehicleDataState - SDLVehicleDataResult object containing custom data type and result code information. + @param vehicleDataState SDLVehicleDataResult object containing custom data type and result code information. */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; From 3ba6da79e463470a979445a5373927254a66f505 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:05:21 -0400 Subject: [PATCH 44/50] Update SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index 942bf4d22..59a646bca 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -229,7 +229,7 @@ NS_ASSUME_NONNULL_BEGIN /** Gets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @return SDLVehicleDataResult - object containing custom data type and result code information. */ - (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; From c315567703b745a3f5fa94de4b39059f71fbae44 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:06:12 -0400 Subject: [PATCH 45/50] Update SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index 59a646bca..c759e9167 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -230,7 +230,7 @@ NS_ASSUME_NONNULL_BEGIN Gets the OEM custom vehicle data state for any given OEM custom vehicle data name. @param vehicleDataName The name of the OEM custom vehicle data item. - @return SDLVehicleDataResult - object containing custom data type and result code information. + @return SDLVehicleDataResult object containing custom data type and result code information. */ - (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; From c51a4597ba62223797e84d6f4fb57f7c5eb47ea2 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Tue, 27 Aug 2019 12:09:31 -0400 Subject: [PATCH 46/50] Apply suggestions from code review Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLVehicleDataResult.h | 14 +++++++------- SmartDeviceLink/SDLVehicleDataType.h | 5 ++++- SmartDeviceLink/SDLVehicleDataType.m | 2 +- .../RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m | 4 ++-- .../RequestSpecs/SDLSubscribeVehicleDataSpec.m | 4 ++-- .../RequestSpecs/SDLUnsubscribeVehicleDataSpec.m | 4 ++-- .../ResponseSpecs/SDLGetVehicleDataResponseSpec.m | 1 - .../SDLSubscribeVehicleDataResponseSpec.m | 2 -- .../SDLUnsubscribeVehicleDataResponseSpec.m | 1 - 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/SmartDeviceLink/SDLVehicleDataResult.h b/SmartDeviceLink/SDLVehicleDataResult.h index 66fa2713e..acc78c6a9 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.h +++ b/SmartDeviceLink/SDLVehicleDataResult.h @@ -16,18 +16,18 @@ NS_ASSUME_NONNULL_BEGIN /** * Convenience init for creating a SDLVehicleDataResult with a dataType * - * @param dataType - The Vehicle DataType data - * @param resultCode - The VehicleData ResultCode data + * @param dataType The Vehicle DataType data + * @param resultCode The VehicleData ResultCode data */ -- (instancetype)initWithDataType:(SDLVehicleDataType)dataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode; +- (instancetype)initWithDataType:(SDLVehicleDataType)dataType resultCode:(SDLVehicleDataResultCode)resultCode; /** * Convenience init for creating a SDLVehicleDataResult with a customDataType * - * @param customDataType - The custom dataType data - * @param resultCode - The VehicleData ResultCode data + * @param customDataType The custom dataType data + * @param resultCode The VehicleData ResultCode data */ -- (instancetype)initWithCustomOEMDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode; +- (instancetype)initWithCustomOEMDataType:(NSString *)customDataType resultCode:(SDLVehicleDataResultCode)resultCode; /** Defined published data element type @@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN @property (strong, nonatomic) SDLVehicleDataType dataType; /** - Defined published data element type + OEM custom defined published data element type */ @property (nullable, strong, nonatomic) NSString *customOEMDataType; diff --git a/SmartDeviceLink/SDLVehicleDataType.h b/SmartDeviceLink/SDLVehicleDataType.h index 1079d66e3..e65cdcef9 100644 --- a/SmartDeviceLink/SDLVehicleDataType.h +++ b/SmartDeviceLink/SDLVehicleDataType.h @@ -163,7 +163,10 @@ extern SDLVehicleDataType const SDLVehicleDataTypeTurnSignal; The cloud application vehicle id. Used by cloud apps to identify a head unit */ extern SDLVehicleDataType const SDLVehicleDataTypeCloudAppVehicleID; + /** Custom OEM Vehicle data + + Added in SDL 6.0 */ -extern SDLVehicleDataType const SDLVehicleDataTypeOEMVehicleDataType; \ No newline at end of file +extern SDLVehicleDataType const SDLVehicleDataTypeOEMVehicleDataType; diff --git a/SmartDeviceLink/SDLVehicleDataType.m b/SmartDeviceLink/SDLVehicleDataType.m index d5b1e525b..895613873 100644 --- a/SmartDeviceLink/SDLVehicleDataType.m +++ b/SmartDeviceLink/SDLVehicleDataType.m @@ -35,5 +35,5 @@ SDLVehicleDataType const SDLVehicleDataTypeElectronicParkBrakeStatus = @"VEHICLEDATA_ELECTRONICPARKBRAKESTATUS"; SDLVehicleDataType const SDLVehicleDataTypeTurnSignal = @"VEHICLEDATA_TURNSIGNAL"; SDLVehicleDataType const SDLVehicleDataTypeCloudAppVehicleID = @"VEHICLEDATA_CLOUDAPPVEHICLEID"; -SDLVehicleDataType const SDLVehicleDataTypeOEMVehicleDataType = @"VEHICLEDATA_OEM_VEHICLE_DATA_TYPE"; +SDLVehicleDataType const SDLVehicleDataTypeOEMVehicleDataType = @"VEHICLEDATA_OEM_CUSTOM_DATA"; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 1e6817a4b..bcf32d76c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -297,8 +297,8 @@ [testRequest setOEMCustomVehicleData:@"OEMCustomVehicleData" withVehicleDataState:NO]; [testRequest setOEMCustomVehicleData:@"OEMCustomVehicleData1" withVehicleDataState:YES]; - expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData"]).to(equal(@NO)); - expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData1"]).to(equal(@YES)); + expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData"]).to(beFalse()); + expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData1"]).to(beTrue()); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index 9db038f16..b69336d23 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -297,8 +297,8 @@ [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO]; [testRequest setOEMCustomVehicleData:@"customVehicleData1" withVehicleDataState:YES]; - expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(NO)); - expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(equal(@YES)); + expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(beFalse()); + expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(beTrue()); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index 74739f4de..9795f6a29 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -295,8 +295,8 @@ [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO]; [testRequest setOEMCustomVehicleData:@"customVehicleData1" withVehicleDataState:YES]; - expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(NO)); - expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(equal(@YES)); + expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(beFalse()); + expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(beTrue()); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index 9f2858674..72df4207b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -30,7 +30,6 @@ __block SDLFuelRange* fuelRange = nil; __block NSString* vin = nil; __block NSString* cloudAppVehicleID = nil; - beforeEach(^{ gps = [[SDLGPSData alloc] init]; diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index 98f60d804..57482a7c1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -192,11 +192,9 @@ it(@"Should set and get Generic Network Signal Data", ^{ SDLSubscribeVehicleDataResponse *testRequest = [[SDLSubscribeVehicleDataResponse alloc] init]; - [testRequest setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult]; expect([testRequest getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(customOEMvehicleDataResult)); - }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 32590a23f..36cb26ae2 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -191,7 +191,6 @@ it(@"Should set and get Generic Network Signal Data", ^{ SDLUnsubscribeVehicleDataResponse *testRequest = [[SDLUnsubscribeVehicleDataResponse alloc] init]; - [testRequest setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult]; expect([testRequest getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(customOEMvehicleDataResult)); From 38de995876349f87315a8da9a5183c1b8d43779e Mon Sep 17 00:00:00 2001 From: piyushkhosla Date: Wed, 28 Aug 2019 15:43:42 +0530 Subject: [PATCH 47/50] Apply suggestions from code review --- SmartDeviceLink/SDLGetVehicleData.h | 4 ++++ SmartDeviceLink/SDLGetVehicleDataResponse.h | 4 ++++ SmartDeviceLink/SDLOnVehicleData.h | 4 ++++ SmartDeviceLink/SDLSubscribeVehicleData.h | 4 ++++ SmartDeviceLink/SDLSubscribeVehicleDataResponse.h | 4 ++++ SmartDeviceLink/SDLUnsubscribeVehicleData.h | 4 ++++ SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h | 4 ++++ SmartDeviceLink/SDLVehicleDataResult.h | 2 ++ SmartDeviceLink/SDLVehicleDataResult.m | 4 ++-- .../NotificationSpecs/SDLOnVehicleDataSpec.m | 2 +- .../SDLSubscribeVehicleDataResponseSpec.m | 2 +- .../SDLUnsubscribeVehicleDataResponseSpec.m | 2 +- .../RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m | 12 ++++++------ 13 files changed, 41 insertions(+), 11 deletions(-) diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index 2776f6283..bc3038bea 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -277,6 +277,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName - The name of the OEM custom vehicle data item. @param vehicleDataState - A boolean value. If true, requests the OEM custom vehicle data item. + + Added in SmartDeviceLink 6.0 */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; @@ -285,6 +287,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName - The name of the OEM custom vehicle data item. @return The state of an OEM custom vehicle data item for the given vehicle data name. + + Added in SmartDeviceLink 6.0 */ - (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 67a8f6241..e0fac466b 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -191,6 +191,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState An object containing the OEM custom vehicle data item. + + Added in SmartDeviceLink 6.0 */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(NSObject *)vehicleDataState; @@ -199,6 +201,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @return An OEM custom vehicle data object for the given vehicle data name. + + Added in SmartDeviceLink 6.0 */ - (NSObject *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 0d619bdb6..6b9c45db4 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -191,6 +191,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState An object containing the OEM custom vehicle data item. + + Added in SmartDeviceLink 6.0 */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(NSObject *)vehicleDataState; @@ -199,6 +201,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @return An OEM custom vehicle data object for the given vehicle data name. + + Added in SmartDeviceLink 6.0 */ - (NSObject *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index 8720708d7..912ea1caf 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -271,6 +271,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState A boolean value. If true, requests the OEM custom vehicle data item. + + Added in SmartDeviceLink 6.0 */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; @@ -279,6 +281,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @return The state of an OEM custom vehicle data item for the given vehicle data name. + + Added in SmartDeviceLink 6.0 */ - (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 6844828b6..d0eb2cc09 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -224,6 +224,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState SDLVehicleDataResult object containing custom data type and result code information. + + Added SmartDeviceLink 6.0 */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; @@ -232,6 +234,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @return SDLVehicleDataResult An object containing custom data type and result code information. + + Added SmartDeviceLink 6.0 */ - (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index bbfb78e2a..f5173ad94 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -273,6 +273,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState A boolean value. If true, requests an unsubscribes of the OEM custom vehicle data item. + + Added SmartDeviceLink 6.0 */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(BOOL)vehicleDataState; @@ -281,6 +283,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item to unsubscribe for. @return A boolean value indicating if an unsubscribe request will occur for the OEM custom vehicle data item. + + Added SmartDeviceLink 6.0 */ - (NSNumber *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index c759e9167..ed42cd76c 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -223,6 +223,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState SDLVehicleDataResult object containing custom data type and result code information. + + Added SmartDeviceLink 6.0 */ - (void)setOEMCustomVehicleData:(NSString *)vehicleDataName withVehicleDataState:(SDLVehicleDataResult *)vehicleDataState; @@ -231,6 +233,8 @@ NS_ASSUME_NONNULL_BEGIN @param vehicleDataName The name of the OEM custom vehicle data item. @return SDLVehicleDataResult object containing custom data type and result code information. + + Added SmartDeviceLink 6.0 */ - (SDLVehicleDataResult *)getOEMCustomVehicleData:(NSString *)vehicleDataName; diff --git a/SmartDeviceLink/SDLVehicleDataResult.h b/SmartDeviceLink/SDLVehicleDataResult.h index acc78c6a9..deeb325a9 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.h +++ b/SmartDeviceLink/SDLVehicleDataResult.h @@ -36,6 +36,8 @@ NS_ASSUME_NONNULL_BEGIN /** OEM custom defined published data element type + + Added SmartDeviceLink 6.0 */ @property (nullable, strong, nonatomic) NSString *customOEMDataType; diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m index 7c9b85e17..db6995051 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.m +++ b/SmartDeviceLink/SDLVehicleDataResult.m @@ -10,7 +10,7 @@ @implementation SDLVehicleDataResult -- (instancetype)initWithDataType:(SDLVehicleDataType)dataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode { +- (instancetype)initWithDataType:(SDLVehicleDataType)dataType resultCode:(SDLVehicleDataResultCode)resultCode { self = [self init]; if (!self) { return nil; @@ -22,7 +22,7 @@ - (instancetype)initWithDataType:(SDLVehicleDataType)dataType SDLVehicleDataResu return self; } -- (instancetype)initWithCustomOEMDataType:(NSString *)customDataType SDLVehicleDataResultCode:(SDLVehicleDataResultCode)resultCode{ +- (instancetype)initWithCustomOEMDataType:(NSString *)customDataType resultCode:(SDLVehicleDataResultCode)resultCode{ self = [self init]; if (!self) { return nil; diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m index 1e27c3c9f..c2f9afbf2 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -46,7 +46,7 @@ cloudAppVehicleID = @"testCloudAppVehicleID"; }); - it(@"Should set and get correctly", ^ { + it(@"should correctly initialize with init", ^ { SDLOnVehicleData* testNotification = [[SDLOnVehicleData alloc] init]; testNotification.accPedalPosition = @99.99999999; diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index 57482a7c1..1b8dc5b6d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -18,7 +18,7 @@ QuickSpecBegin(SDLSubscribeVehicleDataResponseSpec) SDLVehicleDataResult* vehicleDataResult = [[SDLVehicleDataResult alloc] init]; -SDLVehicleDataResult* customOEMvehicleDataResult = [[SDLVehicleDataResult alloc] initWithCustomOEMDataType:@"customOEMVehicleData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeSuccess]; +SDLVehicleDataResult* customOEMvehicleDataResult = [[SDLVehicleDataResult alloc] initWithCustomOEMDataType:@"customOEMVehicleData" resultCode:SDLVehicleDataResultCodeSuccess]; describe(@"Getter/Setter Tests", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 36cb26ae2..3f6302e4b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -17,7 +17,7 @@ QuickSpecBegin(SDLUnsubscribeVehicleDataResponseSpec) SDLVehicleDataResult* vehicleDataResult = [[SDLVehicleDataResult alloc] init]; -SDLVehicleDataResult* customOEMvehicleDataResult = [[SDLVehicleDataResult alloc] initWithCustomOEMDataType:@"customOEMVehicleData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeSuccess]; +SDLVehicleDataResult* customOEMvehicleDataResult = [[SDLVehicleDataResult alloc] initWithCustomOEMDataType:@"customOEMVehicleData" resultCode:SDLVehicleDataResultCodeSuccess]; describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m index e485b14ac..a07efa5a3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m @@ -16,7 +16,7 @@ QuickSpecBegin(SDLVehicleDataResultSpec) describe(@"Getter/Setter Tests", ^ { - it(@"Should set and get correctly", ^ { + it(@"should correctly initialize with init", ^ { SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] init]; testStruct.dataType = SDLVehicleDataTypeAirbagStatus; @@ -28,22 +28,22 @@ expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); }); - it(@"Should set and get correctly", ^ { - SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithDataType:SDLVehicleDataTypeAirbagStatus SDLVehicleDataResultCode:SDLVehicleDataResultCodeDisallowed]; + it(@"should correctly initialize with initWithDataType", ^ { + SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithDataType:SDLVehicleDataTypeAirbagStatus resultCode:SDLVehicleDataResultCodeDisallowed]; expect(testStruct.dataType).to(equal(SDLVehicleDataTypeAirbagStatus)); expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); }); - it(@"Should set and get correctly", ^ { - SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithCustomOEMDataType:@"CustomOEMData" SDLVehicleDataResultCode:SDLVehicleDataResultCodeDisallowed]; + it(@"should correctly initialize with initWithCustomOEMDataType", ^ { + SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithCustomOEMDataType:@"CustomOEMData" resultCode:SDLVehicleDataResultCodeDisallowed]; expect(testStruct.customOEMDataType).to(equal(@"CustomOEMData")); expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDisallowed)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLRPCParameterNameDataType:SDLVehicleDataTypeAirbagStatus, + NSDictionary* dict = [@{SDLRPCParameterNameDataType:SDLVehicleDataTypeAirbagStatus, SDLRPCParameterNameResultCode:SDLVehicleDataResultCodeDisallowed, SDLRPCParameterNameOEMCustomDataType:@"CustomOEMData" } mutableCopy]; From 39029dbb5f49c49527df933551f81fef04a283c7 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Wed, 28 Aug 2019 15:20:56 -0400 Subject: [PATCH 48/50] Update SmartDeviceLink/SDLGetVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index bc3038bea..c027e9c2e 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -275,7 +275,7 @@ NS_ASSUME_NONNULL_BEGIN /** Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @param vehicleDataState - A boolean value. If true, requests the OEM custom vehicle data item. Added in SmartDeviceLink 6.0 From a322d6f3a66c3f5ac425142b82ea154b889f14f0 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Wed, 28 Aug 2019 15:51:26 -0400 Subject: [PATCH 49/50] Update SmartDeviceLink/SDLGetVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index c027e9c2e..8d164ff30 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -276,7 +276,7 @@ NS_ASSUME_NONNULL_BEGIN Sets the OEM custom vehicle data state for any given OEM custom vehicle data name. @param vehicleDataName The name of the OEM custom vehicle data item. - @param vehicleDataState - A boolean value. If true, requests the OEM custom vehicle data item. + @param vehicleDataState A boolean value. If true, requests the OEM custom vehicle data item. Added in SmartDeviceLink 6.0 */ From aef468f9301bc5787c455cd4f75d100a530ec622 Mon Sep 17 00:00:00 2001 From: Markos Rapitis Date: Wed, 28 Aug 2019 15:51:34 -0400 Subject: [PATCH 50/50] Update SmartDeviceLink/SDLGetVehicleData.h Co-Authored-By: Joel Fischer --- SmartDeviceLink/SDLGetVehicleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index 8d164ff30..d7f255241 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -285,7 +285,7 @@ NS_ASSUME_NONNULL_BEGIN /** Gets the OEM custom vehicle data value for any given OEM custom vehicle data name. - @param vehicleDataName - The name of the OEM custom vehicle data item. + @param vehicleDataName The name of the OEM custom vehicle data item. @return The state of an OEM custom vehicle data item for the given vehicle data name. Added in SmartDeviceLink 6.0