diff options
Diffstat (limited to 'SmartDeviceLinkTests/RPCSpecs/RequestSpecs')
6 files changed, 579 insertions, 142 deletions
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 2872c6cee..7e452540e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -49,6 +49,7 @@ describe(@"getter/setter tests", ^{ testRequest.prndl = @YES; #pragma clang diagnostic pop testRequest.rpm = @YES; + testRequest.seatOccupancy = @YES; testRequest.speed = @YES; testRequest.stabilityControlsStatus = @YES; testRequest.steeringWheelAngle = @YES; @@ -90,6 +91,7 @@ describe(@"getter/setter tests", ^{ expect(testRequest.prndl).to(equal(@YES)); #pragma clang diagnostic pop expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(equal(@YES)); expect(testRequest.speed).to(equal(@YES)); expect(testRequest.stabilityControlsStatus).to(equal(@YES)); expect(testRequest.steeringWheelAngle).to(equal(@YES)); @@ -135,6 +137,7 @@ describe(@"getter/setter tests", ^{ SDLRPCParameterNamePRNDL:@YES, #pragma clang diagnostic pop SDLRPCParameterNameRPM:@YES, + SDLRPCParameterNameSeatOccupancy:@YES, SDLRPCParameterNameSpeed:@YES, SDLRPCParameterNameStabilityControlsStatus:@YES, SDLRPCParameterNameSteeringWheelAngle:@YES, @@ -179,6 +182,7 @@ describe(@"getter/setter tests", ^{ expect(testRequest.prndl).to(equal(@YES)); #pragma clang diagnostic pop expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(equal(@YES)); expect(testRequest.speed).to(equal(@YES)); expect(testRequest.stabilityControlsStatus).to(equal(@YES)); expect(testRequest.steeringWheelAngle).to(equal(@YES)); @@ -226,6 +230,7 @@ describe(@"initializers", ^{ expect(testRequest.prndl).to(beNil()); #pragma clang diagnostic pop expect(testRequest.rpm).to(beNil()); + expect(testRequest.seatOccupancy).to(beNil()); expect(testRequest.speed).to(beNil()); expect(testRequest.stabilityControlsStatus).to(beNil()); expect(testRequest.steeringWheelAngle).to(beNil()); @@ -275,6 +280,7 @@ describe(@"initializers", ^{ expect(testRequest.prndl).to(equal(@YES)); #pragma clang diagnostic pop expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(beNil()); expect(testRequest.speed).to(equal(@YES)); expect(testRequest.stabilityControlsStatus).to(beNil()); expect(testRequest.steeringWheelAngle).to(equal(@YES)); @@ -286,7 +292,57 @@ describe(@"initializers", ^{ }); context(@"initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:gearStatus:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:stabilityControlsStatus:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering:windowStatus:", ^{ - SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES vin:@YES gearStatus:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES stabilityControlsStatus:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES windowStatus:@YES]; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES vin:@YES gearStatus:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES stabilityControlsStatus:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES windowStatus:@YES]; +#pragma clang diagnostic pop + + it(@"expect all properties to be set properly", ^{ + expect(testRequest.accPedalPosition).to(equal(@YES)); + expect(testRequest.airbagStatus).to(equal(@YES)); + expect(testRequest.beltStatus).to(equal(@YES)); + expect(testRequest.bodyInformation).to(equal(@YES)); + expect(testRequest.cloudAppVehicleID).to(equal(@YES)); + expect(testRequest.clusterModeStatus).to(equal(@YES)); + expect(testRequest.deviceStatus).to(equal(@YES)); + expect(testRequest.driverBraking).to(equal(@YES)); + expect(testRequest.eCallInfo).to(equal(@YES)); + expect(testRequest.electronicParkBrakeStatus).to(equal(@YES)); + expect(testRequest.emergencyEvent).to(equal(@YES)); + expect(testRequest.engineOilLife).to(equal(@YES)); + expect(testRequest.engineTorque).to(equal(@YES)); + expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.fuelLevel).to(beNil()); + expect(testRequest.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop + expect(testRequest.fuelRange).to(equal(@YES)); + expect(testRequest.gearStatus).to(equal(@YES)); + expect(testRequest.gps).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(equal(@YES)); + expect(testRequest.headLampStatus).to(equal(@YES)); + expect(testRequest.instantFuelConsumption).to(equal(@YES)); + expect(testRequest.myKey).to(equal(@YES)); + expect(testRequest.odometer).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.prndl).to(beNil()); +#pragma clang diagnostic pop + expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(beNil()); + expect(testRequest.speed).to(equal(@YES)); + expect(testRequest.stabilityControlsStatus).to(equal(@YES)); + expect(testRequest.steeringWheelAngle).to(equal(@YES)); + expect(testRequest.tirePressure).to(equal(@YES)); + expect(testRequest.turnSignal).to(equal(@YES)); + expect(testRequest.windowStatus).to(equal(@YES)); + expect(testRequest.wiperStatus).to(equal(@YES)); + }); + }); + + context(@"initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:vin:gearStatus:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:stabilityControlsStatus:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering:windowStatus:seatOccupancy:", ^{ + SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES vin:@YES gearStatus:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES stabilityControlsStatus:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES windowStatus:@YES seatOccupancy:@YES]; it(@"expect all properties to be set properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); @@ -321,6 +377,7 @@ describe(@"initializers", ^{ expect(testRequest.prndl).to(beNil()); #pragma clang diagnostic pop expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(equal(@YES)); expect(testRequest.speed).to(equal(@YES)); expect(testRequest.stabilityControlsStatus).to(equal(@YES)); expect(testRequest.steeringWheelAngle).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m index ae5adf8ad..f939851d1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m @@ -42,7 +42,7 @@ describe(@"RegisterAppInterface Tests", ^{ __block SDLDeviceInfo *info = nil; __block SDLAppInfo *appInfo = nil; __block SDLTemplateColorScheme *colorScheme = nil; - __block SDLMsgVersion * currentSDLMsgVersion = [[SDLMsgVersion alloc] initWithMajorVersion:7 minorVersion:0 patchVersion:0]; + __block SDLMsgVersion * currentSDLMsgVersion = [[SDLMsgVersion alloc] initWithMajorVersion:7 minorVersion:1 patchVersion:0]; beforeEach(^{ testRegisterAppInterface = nil; @@ -90,52 +90,48 @@ describe(@"RegisterAppInterface Tests", ^{ expect(testRegisterAppInterface.sdlMsgVersion).to(equal(msgVersion)); }); - describe(@"Setting With Dictionary", ^{ - beforeEach( ^{ - NSDictionary *dict = @{SDLRPCParameterNameRequest: - @{SDLRPCParameterNameParameters: - @{SDLRPCParameterNameSyncMessageVersion:@{ - SDLRPCParameterNameMajorVersion: @7, - SDLRPCParameterNameMinorVersion: @0, - SDLRPCParameterNamePatchVersion: @0 - }, - SDLRPCParameterNameAppName:appName, - SDLRPCParameterNameTTSName:[@[chunk] mutableCopy], - SDLRPCParameterNameNGNMediaScreenAppName:shortAppName, - SDLRPCParameterNameVRSynonyms:@[vrSynonyms], - SDLRPCParameterNameIsMediaApplication:isMediaApp, - SDLRPCParameterNameLanguageDesired:SDLLanguageNoNo, - SDLRPCParameterNameHMIDisplayLanguageDesired:SDLLanguagePtPt, - SDLRPCParameterNameAppHMIType:appTypes, - SDLRPCParameterNameHashId:resumeHash, - SDLRPCParameterNameDeviceInfo:info, - SDLRPCParameterNameFullAppID:fullAppId, - SDLRPCParameterNameAppId:appId, - SDLRPCParameterNameAppInfo:appInfo, - SDLRPCParameterNameDayColorScheme: colorScheme, - SDLRPCParameterNameNightColorScheme: colorScheme, - }, - SDLRPCParameterNameOperationName:SDLRPCFunctionNameRegisterAppInterface}}; - SDLRegisterAppInterface *testRegisterAppInterface = [[SDLRegisterAppInterface alloc] initWithDictionary:dict]; - - expect(testRegisterAppInterface.sdlMsgVersion).to(equal(currentSDLMsgVersion)); - expect(testRegisterAppInterface.appName).to(match(appName)); - expect(testRegisterAppInterface.ttsName).to(equal([@[chunk] mutableCopy])); - expect(testRegisterAppInterface.ngnMediaScreenAppName).to(match(shortAppName)); - expect(testRegisterAppInterface.vrSynonyms).to(equal(@[vrSynonyms])); - expect(testRegisterAppInterface.isMediaApplication).to(equal(isMediaApp)); - expect(testRegisterAppInterface.languageDesired).to(equal(SDLLanguageNoNo)); - expect(testRegisterAppInterface.hmiDisplayLanguageDesired).to(equal(SDLLanguagePtPt)); - expect(testRegisterAppInterface.appHMIType).to(equal(appTypes)); - expect(testRegisterAppInterface.hashID).to(match(resumeHash)); - expect(testRegisterAppInterface.deviceInfo).to(equal(info)); - expect(testRegisterAppInterface.fullAppID).to(match(fullAppId)); - expect(testRegisterAppInterface.appID).to(match(appId)); - expect(testRegisterAppInterface.appInfo).to(equal(appInfo)); - expect(testRegisterAppInterface.dayColorScheme).to(equal(colorScheme)); - expect(testRegisterAppInterface.nightColorScheme).to(equal(colorScheme)); - }); - }); + describe(@"Setting With Dictionary", ^{ + it(@"initWithDictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameSyncMessageVersion:currentSDLMsgVersion, + SDLRPCParameterNameAppName:appName, + SDLRPCParameterNameTTSName:[@[chunk] mutableCopy], + SDLRPCParameterNameNGNMediaScreenAppName:shortAppName, + SDLRPCParameterNameVRSynonyms:@[vrSynonyms], + SDLRPCParameterNameIsMediaApplication:isMediaApp, + SDLRPCParameterNameLanguageDesired:SDLLanguageNoNo, + SDLRPCParameterNameHMIDisplayLanguageDesired:SDLLanguagePtPt, + SDLRPCParameterNameAppHMIType:appTypes, + SDLRPCParameterNameHashId:resumeHash, + SDLRPCParameterNameDeviceInfo:info, + SDLRPCParameterNameFullAppID:fullAppId, + SDLRPCParameterNameAppId:appId, + SDLRPCParameterNameAppInfo:appInfo, + SDLRPCParameterNameDayColorScheme: colorScheme, + SDLRPCParameterNameNightColorScheme: colorScheme, + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameRegisterAppInterface}}; + SDLRegisterAppInterface *testRegisterAppInterface = [[SDLRegisterAppInterface alloc] initWithDictionary:dict]; + + expect(testRegisterAppInterface.sdlMsgVersion).to(equal(currentSDLMsgVersion)); + expect(testRegisterAppInterface.appName).to(match(appName)); + expect(testRegisterAppInterface.ttsName).to(equal([@[chunk] mutableCopy])); + expect(testRegisterAppInterface.ngnMediaScreenAppName).to(match(shortAppName)); + expect(testRegisterAppInterface.vrSynonyms).to(equal(@[vrSynonyms])); + expect(testRegisterAppInterface.isMediaApplication).to(equal(isMediaApp)); + expect(testRegisterAppInterface.languageDesired).to(equal(SDLLanguageNoNo)); + expect(testRegisterAppInterface.hmiDisplayLanguageDesired).to(equal(SDLLanguagePtPt)); + expect(testRegisterAppInterface.appHMIType).to(equal(appTypes)); + expect(testRegisterAppInterface.hashID).to(match(resumeHash)); + expect(testRegisterAppInterface.deviceInfo).to(equal(info)); + expect(testRegisterAppInterface.fullAppID).to(match(fullAppId)); + expect(testRegisterAppInterface.appID).to(match(appId)); + expect(testRegisterAppInterface.appInfo).to(equal(appInfo)); + expect(testRegisterAppInterface.dayColorScheme).to(equal(colorScheme)); + expect(testRegisterAppInterface.nightColorScheme).to(equal(colorScheme)); + }); + }); describe(@"initializers", ^{ it(@"init", ^{ diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m index 721ba0b86..d05fd1607 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m @@ -20,10 +20,18 @@ QuickSpecBegin(SDLSetMediaClockTimerSpec) describe(@"SetMediaClocktimer Spec", ^ { __block NSTimeInterval testTime1Interval = 32887; __block NSTimeInterval testTime2Interval = 3723; + __block float testCountRate = 1423.0; __block SDLStartTime *time1 = [[SDLStartTime alloc] initWithHours:9 minutes:8 seconds:7]; __block SDLStartTime *time2 = [[SDLStartTime alloc] initWithHours:1 minutes:2 seconds:3]; __block SDLUpdateMode testUpdateMode = SDLUpdateModeCountUp; __block SDLAudioStreamingIndicator testIndicator = SDLAudioStreamingIndicatorPlayPause; + __block SDLSeekStreamingIndicator *forwardSeekTest; + __block SDLSeekStreamingIndicator *backSeekTest; + + beforeEach(^{ + forwardSeekTest = [[SDLSeekStreamingIndicator alloc] initWithType:SDLSeekIndicatorTypeTrack]; + backSeekTest = [[SDLSeekStreamingIndicator alloc] initWithType:SDLSeekIndicatorTypeTrack]; + }); describe(@"when initialized", ^{ it(@"should properly initialize with initWithDictionary:", ^{ @@ -32,7 +40,9 @@ describe(@"SetMediaClocktimer Spec", ^ { @{SDLRPCParameterNameStartTime:time1, SDLRPCParameterNameEndTime:time2, SDLRPCParameterNameUpdateMode:testUpdateMode, - SDLRPCParameterNameAudioStreamingIndicator:testIndicator + SDLRPCParameterNameAudioStreamingIndicator:testIndicator, + SDLRPCParameterNameForwardSeekIndicator:forwardSeekTest, + SDLRPCParameterNameBackSeekIndicator:backSeekTest }, SDLRPCParameterNameOperationName:SDLRPCFunctionNameSetMediaClockTimer} }; @@ -42,6 +52,8 @@ describe(@"SetMediaClocktimer Spec", ^ { expect(testRequest.endTime).to(equal(time2)); expect(testRequest.updateMode).to(equal(testUpdateMode)); expect(testRequest.audioStreamingIndicator).to(equal(testIndicator)); + expect(testRequest.forwardSeekIndicator).to(equal(forwardSeekTest)); + expect(testRequest.backSeekIndicator).to(equal(backSeekTest)); }); it(@"should properly initialize with init", ^{ @@ -51,45 +63,132 @@ describe(@"SetMediaClocktimer Spec", ^ { expect(testRequest.endTime).to(beNil()); expect(testRequest.updateMode).to(beNil()); expect(testRequest.audioStreamingIndicator).to(beNil()); + expect(testRequest.forwardSeekIndicator).to(beNil()); + expect(testRequest.backSeekIndicator).to(beNil()); + expect(testRequest.countRate).to(beNil()); }); - it(@"should properly initialize with countUpWithStartTimeInterval:endTimeInterval:playPauseIndicator:", ^{ + it(@"should properly initialize with initWithUpdateMode:startTime:endTime:audioStreamingIndicator:forwardSeekIndicator:backSeekIndicator:countRate:", ^{ + SDLSetMediaClockTimer* testRequest = [[SDLSetMediaClockTimer alloc] initWithUpdateMode:testUpdateMode startTime:time1 endTime:time2 audioStreamingIndicator:testIndicator forwardSeekIndicator:forwardSeekTest backSeekIndicator:backSeekTest countRate:@(testCountRate)]; + + expect(testRequest.startTime).to(equal(time1)); + expect(testRequest.endTime).to(equal(time2)); + expect(testRequest.updateMode).to(equal(SDLUpdateModeCountUp)); + expect(testRequest.audioStreamingIndicator).to(equal(SDLAudioStreamingIndicatorPlayPause)); + expect(testRequest.forwardSeekIndicator).to(equal(forwardSeekTest)); + expect(testRequest.backSeekIndicator).to(equal(backSeekTest)); + expect(testRequest.countRate).to(equal(testCountRate)); + }); + + it(@"should properly initialize with countUpFromStartTimeInterval:toEndTimeInterval:playPauseIndicator:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLSetMediaClockTimer *testRequest = [SDLSetMediaClockTimer countUpFromStartTimeInterval:testTime1Interval toEndTimeInterval:testTime2Interval playPauseIndicator:testIndicator]; +#pragma clang diagnostic pop + + expect(testRequest.startTime).to(equal(time1)); + expect(testRequest.endTime).to(equal(time2)); + expect(testRequest.updateMode).to(equal(SDLUpdateModeCountUp)); + expect(testRequest.audioStreamingIndicator).to(equal(testIndicator)); + expect(testRequest.forwardSeekIndicator).to(beNil()); + expect(testRequest.backSeekIndicator).to(beNil()); + expect(testRequest.countRate).to(beNil()); + }); + + it(@"should properly initialize with countUpFromStartTimeInterval:toEndTimeInterval:playPauseIndicator:forwardSeekIndicator:backSeekIndicator:countRate:", ^{ + SDLSetMediaClockTimer *testRequest = [SDLSetMediaClockTimer countUpFromStartTimeInterval:testTime1Interval toEndTimeInterval:testTime2Interval playPauseIndicator:testIndicator forwardSeekIndicator:forwardSeekTest backSeekIndicator:backSeekTest countRate:@(testCountRate)]; expect(testRequest.startTime).to(equal(time1)); expect(testRequest.endTime).to(equal(time2)); expect(testRequest.updateMode).to(equal(SDLUpdateModeCountUp)); expect(testRequest.audioStreamingIndicator).to(equal(testIndicator)); + expect(testRequest.forwardSeekIndicator).to(equal(forwardSeekTest)); + expect(testRequest.backSeekIndicator).to(equal(backSeekTest)); + expect(testRequest.countRate).to(equal(testCountRate)); }); - it(@"should properly initialize with countUpWithStartTime:endTime:playPauseIndicator:", ^{ + it(@"should properly initialize with countUpFromStartTime:toEndTime:playPauseIndicator:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLSetMediaClockTimer *testRequest = [SDLSetMediaClockTimer countUpFromStartTime:time1 toEndTime:time2 playPauseIndicator:testIndicator]; +#pragma clang diagnostic pop + + expect(testRequest.startTime).to(equal(time1)); + expect(testRequest.endTime).to(equal(time2)); + expect(testRequest.updateMode).to(equal(SDLUpdateModeCountUp)); + expect(testRequest.audioStreamingIndicator).to(equal(testIndicator)); + expect(testRequest.forwardSeekIndicator).to(beNil()); + expect(testRequest.backSeekIndicator).to(beNil()); + expect(testRequest.countRate).to(beNil()); + }); + + it(@"should properly initialize with countUpFromStartTime:toEndTime:playPauseIndicator:forwardSeekIndicator:backSeekIndicator:countRate:", ^{ + SDLSetMediaClockTimer *testRequest = [SDLSetMediaClockTimer countUpFromStartTime:time1 toEndTime:time2 playPauseIndicator:testIndicator forwardSeekIndicator:forwardSeekTest backSeekIndicator:backSeekTest countRate:@(testCountRate)]; expect(testRequest.startTime).to(equal(time1)); expect(testRequest.endTime).to(equal(time2)); expect(testRequest.updateMode).to(equal(SDLUpdateModeCountUp)); expect(testRequest.audioStreamingIndicator).to(equal(testIndicator)); + expect(testRequest.forwardSeekIndicator).to(equal(forwardSeekTest)); + expect(testRequest.backSeekIndicator).to(equal(backSeekTest)); + expect(testRequest.countRate).to(equal(testCountRate)); }); - it(@"should properly initialize with countUpWithStartTimeInterval:endTimeInterval:playPauseIndicator:", ^{ + it(@"should properly initialize with countDownFromStartTimeInterval:toEndTimeInterval:playPauseIndicator:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLSetMediaClockTimer *testRequest = [SDLSetMediaClockTimer countDownFromStartTimeInterval:testTime1Interval toEndTimeInterval:testTime2Interval playPauseIndicator:testIndicator]; +#pragma clang diagnostic pop expect(testRequest.startTime).to(equal(time1)); expect(testRequest.endTime).to(equal(time2)); expect(testRequest.updateMode).to(equal(SDLUpdateModeCountDown)); expect(testRequest.audioStreamingIndicator).to(equal(testIndicator)); + expect(testRequest.forwardSeekIndicator).to(beNil()); + expect(testRequest.backSeekIndicator).to(beNil()); + expect(testRequest.countRate).to(beNil()); }); - it(@"should properly initialize with countDownWithStartTime:endTime:playPauseIndicator:", ^{ + it(@"should properly initialize with countDownFromStartTimeInterval:toEndTimeInterval:playPauseIndicator:forwardSeekIndicator:backSeekIndicator:countRate:", ^{ + SDLSetMediaClockTimer *testRequest = [SDLSetMediaClockTimer countDownFromStartTimeInterval:testTime1Interval toEndTimeInterval:testTime2Interval playPauseIndicator:testIndicator forwardSeekIndicator:forwardSeekTest backSeekIndicator:backSeekTest countRate:@(testCountRate)]; + + expect(testRequest.startTime).to(equal(time1)); + expect(testRequest.endTime).to(equal(time2)); + expect(testRequest.updateMode).to(equal(SDLUpdateModeCountDown)); + expect(testRequest.audioStreamingIndicator).to(equal(testIndicator)); + expect(testRequest.forwardSeekIndicator).to(equal(forwardSeekTest)); + expect(testRequest.backSeekIndicator).to(equal(backSeekTest)); + expect(testRequest.countRate).to(equal(testCountRate)); + }); + + it(@"should properly initialize with countDownFromStartTime:toEndTime:playPauseIndicator:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLSetMediaClockTimer *testRequest = [SDLSetMediaClockTimer countDownFromStartTime:time1 toEndTime:time2 playPauseIndicator:testIndicator]; +#pragma clang diagnostic pop expect(testRequest.startTime).to(equal(time1)); expect(testRequest.endTime).to(equal(time2)); expect(testRequest.updateMode).to(equal(SDLUpdateModeCountDown)); expect(testRequest.audioStreamingIndicator).to(equal(testIndicator)); + expect(testRequest.forwardSeekIndicator).to(beNil()); + expect(testRequest.backSeekIndicator).to(beNil()); + expect(testRequest.countRate).to(beNil()); }); - it(@"should properly initialize with pauseWithPlayPauseIndicator", ^{ + it(@"should properly initialize with countDownFromStartTime:toEndTime:playPauseIndicator:forwardSeekIndicator:backSeekIndicator:countRate:", ^{ + SDLSetMediaClockTimer *testRequest = [SDLSetMediaClockTimer countDownFromStartTime:time1 toEndTime:time2 playPauseIndicator:testIndicator forwardSeekIndicator:forwardSeekTest backSeekIndicator:backSeekTest countRate:@(testCountRate)]; + + expect(testRequest.startTime).to(equal(time1)); + expect(testRequest.endTime).to(equal(time2)); + expect(testRequest.updateMode).to(equal(SDLUpdateModeCountDown)); + expect(testRequest.audioStreamingIndicator).to(equal(testIndicator)); + expect(testRequest.forwardSeekIndicator).to(equal(forwardSeekTest)); + expect(testRequest.backSeekIndicator).to(equal(backSeekTest)); + expect(testRequest.countRate).to(equal(testCountRate)); + }); + + it(@"should properly initialize with pauseWithPlayPauseIndicator:", ^{ SDLSetMediaClockTimer *testRequest = [SDLSetMediaClockTimer pauseWithPlayPauseIndicator:testIndicator]; expect(testRequest.startTime).to(beNil()); @@ -117,12 +216,30 @@ describe(@"SetMediaClocktimer Spec", ^ { }); it(@"should properly initialize with resumeWithPlayPauseIndicator:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLSetMediaClockTimer *testRequest = [SDLSetMediaClockTimer resumeWithPlayPauseIndicator:testIndicator]; +#pragma clang diagnostic pop + + expect(testRequest.startTime).to(beNil()); + expect(testRequest.endTime).to(beNil()); + expect(testRequest.updateMode).to(equal(SDLUpdateModeResume)); + expect(testRequest.audioStreamingIndicator).to(equal(testIndicator)); + expect(testRequest.countRate).to(beNil()); + }); + + it(@"should properly initialize with resumeWithPlayPauseIndicator:forwardSeekIndicator:backSeekIndicator:countRate:", ^{ + SDLSetMediaClockTimer *testRequest = [SDLSetMediaClockTimer resumeWithPlayPauseIndicator:testIndicator forwardSeekIndicator:forwardSeekTest backSeekIndicator:backSeekTest countRate:@(testCountRate)]; expect(testRequest.startTime).to(beNil()); expect(testRequest.endTime).to(beNil()); expect(testRequest.updateMode).to(equal(SDLUpdateModeResume)); expect(testRequest.audioStreamingIndicator).to(equal(testIndicator)); + expect(testRequest.forwardSeekIndicator).to(equal(forwardSeekTest)); + expect(testRequest.backSeekIndicator).to(equal(backSeekTest)); + expect(testRequest.forwardSeekIndicator).to(equal(forwardSeekTest)); + expect(testRequest.backSeekIndicator).to(equal(backSeekTest)); + expect(testRequest.countRate).to(equal(testCountRate)); }); it(@"should properly initialize with clearWithPlayPauseIndicator:", ^{ @@ -135,7 +252,10 @@ describe(@"SetMediaClocktimer Spec", ^ { }); it(@"should properly initialize with initWithUpdateMode:startTime:endTime:playPauseIndicator:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLSetMediaClockTimer *testRequest = [[SDLSetMediaClockTimer alloc] initWithUpdateMode:testUpdateMode startTime:time1 endTime:time2 playPauseIndicator:testIndicator]; +#pragma clang diagnostic pop expect(testRequest.startTime).to(equal(time1)); expect(testRequest.endTime).to(equal(time2)); @@ -151,11 +271,17 @@ describe(@"SetMediaClocktimer Spec", ^ { testRequest.endTime = time2; testRequest.updateMode = SDLUpdateModeCountUp; testRequest.audioStreamingIndicator = SDLAudioStreamingIndicatorPlayPause; + testRequest.forwardSeekIndicator = forwardSeekTest; + testRequest.backSeekIndicator = backSeekTest; + testRequest.countRate = @(testCountRate); expect(testRequest.startTime).to(equal(time1)); expect(testRequest.endTime).to(equal(time2)); expect(testRequest.updateMode).to(equal(SDLUpdateModeCountUp)); expect(testRequest.audioStreamingIndicator).to(equal(SDLAudioStreamingIndicatorPlayPause)); + expect(testRequest.forwardSeekIndicator).to(equal(forwardSeekTest)); + expect(testRequest.backSeekIndicator).to(equal(backSeekTest)); + expect(testRequest.countRate).to(equal(testCountRate)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m index 8cd897977..ddfd6333e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m @@ -20,57 +20,81 @@ QuickSpecBegin(SDLShowSpec) -SDLImage* image1 = [[SDLImage alloc] init]; -SDLImage* image2 = [[SDLImage alloc] init]; -SDLSoftButton* button = [[SDLSoftButton alloc] init]; - -NSArray<SDLMetadataType> *formatArray = @[SDLMetadataTypeMediaArtist,SDLMetadataTypeMediaTitle]; -SDLMetadataTags* testMetadata = [[SDLMetadataTags alloc] initWithTextFieldTypes:formatArray mainField2:formatArray mainField3:formatArray mainField4:formatArray]; - describe(@"Getter/Setter Tests", ^ { - __block SDLTemplateConfiguration *testTemplateConfig = nil; + __block NSString *testString1 = @"Test 1"; + __block NSString *testString2 = @"Test 2"; + __block NSString *testString3 = @"Test 3"; + __block NSString *testString4 = @"Test 4"; + __block NSString *testStatusBarString = @"Test Status"; + __block NSString *testMediaClockString = @"Test Clock"; + __block NSString *testMediaTrackString = @"Test Track"; + __block NSString *testTemplateTitleString = @"Hello World"; + __block SDLImage *testGraphic = nil; + __block SDLImage *testSecondaryGraphic = nil; + __block NSArray<NSString *> *testCustomPresets = nil; + __block SDLSoftButton *testButton = nil; + __block NSArray<SDLSoftButton *> *testSoftButtons = nil; + __block SDLMetadataType testType1 = SDLMetadataTypeHumidity; + __block SDLMetadataType testType2 = SDLMetadataTypeRating; + __block SDLMetadataType testType3 = SDLMetadataTypeMediaYear; + __block SDLMetadataType testType4 = SDLMetadataTypeWeatherTerm; + __block SDLTextAlignment testAlignment = SDLTextAlignmentCenter; + __block SDLMetadataTags *testMetadata = nil; + __block SDLTemplateConfiguration *testTemplateConfiguration = nil; __block int testWindowID = 4; beforeEach(^{ - testTemplateConfig = [[SDLTemplateConfiguration alloc] initWithPredefinedLayout:SDLPredefinedLayoutMedia]; + testGraphic = [[SDLImage alloc] initWithName:@"test name" isTemplate:false]; + testSecondaryGraphic = [[SDLImage alloc] initWithName:@"test name 2" isTemplate:false]; + testCustomPresets = @[testString1]; + testButton = [[SDLSoftButton alloc] initWithType:SDLSoftButtonTypeText text:@"Test Button" image:nil highlighted:NO buttonId:0 systemAction:nil handler:nil]; + testSoftButtons = @[testButton]; + testMetadata = [[SDLMetadataTags alloc] initWithTextFieldTypes:@[testType1] mainField2:@[testType2] mainField3:@[testType3] mainField4:@[testType4]]; + testTemplateConfiguration = [[SDLTemplateConfiguration alloc] initWithPredefinedLayout:SDLPredefinedLayoutMedia]; }); it(@"Should set and get correctly", ^ { SDLShow* testRequest = [[SDLShow alloc] init]; - testRequest.mainField1 = @"field1"; - testRequest.mainField2 = @"field2"; - testRequest.mainField3 = @"field3"; - testRequest.mainField4 = @"field4"; + testRequest.mainField1 = testString1; + testRequest.mainField2 = testString2; + testRequest.mainField3 = testString3; + testRequest.mainField4 = testString4; testRequest.alignment = SDLTextAlignmentLeft; - testRequest.statusBar = @"status"; - testRequest.mediaClock = @"TheTime"; - testRequest.mediaTrack = @"In The Clear"; - testRequest.templateTitle = @"Hello World"; - testRequest.graphic = image1; - testRequest.secondaryGraphic = image2; - testRequest.softButtons = [@[button] mutableCopy]; - testRequest.customPresets = [@[@"preset1", @"preset2"] mutableCopy]; + testRequest.statusBar = testStatusBarString; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + testRequest.mediaClock = testMediaClockString; +#pragma clang diagnostic pop + testRequest.mediaTrack = testMediaTrackString; + testRequest.templateTitle = testTemplateTitleString; + testRequest.graphic = testGraphic; + testRequest.secondaryGraphic = testSecondaryGraphic; + testRequest.softButtons = testSoftButtons; + testRequest.customPresets = testCustomPresets; testRequest.metadataTags = testMetadata; testRequest.windowID = @(testWindowID); - testRequest.templateConfiguration = testTemplateConfig; + testRequest.templateConfiguration = testTemplateConfiguration; - expect(testRequest.mainField1).to(equal(@"field1")); - expect(testRequest.mainField2).to(equal(@"field2")); - expect(testRequest.mainField3).to(equal(@"field3")); - expect(testRequest.mainField4).to(equal(@"field4")); + expect(testRequest.mainField1).to(equal(testString1)); + expect(testRequest.mainField2).to(equal(testString2)); + expect(testRequest.mainField3).to(equal(testString3)); + expect(testRequest.mainField4).to(equal(testString4)); expect(testRequest.alignment).to(equal(SDLTextAlignmentLeft)); - expect(testRequest.statusBar).to(equal(@"status")); - expect(testRequest.mediaClock).to(equal(@"TheTime")); - expect(testRequest.mediaTrack).to(equal(@"In The Clear")); - expect(testRequest.templateTitle).to(equal(@"Hello World")); - expect(testRequest.graphic).to(equal(image1)); - expect(testRequest.secondaryGraphic).to(equal(image2)); - expect(testRequest.softButtons).to(equal([@[button] mutableCopy])); - expect(testRequest.customPresets).to(equal([@[@"preset1", @"preset2"] mutableCopy])); + expect(testRequest.statusBar).to(equal(testStatusBarString)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.mediaClock).to(equal(testMediaClockString)); +#pragma clang diagnostic pop + expect(testRequest.mediaTrack).to(equal(testMediaTrackString)); + expect(testRequest.templateTitle).to(equal(testTemplateTitleString)); + expect(testRequest.graphic).to(equal(testGraphic)); + expect(testRequest.secondaryGraphic).to(equal(testSecondaryGraphic)); + expect(testRequest.softButtons).to(equal(testSoftButtons)); + expect(testRequest.customPresets).to(equal(testCustomPresets)); expect(testRequest.metadataTags).to(equal(testMetadata)); expect(testRequest.windowID).to(equal(testWindowID)); - expect(testRequest.templateConfiguration).to(equal(testTemplateConfig)); + expect(testRequest.templateConfiguration).to(equal(testTemplateConfiguration)); }); it(@"Should return nil if not set", ^{ @@ -82,7 +106,10 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.mainField4).to(beNil()); expect(testRequest.alignment).to(beNil()); expect(testRequest.statusBar).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testRequest.mediaClock).to(beNil()); +#pragma clang diagnostic pop expect(testRequest.mediaTrack).to(beNil()); expect(testRequest.templateTitle).to(beNil()); expect(testRequest.graphic).to(beNil()); @@ -95,42 +122,21 @@ describe(@"Getter/Setter Tests", ^ { }); describe(@"initializing", ^{ - __block NSString *testString1 = @"Test 1"; - __block NSString *testString2 = @"Test 2"; - __block NSString *testString3 = @"Test 3"; - __block NSString *testString4 = @"Test 4"; - __block NSString *testStatusBarString = @"Test Status"; - __block NSString *testMediaClockString = @"Test Clock"; - __block NSString *testMediaTrackString = @"Test Track"; - __block NSString *testTemplateTitleString = @"Hello World"; - __block SDLImage *testGraphic = nil; - __block NSArray<NSString *> *testCustomPresets = nil; - __block SDLSoftButton *testButton = nil; - __block NSArray<SDLSoftButton *> *testSoftButtons = nil; - __block SDLMetadataType testType1 = SDLMetadataTypeHumidity; - __block SDLMetadataType testType2 = SDLMetadataTypeRating; - __block SDLMetadataType testType3 = SDLMetadataTypeMediaYear; - __block SDLMetadataType testType4 = SDLMetadataTypeWeatherTerm; - __block SDLTextAlignment testAlignment = SDLTextAlignmentCenter; - __block SDLMetadataTags *testTags = nil; - - beforeEach(^{ - testGraphic = [[SDLImage alloc] initWithName:@"test name" isTemplate:false]; - testCustomPresets = @[testString1]; - testButton = [[SDLSoftButton alloc] initWithType:SDLSoftButtonTypeText text:@"Test Button" image:nil highlighted:NO buttonId:0 systemAction:nil handler:nil]; - testSoftButtons = @[testButton]; - testTags = [[SDLMetadataTags alloc] initWithTextFieldTypes:@[testType1] mainField2:@[testType2] mainField3:@[testType3] mainField4:@[testType4]]; - }); - it(@"should initialize with initWithMainField1:mainField2:alignment:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLShow *testShow = [[SDLShow alloc] initWithMainField1:testString1 mainField2:testString2 alignment:testAlignment]; +#pragma clang diagnostic pop expect(testShow.mainField1).to(equal(testString1)); expect(testShow.mainField2).to(equal(testString2)); expect(testShow.mainField3).to(beNil()); expect(testShow.mainField4).to(beNil()); expect(testShow.alignment).to(equal(testAlignment)); expect(testShow.statusBar).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testShow.mediaClock).to(beNil()); +#pragma clang diagnostic pop expect(testShow.mediaTrack).to(beNil()); expect(testShow.templateTitle).to(beNil()); expect(testShow.graphic).to(beNil()); @@ -139,14 +145,20 @@ describe(@"Getter/Setter Tests", ^ { expect(testShow.customPresets).to(beNil()); expect(testShow.metadataTags).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" testShow = [[SDLShow alloc] initWithMainField1:nil mainField2:nil alignment:nil]; +#pragma clang diagnostic pop expect(testShow.mainField1).to(beNil()); expect(testShow.mainField2).to(beNil()); expect(testShow.mainField3).to(beNil()); expect(testShow.mainField4).to(beNil()); expect(testShow.alignment).to(beNil()); expect(testShow.statusBar).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testShow.mediaClock).to(beNil()); +#pragma clang diagnostic pop expect(testShow.mediaTrack).to(beNil()); expect(testShow.templateTitle).to(beNil()); expect(testShow.graphic).to(beNil()); @@ -157,14 +169,20 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"should initialize correctly with initWithMainField1:mainField1Type:mainField2:mainField2Type:alignment:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLShow *testShow = [[SDLShow alloc] initWithMainField1:testString1 mainField1Type:testType1 mainField2:testString2 mainField2Type:testType2 alignment:testAlignment]; +#pragma clang diagnostic pop expect(testShow.mainField1).to(equal(testString1)); expect(testShow.mainField2).to(equal(testString2)); expect(testShow.mainField3).to(beNil()); expect(testShow.mainField4).to(beNil()); expect(testShow.alignment).to(equal(testAlignment)); expect(testShow.statusBar).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testShow.mediaClock).to(beNil()); +#pragma clang diagnostic pop expect(testShow.mediaTrack).to(beNil()); expect(testShow.templateTitle).to(beNil()); expect(testShow.graphic).to(beNil()); @@ -176,14 +194,20 @@ describe(@"Getter/Setter Tests", ^ { expect(testShow.metadataTags.mainField3).to(beNil()); expect(testShow.metadataTags.mainField4).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" testShow = [[SDLShow alloc] initWithMainField1:nil mainField1Type:nil mainField2:nil mainField2Type:nil alignment:nil]; +#pragma clang diagnostic pop expect(testShow.mainField1).to(beNil()); expect(testShow.mainField2).to(beNil()); expect(testShow.mainField3).to(beNil()); expect(testShow.mainField4).to(beNil()); expect(testShow.alignment).to(beNil()); expect(testShow.statusBar).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testShow.mediaClock).to(beNil()); +#pragma clang diagnostic pop expect(testShow.mediaTrack).to(beNil()); expect(testShow.templateTitle).to(beNil()); expect(testShow.graphic).to(beNil()); @@ -194,14 +218,20 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"should initialize correctly with initWithMainField1:mainField2:mainField3:mainField4:alignment:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLShow *testShow = [[SDLShow alloc] initWithMainField1:testString1 mainField2:testString2 mainField3:testString3 mainField4:testString4 alignment:testAlignment]; +#pragma clang diagnostic pop expect(testShow.mainField1).to(equal(testString1)); expect(testShow.mainField2).to(equal(testString2)); expect(testShow.mainField3).to(equal(testString3)); expect(testShow.mainField4).to(equal(testString4)); expect(testShow.alignment).to(equal(testAlignment)); expect(testShow.statusBar).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testShow.mediaClock).to(beNil()); +#pragma clang diagnostic pop expect(testShow.mediaTrack).to(beNil()); expect(testShow.templateTitle).to(beNil()); expect(testShow.graphic).to(beNil()); @@ -213,14 +243,20 @@ describe(@"Getter/Setter Tests", ^ { expect(testShow.metadataTags.mainField3).to(beNil()); expect(testShow.metadataTags.mainField4).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" testShow = [[SDLShow alloc] initWithMainField1:nil mainField2:nil mainField3:nil mainField4:nil alignment:nil]; +#pragma clang diagnostic pop expect(testShow.mainField1).to(beNil()); expect(testShow.mainField2).to(beNil()); expect(testShow.mainField3).to(beNil()); expect(testShow.mainField4).to(beNil()); expect(testShow.alignment).to(beNil()); expect(testShow.statusBar).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testShow.mediaClock).to(beNil()); +#pragma clang diagnostic pop expect(testShow.mediaTrack).to(beNil()); expect(testShow.templateTitle).to(beNil()); expect(testShow.graphic).to(beNil()); @@ -231,14 +267,20 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"should initialize correctly with initWithMainField1:mainField1Type:mainField2:mainField2Type:mainField3:mainField3Type:mainField4:mainField4Type:alignment:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLShow *testShow = [[SDLShow alloc] initWithMainField1:testString1 mainField1Type:testType1 mainField2:testString2 mainField2Type:testType2 mainField3:testString3 mainField3Type:testType3 mainField4:testString4 mainField4Type:testType4 alignment:testAlignment]; +#pragma clang diagnostic pop expect(testShow.mainField1).to(equal(testString1)); expect(testShow.mainField2).to(equal(testString2)); expect(testShow.mainField3).to(equal(testString3)); expect(testShow.mainField4).to(equal(testString4)); expect(testShow.alignment).to(equal(testAlignment)); expect(testShow.statusBar).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testShow.mediaClock).to(beNil()); +#pragma clang diagnostic pop expect(testShow.mediaTrack).to(beNil()); expect(testShow.templateTitle).to(beNil()); expect(testShow.graphic).to(beNil()); @@ -250,14 +292,20 @@ describe(@"Getter/Setter Tests", ^ { expect(testShow.metadataTags.mainField3).to(contain(testType3)); expect(testShow.metadataTags.mainField4).to(contain(testType4)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" testShow = [[SDLShow alloc] initWithMainField1:nil mainField1Type:nil mainField2:nil mainField2Type:nil mainField3:nil mainField3Type:nil mainField4:nil mainField4Type:nil alignment:nil]; +#pragma clang diagnostic pop expect(testShow.mainField1).to(beNil()); expect(testShow.mainField2).to(beNil()); expect(testShow.mainField3).to(beNil()); expect(testShow.mainField4).to(beNil()); expect(testShow.alignment).to(beNil()); expect(testShow.statusBar).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testShow.mediaClock).to(beNil()); +#pragma clang diagnostic pop expect(testShow.mediaTrack).to(beNil()); expect(testShow.templateTitle).to(beNil()); expect(testShow.graphic).to(beNil()); @@ -268,14 +316,20 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"should initialize correctly with initWithMainField1:mainField2:alignment:statusBar:mediaClock:mediaTrack:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLShow *testShow = [[SDLShow alloc] initWithMainField1:testString1 mainField2:testString2 alignment:testAlignment statusBar:testStatusBarString mediaClock:testMediaClockString mediaTrack:testMediaTrackString]; +#pragma clang diagnostic pop expect(testShow.mainField1).to(equal(testString1)); expect(testShow.mainField2).to(equal(testString2)); expect(testShow.mainField3).to(beNil()); expect(testShow.mainField4).to(beNil()); expect(testShow.alignment).to(equal(testAlignment)); expect(testShow.statusBar).to(equal(testStatusBarString)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testShow.mediaClock).to(equal(testMediaClockString)); +#pragma clang diagnostic pop expect(testShow.mediaTrack).to(equal(testMediaTrackString)); expect(testShow.templateTitle).to(beNil()); expect(testShow.graphic).to(beNil()); @@ -287,14 +341,20 @@ describe(@"Getter/Setter Tests", ^ { expect(testShow.metadataTags.mainField3).to(beNil()); expect(testShow.metadataTags.mainField4).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" testShow = [[SDLShow alloc] initWithMainField1:nil mainField2:nil alignment:nil statusBar:nil mediaClock:nil mediaTrack:nil]; +#pragma clang diagnostic pop expect(testShow.mainField1).to(beNil()); expect(testShow.mainField2).to(beNil()); expect(testShow.mainField3).to(beNil()); expect(testShow.mainField4).to(beNil()); expect(testShow.alignment).to(beNil()); expect(testShow.statusBar).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testShow.mediaClock).to(beNil()); +#pragma clang diagnostic pop expect(testShow.mediaTrack).to(beNil()); expect(testShow.templateTitle).to(beNil()); expect(testShow.graphic).to(beNil()); @@ -305,14 +365,20 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"should initialize correctly with initWithMainField1:mainField2:mainField3:mainField4:alignment:statusBar:mediaClock:mediaTrack:graphic:softButtons:customPresets:textFieldMetadata:", ^{ - SDLShow *testShow = [[SDLShow alloc] initWithMainField1:testString1 mainField2:testString2 mainField3:testString3 mainField4:testString4 alignment:testAlignment statusBar:testStatusBarString mediaClock:testMediaClockString mediaTrack:testMediaTrackString graphic:testGraphic softButtons:testSoftButtons customPresets:testCustomPresets textFieldMetadata:testTags]; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + SDLShow *testShow = [[SDLShow alloc] initWithMainField1:testString1 mainField2:testString2 mainField3:testString3 mainField4:testString4 alignment:testAlignment statusBar:testStatusBarString mediaClock:testMediaClockString mediaTrack:testMediaTrackString graphic:testGraphic softButtons:testSoftButtons customPresets:testCustomPresets textFieldMetadata:testMetadata]; +#pragma clang diagnostic pop expect(testShow.mainField1).to(equal(testString1)); expect(testShow.mainField2).to(equal(testString2)); expect(testShow.mainField3).to(equal(testString3)); expect(testShow.mainField4).to(equal(testString4)); expect(testShow.alignment).to(equal(testAlignment)); expect(testShow.statusBar).to(equal(testStatusBarString)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testShow.mediaClock).to(equal(testMediaClockString)); +#pragma clang diagnostic pop expect(testShow.mediaTrack).to(equal(testMediaTrackString)); expect(testShow.templateTitle).to(beNil()); expect(testShow.graphic).to(equal(testGraphic)); @@ -324,14 +390,20 @@ describe(@"Getter/Setter Tests", ^ { expect(testShow.metadataTags.mainField3).to(contain(testType3)); expect(testShow.metadataTags.mainField4).to(contain(testType4)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" testShow = [[SDLShow alloc] initWithMainField1:nil mainField2:nil mainField3:nil mainField4:nil alignment:nil statusBar:nil mediaClock:nil mediaTrack:nil graphic:nil softButtons:nil customPresets:nil textFieldMetadata:nil]; +#pragma clang diagnostic pop expect(testShow.mainField1).to(beNil()); expect(testShow.mainField2).to(beNil()); expect(testShow.mainField3).to(beNil()); expect(testShow.mainField4).to(beNil()); expect(testShow.alignment).to(beNil()); expect(testShow.statusBar).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testShow.mediaClock).to(beNil()); +#pragma clang diagnostic pop expect(testShow.mediaTrack).to(beNil()); expect(testShow.templateTitle).to(beNil()); expect(testShow.graphic).to(beNil()); @@ -341,45 +413,70 @@ describe(@"Getter/Setter Tests", ^ { expect(testShow.metadataTags).to(beNil()); }); + it(@"should initialize correctly with initWithMainField1:mainField2:mainField3:mainField4:alignment:statusBar:mediaTrack:graphic:secondaryGraphic:softButtons:customPresets:metadataTags:templateTitle:windowID:templateConfiguration:", ^{ + SDLShow *testShow = [[SDLShow alloc] initWithMainField1:testString1 mainField2:testString2 mainField3:testString3 mainField4:testString4 alignment:testAlignment statusBar:testStatusBarString mediaTrack:testMediaTrackString graphic:testGraphic secondaryGraphic:testSecondaryGraphic softButtons:testSoftButtons customPresets:testCustomPresets metadataTags:testMetadata templateTitle:testTemplateTitleString windowID:@(testWindowID) templateConfiguration:testTemplateConfiguration]; + expect(testShow.mainField1).to(equal(testString1)); + expect(testShow.mainField2).to(equal(testString2)); + expect(testShow.mainField3).to(equal(testString3)); + expect(testShow.mainField4).to(equal(testString4)); + expect(testShow.alignment).to(equal(testAlignment)); + expect(testShow.statusBar).to(equal(testStatusBarString)); + expect(testShow.mediaTrack).to(equal(testMediaTrackString)); + expect(testShow.graphic).to(equal(testGraphic)); + expect(testShow.secondaryGraphic).to(equal(testSecondaryGraphic)); + expect(testShow.softButtons).to(contain(testButton)); + expect(testShow.customPresets).to(contain(testString1)); + expect(testShow.metadataTags.mainField1).to(contain(testType1)); + expect(testShow.metadataTags.mainField2).to(contain(testType2)); + expect(testShow.metadataTags.mainField3).to(contain(testType3)); + expect(testShow.metadataTags.mainField4).to(contain(testType4)); + expect(testShow.templateTitle).to(equal(testTemplateTitleString)); + expect(testShow.windowID).to(equal(@(testWindowID))); + expect(testShow.templateConfiguration).to(equal(testTemplateConfiguration)); + }); + it(@"Should get correctly when initialized with a dictionary", ^ { NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: @{SDLRPCParameterNameParameters: - @{SDLRPCParameterNameMainField1:@"field1", - SDLRPCParameterNameMainField2:@"field2", - SDLRPCParameterNameMainField3:@"field3", - SDLRPCParameterNameMainField4:@"field4", + @{SDLRPCParameterNameMainField1:testString1, + SDLRPCParameterNameMainField2:testString2, + SDLRPCParameterNameMainField3:testString3, + SDLRPCParameterNameMainField4:testString4, SDLRPCParameterNameAlignment:SDLTextAlignmentLeft, - SDLRPCParameterNameStatusBar:@"status", - SDLRPCParameterNameMediaClock:@"TheTime", - SDLRPCParameterNameMediaTrack:@"In The Clear", - SDLRPCParameterNameTemplateTitle: @"Hello World", - SDLRPCParameterNameGraphic:image1, - SDLRPCParameterNameSecondaryGraphic:image2, - SDLRPCParameterNameSoftButtons:[@[button] mutableCopy], - SDLRPCParameterNameCustomPresets:[@[@"preset1", @"preset2"] mutableCopy], + SDLRPCParameterNameStatusBar:testStatusBarString, + SDLRPCParameterNameMediaClock:testMediaClockString, + SDLRPCParameterNameMediaTrack:testMediaTrackString, + SDLRPCParameterNameTemplateTitle: testTemplateTitleString, + SDLRPCParameterNameGraphic:testGraphic, + SDLRPCParameterNameSecondaryGraphic:testSecondaryGraphic, + SDLRPCParameterNameSoftButtons:testSoftButtons, + SDLRPCParameterNameCustomPresets:testCustomPresets, SDLRPCParameterNameMetadataTags:testMetadata, SDLRPCParameterNameWindowId:@(testWindowID), - SDLRPCParameterNameTemplateConfiguration:testTemplateConfig + SDLRPCParameterNameTemplateConfiguration:testTemplateConfiguration }, SDLRPCParameterNameOperationName:SDLRPCFunctionNameShow}} mutableCopy]; SDLShow* testRequest = [[SDLShow alloc] initWithDictionary:dict]; - expect(testRequest.mainField1).to(equal(@"field1")); - expect(testRequest.mainField2).to(equal(@"field2")); - expect(testRequest.mainField3).to(equal(@"field3")); - expect(testRequest.mainField4).to(equal(@"field4")); + expect(testRequest.mainField1).to(equal(testString1)); + expect(testRequest.mainField2).to(equal(testString2)); + expect(testRequest.mainField3).to(equal(testString3)); + expect(testRequest.mainField4).to(equal(testString4)); expect(testRequest.alignment).to(equal(SDLTextAlignmentLeft)); - expect(testRequest.statusBar).to(equal(@"status")); - expect(testRequest.mediaClock).to(equal(@"TheTime")); - expect(testRequest.mediaTrack).to(equal(@"In The Clear")); + expect(testRequest.statusBar).to(equal(testStatusBarString)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.mediaClock).to(equal(testMediaClockString)); +#pragma clang diagnostic pop + expect(testRequest.mediaTrack).to(equal(testMediaTrackString)); expect(testRequest.templateTitle).to(equal(testTemplateTitleString)); - expect(testRequest.graphic).to(equal(image1)); - expect(testRequest.secondaryGraphic).to(equal(image2)); - expect(testRequest.softButtons).to(equal([@[button] mutableCopy])); - expect(testRequest.customPresets).to(equal([@[@"preset1", @"preset2"] mutableCopy])); + expect(testRequest.graphic).to(equal(testGraphic)); + expect(testRequest.secondaryGraphic).to(equal(testSecondaryGraphic)); + expect(testRequest.softButtons).to(equal(testSoftButtons)); + expect(testRequest.customPresets).to(equal(testCustomPresets)); expect(testRequest.metadataTags).to(equal(testMetadata)); expect(testRequest.windowID).to(equal(testWindowID)); - expect(testRequest.templateConfiguration).to(equal(testTemplateConfig)); + expect(testRequest.templateConfiguration).to(equal(testTemplateConfiguration)); }); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index 7e3a98f36..64e99235a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -49,6 +49,7 @@ describe(@"getter/setter tests", ^{ testRequest.prndl = @YES; #pragma clang diagnostic pop testRequest.rpm = @YES; + testRequest.seatOccupancy = @YES; testRequest.speed = @YES; testRequest.stabilityControlsStatus = @YES; testRequest.steeringWheelAngle = @YES; @@ -90,6 +91,7 @@ describe(@"getter/setter tests", ^{ expect(testRequest.prndl).to(equal(@YES)); #pragma clang diagnostic pop expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(equal(@YES)); expect(testRequest.speed).to(equal(@YES)); expect(testRequest.stabilityControlsStatus).to(equal(@YES)); expect(testRequest.steeringWheelAngle).to(equal(@YES)); @@ -135,6 +137,7 @@ describe(@"getter/setter tests", ^{ SDLRPCParameterNamePRNDL:@YES, #pragma clang diagnostic pop SDLRPCParameterNameRPM:@YES, + SDLRPCParameterNameSeatOccupancy:@YES, SDLRPCParameterNameSpeed:@YES, SDLRPCParameterNameStabilityControlsStatus:@YES, SDLRPCParameterNameSteeringWheelAngle:@YES, @@ -179,6 +182,7 @@ describe(@"getter/setter tests", ^{ expect(testRequest.prndl).to(equal(@YES)); #pragma clang diagnostic pop expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(equal(@YES)); expect(testRequest.speed).to(equal(@YES)); expect(testRequest.stabilityControlsStatus).to(equal(@YES)); expect(testRequest.steeringWheelAngle).to(equal(@YES)); @@ -227,6 +231,7 @@ describe(@"test initializers", ^{ expect(testRequest.prndl).to(beNil()); #pragma clang diagnostic pop expect(testRequest.rpm).to(beNil()); + expect(testRequest.seatOccupancy).to(beNil()); expect(testRequest.speed).to(beNil()); expect(testRequest.stabilityControlsStatus).to(beNil()); expect(testRequest.steeringWheelAngle).to(beNil()); @@ -237,8 +242,108 @@ describe(@"test initializers", ^{ }); }); + context(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES cloudAppVehicleID:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES electronicParkBrakeStatus:YES emergencyEvent:YES engineOilLife:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES fuelRange:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES turnSignal:YES wiperStatus:YES]; +#pragma clang diagnostic pop + + it(@"expect all properties to be set properly", ^{ + expect(testRequest.accPedalPosition).to(equal(@YES)); + expect(testRequest.airbagStatus).to(equal(@YES)); + expect(testRequest.beltStatus).to(equal(@YES)); + expect(testRequest.bodyInformation).to(equal(@YES)); + expect(testRequest.cloudAppVehicleID).to(equal(@YES)); + expect(testRequest.clusterModeStatus).to(equal(@YES)); + expect(testRequest.deviceStatus).to(equal(@YES)); + expect(testRequest.driverBraking).to(equal(@YES)); + expect(testRequest.eCallInfo).to(equal(@YES)); + expect(testRequest.electronicParkBrakeStatus).to(equal(@YES)); + expect(testRequest.emergencyEvent).to(equal(@YES)); + expect(testRequest.engineOilLife).to(equal(@YES)); + expect(testRequest.engineTorque).to(equal(@YES)); + expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.fuelLevel).to(equal(@YES)); + expect(testRequest.fuelLevel_State).to(equal(@YES)); +#pragma clang diagnostic pop + expect(testRequest.fuelRange).to(equal(@YES)); + expect(testRequest.gearStatus).to(beNil()); + expect(testRequest.gps).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(beNil()); + expect(testRequest.headLampStatus).to(equal(@YES)); + expect(testRequest.instantFuelConsumption).to(equal(@YES)); + expect(testRequest.myKey).to(equal(@YES)); + expect(testRequest.odometer).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.prndl).to(equal(@YES)); +#pragma clang diagnostic pop + expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(beNil()); + expect(testRequest.speed).to(equal(@YES)); + expect(testRequest.stabilityControlsStatus).to(beNil()); + expect(testRequest.steeringWheelAngle).to(equal(@YES)); + expect(testRequest.tirePressure).to(equal(@YES)); + expect(testRequest.turnSignal).to(equal(@YES)); + expect(testRequest.windowStatus).to(beNil()); + expect(testRequest.wiperStatus).to(equal(@YES)); + }); + }); + context(@"initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:gearStatus:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:stabilityControlsStatus:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering:windowStatus:", ^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES gearStatus:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES stabilityControlsStatus:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES windowStatus:@YES]; +#pragma clang diagnostic pop + + it(@"expect all properties to be set properly", ^{ + expect(testRequest.accPedalPosition).to(equal(@YES)); + expect(testRequest.airbagStatus).to(equal(@YES)); + expect(testRequest.beltStatus).to(equal(@YES)); + expect(testRequest.bodyInformation).to(equal(@YES)); + expect(testRequest.cloudAppVehicleID).to(equal(@YES)); + expect(testRequest.clusterModeStatus).to(equal(@YES)); + expect(testRequest.deviceStatus).to(equal(@YES)); + expect(testRequest.driverBraking).to(equal(@YES)); + expect(testRequest.eCallInfo).to(equal(@YES)); + expect(testRequest.electronicParkBrakeStatus).to(equal(@YES)); + expect(testRequest.emergencyEvent).to(equal(@YES)); + expect(testRequest.engineOilLife).to(equal(@YES)); + expect(testRequest.engineTorque).to(equal(@YES)); + expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.fuelLevel).to(beNil()); + expect(testRequest.fuelLevel_State).to(beNil()); +#pragma clang diagnostic pop + expect(testRequest.fuelRange).to(equal(@YES)); + expect(testRequest.gearStatus).to(equal(@YES)); + expect(testRequest.gps).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(equal(@YES)); + expect(testRequest.headLampStatus).to(equal(@YES)); + expect(testRequest.instantFuelConsumption).to(equal(@YES)); + expect(testRequest.myKey).to(equal(@YES)); + expect(testRequest.odometer).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.prndl).to(beNil()); +#pragma clang diagnostic pop + expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(beNil()); + expect(testRequest.speed).to(equal(@YES)); + expect(testRequest.stabilityControlsStatus).to(equal(@YES)); + expect(testRequest.steeringWheelAngle).to(equal(@YES)); + expect(testRequest.tirePressure).to(equal(@YES)); + expect(testRequest.turnSignal).to(equal(@YES)); + expect(testRequest.windowStatus).to(equal(@YES)); + expect(testRequest.wiperStatus).to(equal(@YES)); + }); + }); + + context(@"initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:gearStatus:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:stabilityControlsStatus:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering:windowStatus:seatOccupancy:", ^{ + SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES gearStatus:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES stabilityControlsStatus:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES windowStatus:@YES seatOccupancy:@YES]; it(@"expect all properties to be set properly", ^{ expect(testRequest.accPedalPosition).to(equal(@YES)); @@ -273,6 +378,7 @@ describe(@"test initializers", ^{ expect(testRequest.prndl).to(beNil()); #pragma clang diagnostic pop expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(equal(@YES)); expect(testRequest.speed).to(equal(@YES)); expect(testRequest.stabilityControlsStatus).to(equal(@YES)); expect(testRequest.steeringWheelAngle).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index f71889b5f..633882fa3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -49,6 +49,7 @@ describe(@"getter/setter tests", ^{ testRequest.prndl = @YES; #pragma clang diagnostic pop testRequest.rpm = @YES; + testRequest.seatOccupancy = @YES; testRequest.speed = @YES; testRequest.stabilityControlsStatus = @YES; testRequest.steeringWheelAngle = @YES; @@ -90,6 +91,7 @@ describe(@"getter/setter tests", ^{ expect(testRequest.prndl).to(equal(@YES)); #pragma clang diagnostic pop expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(equal(@YES)); expect(testRequest.speed).to(equal(@YES)); expect(testRequest.stabilityControlsStatus).to(equal(@YES)); expect(testRequest.steeringWheelAngle).to(equal(@YES)); @@ -134,6 +136,7 @@ describe(@"getter/setter tests", ^{ SDLRPCParameterNamePRNDL:@YES, #pragma clang diagnostic pop SDLRPCParameterNameRPM:@YES, + SDLRPCParameterNameSeatOccupancy:@YES, SDLRPCParameterNameSpeed:@YES, SDLRPCParameterNameStabilityControlsStatus:@YES, SDLRPCParameterNameSteeringWheelAngle:@YES, @@ -178,6 +181,7 @@ describe(@"getter/setter tests", ^{ expect(testRequest.prndl).to(equal(@YES)); #pragma clang diagnostic pop expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(equal(@YES)); expect(testRequest.speed).to(equal(@YES)); expect(testRequest.stabilityControlsStatus).to(equal(@YES)); expect(testRequest.steeringWheelAngle).to(equal(@YES)); @@ -226,6 +230,7 @@ describe(@"test initializers", ^{ expect(testRequest.prndl).to(beNil()); #pragma clang diagnostic pop expect(testRequest.rpm).to(beNil()); + expect(testRequest.seatOccupancy).to(beNil()); expect(testRequest.speed).to(beNil()); expect(testRequest.stabilityControlsStatus).to(beNil()); expect(testRequest.steeringWheelAngle).to(beNil()); @@ -275,6 +280,7 @@ describe(@"test initializers", ^{ expect(testRequest.prndl).to(equal(@YES)); #pragma clang diagnostic pop expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(beNil()); expect(testRequest.speed).to(equal(@YES)); expect(testRequest.stabilityControlsStatus).to(beNil()); expect(testRequest.steeringWheelAngle).to(equal(@YES)); @@ -320,6 +326,55 @@ describe(@"test initializers", ^{ expect(testRequest.prndl).to(beNil()); #pragma clang diagnostic pop expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(beNil()); + expect(testRequest.speed).to(equal(@YES)); + expect(testRequest.stabilityControlsStatus).to(equal(@YES)); + expect(testRequest.steeringWheelAngle).to(equal(@YES)); + expect(testRequest.tirePressure).to(equal(@YES)); + expect(testRequest.turnSignal).to(equal(@YES)); + expect(testRequest.windowStatus).to(equal(@YES)); + expect(testRequest.wiperStatus).to(equal(@YES)); + + }); + }); + + context (@"initWithGps:speed:rpm:instantFuelConsumption:fuelRange:externalTemperature:turnSignal:gearStatus:tirePressure:odometer:beltStatus:bodyInformation:deviceStatus:driverBraking:wiperStatus:headLampStatus:engineTorque:accPedalPosition:steeringWheelAngle:engineOilLife:electronicParkBrakeStatus:cloudAppVehicleID:stabilityControlsStatus:eCallInfo:airbagStatus:emergencyEvent:clusterModeStatus:myKey:handsOffSteering:windowStatus:seatOccupancy:", ^{ + SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] initWithGps:@YES speed:@YES rpm:@YES instantFuelConsumption:@YES fuelRange:@YES externalTemperature:@YES turnSignal:@YES gearStatus:@YES tirePressure:@YES odometer:@YES beltStatus:@YES bodyInformation:@YES deviceStatus:@YES driverBraking:@YES wiperStatus:@YES headLampStatus:@YES engineTorque:@YES accPedalPosition:@YES steeringWheelAngle:@YES engineOilLife:@YES electronicParkBrakeStatus:@YES cloudAppVehicleID:@YES stabilityControlsStatus:@YES eCallInfo:@YES airbagStatus:@YES emergencyEvent:@YES clusterModeStatus:@YES myKey:@YES handsOffSteering:@YES windowStatus:@YES seatOccupancy:@YES]; + + it(@"expect all properties to be set properly", ^{ + expect(testRequest.accPedalPosition).to(equal(@YES)); + expect(testRequest.airbagStatus).to(equal(@YES)); + expect(testRequest.beltStatus).to(equal(@YES)); + expect(testRequest.bodyInformation).to(equal(@YES)); + expect(testRequest.cloudAppVehicleID).to(equal(@YES)); + expect(testRequest.clusterModeStatus).to(equal(@YES)); + expect(testRequest.deviceStatus).to(equal(@YES)); + expect(testRequest.driverBraking).to(equal(@YES)); + expect(testRequest.eCallInfo).to(equal(@YES)); + expect(testRequest.electronicParkBrakeStatus).to(equal(@YES)); + expect(testRequest.emergencyEvent).to(equal(@YES)); + expect(testRequest.engineOilLife).to(equal(@YES)); + expect(testRequest.engineTorque).to(equal(@YES)); + expect(testRequest.externalTemperature).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.fuelLevel).to(beNil()); + expect(testRequest.fuelLevel_State).to(beNil()); +#pragma clang diagnostic push + expect(testRequest.fuelRange).to(equal(@YES)); + expect(testRequest.gearStatus).to(equal(@YES)); + expect(testRequest.gps).to(equal(@YES)); + expect(testRequest.handsOffSteering).to(equal(@YES)); + expect(testRequest.headLampStatus).to(equal(@YES)); + expect(testRequest.instantFuelConsumption).to(equal(@YES)); + expect(testRequest.myKey).to(equal(@YES)); + expect(testRequest.odometer).to(equal(@YES)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testRequest.prndl).to(beNil()); +#pragma clang diagnostic pop + expect(testRequest.rpm).to(equal(@YES)); + expect(testRequest.seatOccupancy).to(equal(@YES)); expect(testRequest.speed).to(equal(@YES)); expect(testRequest.stabilityControlsStatus).to(equal(@YES)); expect(testRequest.steeringWheelAngle).to(equal(@YES)); |