diff options
Diffstat (limited to 'SmartDeviceLinkTests/RPCSpecs')
139 files changed, 978 insertions, 977 deletions
diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m index 3f67655a3..f26e01fdd 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m @@ -19,8 +19,8 @@ describe(@"Individual Enum Value Tests", ^ { //expect(SDLAppInterfaceUnregisteredReason USER_EXIT).to(equal(@"USER_EXIT")); expect(SDLAppInterfaceUnregisteredReasonIgnitionOff).to(equal(@"IGNITION_OFF")); expect(SDLAppInterfaceUnregisteredReasonBluetoothOff).to(equal(@"BLUETOOTH_OFF")); - expect(SDLAppInterfaceUnregisteredReasonUsbDisconnected).to(equal(@"USB_DISCONNECTED")); - expect(SDLAppInterfaceUnregisteredReasonRequestWhileInNoneHmiLevel).to(equal(@"REQUEST_WHILE_IN_NONE_HMI_LEVEL")); + expect(SDLAppInterfaceUnregisteredReasonUSBDisconnected).to(equal(@"USB_DISCONNECTED")); + expect(SDLAppInterfaceUnregisteredReasonRequestWhileInNoneHMILevel).to(equal(@"REQUEST_WHILE_IN_NONE_HMI_LEVEL")); expect(SDLAppInterfaceUnregisteredReasonTooManyRequests).to(equal(@"TOO_MANY_REQUESTS")); expect(SDLAppInterfaceUnregisteredReasonDriverDistractionViolation).to(equal(@"DRIVER_DISTRACTION_VIOLATION")); expect(SDLAppInterfaceUnregisteredReasonLanguageChange).to(equal(@"LANGUAGE_CHANGE")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m index b75ce9480..1b3b1069f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m @@ -14,7 +14,7 @@ QuickSpecBegin(SDLAudioTypeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLAudioTypePcm).to(equal(@"PCM")); + expect(SDLAudioTypePCM).to(equal(@"PCM")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m index 384e8eede..219c44437 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m @@ -16,8 +16,8 @@ describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLCharacterSetType2Set).to(equal(@"TYPE2SET")); expect(SDLCharacterSetType5Set).to(equal(@"TYPE5SET")); - expect(SDLCharacterSetCid1Set).to(equal(@"CID1SET")); - expect(SDLCharacterSetCid2Set).to(equal(@"CID2SET")); + expect(SDLCharacterSetCID1Set).to(equal(@"CID1SET")); + expect(SDLCharacterSetCID2Set).to(equal(@"CID2SET")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m index 318a086a3..09e010fd7 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m @@ -14,11 +14,11 @@ QuickSpecBegin(SDLDeviceLevelStatusSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLDeviceLevelStatusZeroLevelBars).to(equal(@"ZERO_LEVEL_BARS")); - expect(SDLDeviceLevelStatusOneLevelBars).to(equal(@"ONE_LEVEL_BARS")); - expect(SDLDeviceLevelStatusTwoLevelBars).to(equal(@"TWO_LEVEL_BARS")); - expect(SDLDeviceLevelStatusThreeLevelBars).to(equal(@"THREE_LEVEL_BARS")); - expect(SDLDeviceLevelStatusFourLevelBars).to(equal(@"FOUR_LEVEL_BARS")); + expect(SDLDeviceLevelStatusZeroBars).to(equal(@"ZERO_LEVEL_BARS")); + expect(SDLDeviceLevelStatusOneBar).to(equal(@"ONE_LEVEL_BARS")); + expect(SDLDeviceLevelStatusTwoBars).to(equal(@"TWO_LEVEL_BARS")); + expect(SDLDeviceLevelStatusThreeBars).to(equal(@"THREE_LEVEL_BARS")); + expect(SDLDeviceLevelStatusFourBars).to(equal(@"FOUR_LEVEL_BARS")); expect(SDLDeviceLevelStatusNotProvided).to(equal(@"NOT_PROVIDED")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m index fe525d5c6..42e774e23 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m @@ -15,8 +15,8 @@ QuickSpecBegin(SDLDimensionSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLDimensionNoFix).to(equal(@"NO_FIX")); - expect(SDLDimension2d).to(equal(@"2D")); - expect(SDLDimension3d).to(equal(@"3D")); + expect(SDLDimension2D).to(equal(@"2D")); + expect(SDLDimension3D).to(equal(@"3D")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m index ac70e2bfe..41a5f30bb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m @@ -14,15 +14,15 @@ QuickSpecBegin(SDLDisplayTypeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLDisplayTypeCid).to(equal(@"CID")); + expect(SDLDisplayTypeCID).to(equal(@"CID")); expect(SDLDisplayTypeType2).to(equal(@"TYPE2")); expect(SDLDisplayTypeType5).to(equal(@"TYPE5")); - expect(SDLDisplayTypeNgn).to(equal(@"NGN")); - expect(SDLDisplayTypeGen26Dma).to(equal(@"GEN2_6_DMA")); - expect(SDLDisplayTypeGen28Dma).to(equal(@"GEN2_8_DMA")); - expect(SDLDisplayTypeMfd3).to(equal(@"MFD3")); - expect(SDLDisplayTypeMfd4).to(equal(@"MFD4")); - expect(SDLDisplayTypeMfd5).to(equal(@"MFD5")); + expect(SDLDisplayTypeNGN).to(equal(@"NGN")); + expect(SDLDisplayTypeGen26DMA).to(equal(@"GEN2_6_DMA")); + expect(SDLDisplayTypeGen28DMA).to(equal(@"GEN2_8_DMA")); + expect(SDLDisplayTypeMFD3).to(equal(@"MFD3")); + expect(SDLDisplayTypeMFD4).to(equal(@"MFD4")); + expect(SDLDisplayTypeMFD5).to(equal(@"MFD5")); //NOT DEFINED IN SPEC expect(SDLDisplayTypeGen38Inch).to(equal(@"GEN3_8-INCH")); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m index c453c5d3b..64addedf1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m @@ -20,7 +20,7 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLECallConfirmationStatusCompleted).to(equal(@"CALL_COMPLETED")); expect(SDLECallConfirmationStatusUnsuccessful).to(equal(@"CALL_UNSUCCESSFUL")); expect(SDLECallConfirmationStatusConfiguredOff).to(equal(@"ECALL_CONFIGURED_OFF")); - expect(SDLECallConfirmationStatusCompleteDtmfTimeout).to(equal(@"CALL_COMPLETE_DTMF_TIMEOUT")); + expect(SDLECallConfirmationStatusCompleteDTMFTimeout).to(equal(@"CALL_COMPLETE_DTMF_TIMEOUT")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m index 3667f0a7c..7b36a863e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m @@ -14,14 +14,14 @@ QuickSpecBegin(SDLFileTypeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLFileTypeGraphicBmp).to(equal(@"GRAPHIC_BMP")); - expect(SDLFileTypeGraphicJpeg).to(equal(@"GRAPHIC_JPEG")); - expect(SDLFileTypeGraphicPng).to(equal(@"GRAPHIC_PNG")); - expect(SDLFileTypeAudioWave).to(equal(@"AUDIO_WAVE")); - expect(SDLFileTypeAudioMp3).to(equal(@"AUDIO_MP3")); - expect(SDLFileTypeAudioAac).to(equal(@"AUDIO_AAC")); + expect(SDLFileTypeGraphicBMP).to(equal(@"GRAPHIC_BMP")); + expect(SDLFileTypeGraphicJPEG).to(equal(@"GRAPHIC_JPEG")); + expect(SDLFileTypeGraphicPNG).to(equal(@"GRAPHIC_PNG")); + expect(SDLFileTypeAudioWAV).to(equal(@"AUDIO_WAVE")); + expect(SDLFileTypeAudioMP3).to(equal(@"AUDIO_MP3")); + expect(SDLFileTypeAudioAAC).to(equal(@"AUDIO_AAC")); expect(SDLFileTypeBinary).to(equal(@"BINARY")); - expect(SDLFileTypeJson).to(equal(@"JSON")); + expect(SDLFileTypeJSON).to(equal(@"JSON")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m index 03032c968..98fad5735 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m @@ -16,8 +16,8 @@ describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLGlobalPropertyHelpPrompt).to(equal(@"HELPPROMPT")); expect(SDLGlobalPropertyTimeoutPrompt).to(equal(@"TIMEOUTPROMPT")); - expect(SDLGlobalPropertyVrHelpTitle).to(equal(@"VRHELPTITLE")); - expect(SDLGlobalPropertyVrHelpItems).to(equal(@"VRHELPITEMS")); + expect(SDLGlobalPropertyVRHelpTitle).to(equal(@"VRHELPTITLE")); + expect(SDLGlobalPropertyVRHelpItems).to(equal(@"VRHELPITEMS")); expect(SDLGlobalPropertyMenuName).to(equal(@"MENUNAME")); expect(SDLGlobalPropertyMenuIcon).to(equal(@"MENUICON")); expect(SDLGlobalPropertyKeyboard).to(equal(@"KEYBOARDPROPERTIES")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m index 1f1cdf39a..71b8a8c2c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m @@ -10,7 +10,7 @@ #import "SDLHMIZoneCapabilities.h" -QuickSpecBegin(SDLHmiZoneCapabilitiesSpec) +QuickSpecBegin(SDLHMIZoneCapabilitiesSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m index 81d5360c3..6841858fe 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m @@ -20,11 +20,11 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLImageFieldNameVrHelpItem).to(equal(@"vrHelpItem")); expect(SDLImageFieldNameTurnIcon).to(equal(@"turnIcon")); expect(SDLImageFieldNameMenuIcon).to(equal(@"menuIcon")); - expect(SDLImageFieldNameCmdIcon).to(equal(@"cmdIcon")); + expect(SDLImageFieldNameCommandIcon).to(equal(@"cmdIcon")); expect(SDLImageFieldNameAppIcon).to(equal(@"appIcon")); expect(SDLImageFieldNameGraphic).to(equal(@"graphic")); - expect(SDLImageFieldNameShowConstantTbtIcon).to(equal(@"showConstantTBTIcon")); - expect(SDLImageFieldNameShowConstantTbtNextTurnIcon).to(equal(@"showConstantTBTNextTurnIcon")); + expect(SDLImageFieldNameShowConstantTBTIcon).to(equal(@"showConstantTBTIcon")); + expect(SDLImageFieldNameShowConstantTBTNextTurnIcon).to(equal(@"showConstantTBTNextTurnIcon")); expect(SDLImageFieldNameLocationImage).to(equal(@"locationImage")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m index 10b0aa58b..d13d920b9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m @@ -15,7 +15,7 @@ QuickSpecBegin(SDLInteractionModeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLInteractionModeManualOnly).to(equal(@"MANUAL_ONLY")); - expect(SDLInteractionModeVrOnly).to(equal(@"VR_ONLY")); + expect(SDLInteractionModeVROnly).to(equal(@"VR_ONLY")); expect(SDLInteractionModeBoth).to(equal(@"BOTH")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m index 749d17924..ec0298852 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m @@ -14,9 +14,9 @@ QuickSpecBegin(SDLKeyboardLayoutSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLKeyboardLayoutQwerty).to(equal(@"QWERTY")); - expect(SDLKeyboardLayoutQwertz).to(equal(@"QWERTZ")); - expect(SDLKeyboardLayoutAzerty).to(equal(@"AZERTY")); + expect(SDLKeyboardLayoutQWERTY).to(equal(@"QWERTY")); + expect(SDLKeyboardLayoutQWERTZ).to(equal(@"QWERTZ")); + expect(SDLKeyboardLayoutAZERTY).to(equal(@"AZERTY")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m index d34b6fa97..45fa5ba6f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m @@ -14,10 +14,10 @@ QuickSpecBegin(SDLPowerModeQualificationStatusSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLPowerModeQualificationStatusPowerModeUndefined).to(equal(@"POWER_MODE_UNDEFINED")); - expect(SDLPowerModeQualificationStatusPowerModeEvaluationInProgress).to(equal(@"POWER_MODE_EVALUATION_IN_PROGRESS")); + expect(SDLPowerModeQualificationStatusUndefined).to(equal(@"POWER_MODE_UNDEFINED")); + expect(SDLPowerModeQualificationStatusEvaluationInProgress).to(equal(@"POWER_MODE_EVALUATION_IN_PROGRESS")); expect(SDLPowerModeQualificationStatusNotDefined).to(equal(@"NOT_DEFINED")); - expect(SDLPowerModeQualificationStatusPowerModeOk).to(equal(@"POWER_MODE_OK")); + expect(SDLPowerModeQualificationStatusOk).to(equal(@"POWER_MODE_OK")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m index 51289069f..1635f7741 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m @@ -18,9 +18,9 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLPredefinedLayoutMedia).to(equal(@"MEDIA")); expect(SDLPredefinedLayoutNonMedia).to(equal(@"NON-MEDIA")); expect(SDLPredefinedLayoutOnscreenPresets).to(equal(@"ONSCREEN_PRESETS")); - expect(SDLPredefinedLayoutNavFullscreenMap).to(equal(@"NAV_FULLSCREEN_MAP")); - expect(SDLPredefinedLayoutNavList).to(equal(@"NAV_LIST")); - expect(SDLPredefinedLayoutNavKeyboard).to(equal(@"NAV_KEYBOARD")); + expect(SDLPredefinedLayoutNavigationFullscreenMap).to(equal(@"NAV_FULLSCREEN_MAP")); + expect(SDLPredefinedLayoutNavigationList).to(equal(@"NAV_LIST")); + expect(SDLPredefinedLayoutNavigationKeyboard).to(equal(@"NAV_KEYBOARD")); expect(SDLPredefinedLayoutGraphicWithText).to(equal(@"GRAPHIC_WITH_TEXT")); expect(SDLPredefinedLayoutTextWithGraphic).to(equal(@"TEXT_WITH_GRAPHIC")); expect(SDLPredefinedLayoutTilesOnly).to(equal(@"TILES_ONLY")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m index 14af82632..657821a6f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m @@ -14,11 +14,11 @@ QuickSpecBegin(SDLPrerecordedSpeechSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLPrerecordedSpeechHelpJingle).to(equal(@"HELP_JINGLE")); - expect(SDLPrerecordedSpeechInitialJingle).to(equal(@"INITIAL_JINGLE")); - expect(SDLPrerecordedSpeechListenJingle).to(equal(@"LISTEN_JINGLE")); - expect(SDLPrerecordedSpeechPositiveJingle).to(equal(@"POSITIVE_JINGLE")); - expect(SDLPrerecordedSpeechNegativeJingle).to(equal(@"NEGATIVE_JINGLE")); + expect(SDLPrerecordedSpeechHelp).to(equal(@"HELP_JINGLE")); + expect(SDLPrerecordedSpeechInitial).to(equal(@"INITIAL_JINGLE")); + expect(SDLPrerecordedSpeechListen).to(equal(@"LISTEN_JINGLE")); + expect(SDLPrerecordedSpeechPositive).to(equal(@"POSITIVE_JINGLE")); + expect(SDLPrerecordedSpeechNegative).to(equal(@"NEGATIVE_JINGLE")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m index 1bd0a97b7..712dfd8d1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m @@ -15,8 +15,8 @@ QuickSpecBegin(SDLPrimaryAudioSourceSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLPrimaryAudioSourceNoSourceSelected).to(equal(@"NO_SOURCE_SELECTED")); - expect(SDLPrimaryAudioSourceUsb).to(equal(@"USB")); - expect(SDLPrimaryAudioSourceUsb2).to(equal(@"USB2")); + expect(SDLPrimaryAudioSourceUSB).to(equal(@"USB")); + expect(SDLPrimaryAudioSourceUSB2).to(equal(@"USB2")); expect(SDLPrimaryAudioSourceBluetoothStereo).to(equal(@"BLUETOOTH_STEREO_BTST")); expect(SDLPrimaryAudioSourceLineIn).to(equal(@"LINE_IN")); expect(SDLPrimaryAudioSourceIpod).to(equal(@"IPOD")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m index 4ad81f6a0..9b6b74279 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m @@ -14,15 +14,15 @@ QuickSpecBegin(SDLRequestTypeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLRequestTypeHttp).to(equal(@"HTTP")); + expect(SDLRequestTypeHTTP).to(equal(@"HTTP")); expect(SDLRequestTypeFileResume).to(equal(@"FILE_RESUME")); - expect(SDLRequestTypeAuthRequest).to(equal(@"AUTH_REQUEST")); - expect(SDLRequestTypeAuthChallenge).to(equal(@"AUTH_CHALLENGE")); - expect(SDLRequestTypeAuthAck).to(equal(@"AUTH_ACK")); + expect(SDLRequestTypeAuthenticationRequest).to(equal(@"AUTH_REQUEST")); + expect(SDLRequestTypeAuthenticationChallenge).to(equal(@"AUTH_CHALLENGE")); + expect(SDLRequestTypeAuthenticationAck).to(equal(@"AUTH_ACK")); expect(SDLRequestTypeProprietary).to(equal(@"PROPRIETARY")); expect(SDLRequestTypeQueryApps).to(equal(@"QUERY_APPS")); expect(SDLRequestTypeLaunchApp).to(equal(@"LAUNCH_APP")); - expect(SDLRequestTypeLockScreenIconUrl).to(equal(@"LOCK_SCREEN_ICON_URL")); + expect(SDLRequestTypeLockScreenIconURL).to(equal(@"LOCK_SCREEN_ICON_URL")); expect(SDLRequestTypeTrafficMessageChannel).to(equal(@"TRAFFIC_MESSAGE_CHANNEL")); expect(SDLRequestTypeDriverProfile).to(equal(@"DRIVER_PROFILE")); expect(SDLRequestTypeVoiceSearch).to(equal(@"VOICE_SEARCH")); @@ -33,7 +33,7 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLRequestTypeVehicleDiagnostics).to(equal(@"VEHICLE_DIAGNOSTICS")); expect(SDLRequestTypeEmergency).to(equal(@"EMERGENCY")); expect(SDLRequestTypeMedia).to(equal(@"MEDIA")); - expect(SDLRequestTypeFota).to(equal(@"FOTA")); + expect(SDLRequestTypeFOTA).to(equal(@"FOTA")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m index a1788e499..81b9c9b57 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m @@ -44,8 +44,8 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLResultCancelRoute).to(equal(@"CANCEL_ROUTE")); expect(SDLResultTruncatedData).to(equal(@"TRUNCATED_DATA")); expect(SDLResultSaved).to(equal(@"SAVED")); - expect(SDLResultInvalidCert).to(equal(@"INVALID_CERT")); - expect(SDLResultExpiredCert).to(equal(@"EXPIRED_CERT")); + expect(SDLResultInvalidCertificate).to(equal(@"INVALID_CERT")); + expect(SDLResultExpiredCertificate).to(equal(@"EXPIRED_CERT")); expect(SDLResultResumeFailed).to(equal(@"RESUME_FAILED")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m index 2185d62c7..a8fa116f8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m @@ -14,10 +14,10 @@ QuickSpecBegin(SDLSamplingRateSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLSamplingRate8Khz).to(equal(@"8KHZ")); - expect(SDLSamplingRate16Khz).to(equal(@"16KHZ")); - expect(SDLSamplingRate22Khz).to(equal(@"22KHZ")); - expect(SDLSamplingRate44Khz).to(equal(@"44KHZ")); + expect(SDLSamplingRate8KHZ).to(equal(@"8KHZ")); + expect(SDLSamplingRate16KHZ).to(equal(@"16KHZ")); + expect(SDLSamplingRate22KHZ).to(equal(@"22KHZ")); + expect(SDLSamplingRate44KHZ).to(equal(@"44KHZ")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m index 43704a368..b21c5b578 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m @@ -15,9 +15,9 @@ QuickSpecBegin(SDLSpeechCapabilitiesSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLSpeechCapabilitiesText).to(equal(@"TEXT")); - expect(SDLSpeechCapabilitiesSapiPhonemes).to(equal(@"SAPI_PHONEMES")); - expect(SDLSpeechCapabilitiesLhplusPhonemes).to(equal(@"LHPLUS_PHONEMES")); - expect(SDLSpeechCapabilitiesPreRecorded).to(equal(@"PRE_RECORDED")); + expect(SDLSpeechCapabilitiesSAPIPhonemes).to(equal(@"SAPI_PHONEMES")); + expect(SDLSpeechCapabilitiesLHPlusPhonemes).to(equal(@"LHPLUS_PHONEMES")); + expect(SDLSpeechCapabilitiesPrerecorded).to(equal(@"PRE_RECORDED")); expect(SDLSpeechCapabilitiesSilence).to(equal(@"SILENCE")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m index 6cbe402d2..0136c4cb5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m @@ -15,9 +15,9 @@ QuickSpecBegin(SDLSystemContextSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLSystemContextMain).to(equal(@"MAIN")); - expect(SDLSystemContextVrSession).to(equal(@"VRSESSION")); + expect(SDLSystemContextVRSession).to(equal(@"VRSESSION")); expect(SDLSystemContextMenu).to(equal(@"MENU")); - expect(SDLSystemContextHmiObscured).to(equal(@"HMI_OBSCURED")); + expect(SDLSystemContextHMIObscured).to(equal(@"HMI_OBSCURED")); expect(SDLSystemContextAlert).to(equal(@"ALERT")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m index 7d4f13e88..8684e1549 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m @@ -18,7 +18,7 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLTBTStateRouteAccepted).to(equal(@"ROUTE_ACCEPTED")); expect(SDLTBTStateRouteRefused).to(equal(@"ROUTE_REFUSED")); expect(SDLTBTStateRouteCancelled).to(equal(@"ROUTE_CANCELLED")); - expect(SDLTBTStateEtaRequest).to(equal(@"ETA_REQUEST")); + expect(SDLTBTStateETARequest).to(equal(@"ETA_REQUEST")); expect(SDLTBTStateNextTurnRequest).to(equal(@"NEXT_TURN_REQUEST")); expect(SDLTBTStateRouteStatusRequest).to(equal(@"ROUTE_STATUS_REQUEST")); expect(SDLTBTStateRouteSummaryRequest).to(equal(@"ROUTE_SUMMARY_REQUEST")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m index 11e2496ec..6d29ff29e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m @@ -28,7 +28,7 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLTextFieldNameInitialInteractionText).to(equal(@"initialInteractionText")); expect(SDLTextFieldNameNavigationText1).to(equal(@"navigationText1")); expect(SDLTextFieldNameNavigationText2).to(equal(@"navigationText2")); - expect(SDLTextFieldNameEta).to(equal(@"ETA")); + expect(SDLTextFieldNameETA).to(equal(@"ETA")); expect(SDLTextFieldNameTotalDistance).to(equal(@"totalDistance")); expect(SDLTextFieldNameAudioPassThruDisplayText1).to(equal(@"audioPassThruDisplayText1")); expect(SDLTextFieldNameAudioPassThruDisplayText2).to(equal(@"audioPassThruDisplayText2")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m index ae0c043f2..76610183c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m @@ -15,7 +15,7 @@ QuickSpecBegin(SDLTriggerSourceSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLTriggerSourceMenu).to(equal(@"MENU")); - expect(SDLTriggerSourceVr).to(equal(@"VR")); + expect(SDLTriggerSourceVR).to(equal(@"VR")); expect(SDLTriggerSourceKeyboard).to(equal(@"KEYBOARD")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m index ac8e2ee06..2e6df2174 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m @@ -14,21 +14,21 @@ QuickSpecBegin(SDLVehicleDataTypeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLVehicleDataTypeGps).to(equal(@"VEHICLEDATA_GPS")); + expect(SDLVehicleDataTypeGPS).to(equal(@"VEHICLEDATA_GPS")); expect(SDLVehicleDataTypeSpeed).to(equal(@"VEHICLEDATA_SPEED")); - expect(SDLVehicleDataTypeRpm).to(equal(@"VEHICLEDATA_RPM")); + expect(SDLVehicleDataTypeRPM).to(equal(@"VEHICLEDATA_RPM")); expect(SDLVehicleDataTypeFuelLevel).to(equal(@"VEHICLEDATA_FUELLEVEL")); expect(SDLVehicleDataTypeFuelLevelState).to(equal(@"VEHICLEDATA_FUELLEVEL_STATE")); expect(SDLVehicleDataTypeFuelConsumption).to(equal(@"VEHICLEDATA_FUELCONSUMPTION")); - expect(SDLVehicleDataTypeExternalTemp).to(equal(@"VEHICLEDATA_EXTERNTEMP")); - expect(SDLVehicleDataTypeVin).to(equal(@"VEHICLEDATA_VIN")); - expect(SDLVehicleDataTypePrndl).to(equal(@"VEHICLEDATA_PRNDL")); + expect(SDLVehicleDataTypeExternalTemperature).to(equal(@"VEHICLEDATA_EXTERNTEMP")); + expect(SDLVehicleDataTypeVIN).to(equal(@"VEHICLEDATA_VIN")); + expect(SDLVehicleDataTypePRNDL).to(equal(@"VEHICLEDATA_PRNDL")); expect(SDLVehicleDataTypeTirePressure).to(equal(@"VEHICLEDATA_TIREPRESSURE")); expect(SDLVehicleDataTypeOdometer).to(equal(@"VEHICLEDATA_ODOMETER")); expect(SDLVehicleDataTypeBeltStatus).to(equal(@"VEHICLEDATA_BELTSTATUS")); expect(SDLVehicleDataTypeBodyInfo).to(equal(@"VEHICLEDATA_BODYINFO")); expect(SDLVehicleDataTypeDeviceStatus).to(equal(@"VEHICLEDATA_DEVICESTATUS")); - expect(SDLVehicleDataTypeEcallInfo).to(equal(@"VEHICLEDATA_ECALLINFO")); + expect(SDLVehicleDataTypeECallInfo).to(equal(@"VEHICLEDATA_ECALLINFO")); expect(SDLVehicleDataTypeAirbagStatus).to(equal(@"VEHICLEDATA_AIRBAGSTATUS")); expect(SDLVehicleDataTypeEmergencyEvent).to(equal(@"VEHICLEDATA_EMERGENCYEVENT")); expect(SDLVehicleDataTypeClusterModeStatus).to(equal(@"VEHICLEDATA_CLUSTERMODESTATUS")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.m index b896698d1..3e92b7970 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.m @@ -15,18 +15,18 @@ QuickSpecBegin(SDLWiperStatusSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLWiperStatusOff).to(equal(@"OFF")); - expect(SDLWiperStatusAutoOff).to(equal(@"AUTO_OFF")); + expect(SDLWiperStatusAutomaticOff).to(equal(@"AUTO_OFF")); expect(SDLWiperStatusOffMoving).to(equal(@"OFF_MOVING")); - expect(SDLWiperStatusManIntOff).to(equal(@"MAN_INT_OFF")); - expect(SDLWiperStatusManIntOn).to(equal(@"MAN_INT_ON")); - expect(SDLWiperStatusManLow).to(equal(@"MAN_LOW")); - expect(SDLWiperStatusManHigh).to(equal(@"MAN_HIGH")); - expect(SDLWiperStatusManFlick).to(equal(@"MAN_FLICK")); + expect(SDLWiperStatusManualIntervalOff).to(equal(@"MAN_INT_OFF")); + expect(SDLWiperStatusManualIntervalOn).to(equal(@"MAN_INT_ON")); + expect(SDLWiperStatusManualLow).to(equal(@"MAN_LOW")); + expect(SDLWiperStatusManualHigh).to(equal(@"MAN_HIGH")); + expect(SDLWiperStatusManualFlick).to(equal(@"MAN_FLICK")); expect(SDLWiperStatusWash).to(equal(@"WASH")); - expect(SDLWiperStatusAutoLow).to(equal(@"AUTO_LOW")); - expect(SDLWiperStatusAutoHigh).to(equal(@"AUTO_HIGH")); + expect(SDLWiperStatusAutomaticLow).to(equal(@"AUTO_LOW")); + expect(SDLWiperStatusAutomaticHigh).to(equal(@"AUTO_HIGH")); expect(SDLWiperStatusCourtesyWipe).to(equal(@"COURTESYWIPE")); - expect(SDLWiperStatusAutoAdjust).to(equal(@"AUTO_ADJUST")); + expect(SDLWiperStatusAutomaticAdjust).to(equal(@"AUTO_ADJUST")); expect(SDLWiperStatusStalled).to(equal(@"STALLED")); expect(SDLWiperStatusNoDataExists).to(equal(@"NO_DATA_EXISTS")); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m b/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m index b496af272..5fafe4ba2 100644 --- a/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m @@ -371,16 +371,16 @@ describe(@"BuildGetVehicleData Tests", ^ { describe(@"BuildPerformAudioPassThru Tests", ^ { it(@"Should build correctly", ^ { SDLPerformAudioPassThru* message = [SDLRPCRequestFactory buildPerformAudioPassThruWithInitialPrompt:@"" audioPassThruDisplayText1:@"Display1" audioPassThruDisplayText2:@"Display2" - samplingRate:SDLSamplingRate44Khz maxDuration:@10 bitsPerSample:SDLBitsPerSample16Bit audioType:SDLAudioTypePcm + samplingRate:SDLSamplingRate44KHZ maxDuration:@10 bitsPerSample:SDLBitsPerSample16Bit audioType:SDLAudioTypePCM muteAudio:@NO correlationID:@2500]; expect(((SDLTTSChunk*)[message initialPrompt][0]).text).to(equal(@"")); expect(message.audioPassThruDisplayText1).to(equal(@"Display1")); expect(message.audioPassThruDisplayText2).to(equal(@"Display2")); - expect(message.samplingRate).to(equal(SDLSamplingRate44Khz)); + expect(message.samplingRate).to(equal(SDLSamplingRate44KHZ)); expect(message.maxDuration).to(equal(@10)); expect(message.bitsPerSample).to(equal(SDLBitsPerSample16Bit)); - expect(message.audioType).to(equal(SDLAudioTypePcm)); + expect(message.audioType).to(equal(SDLAudioTypePCM)); expect(message.muteAudio).to(equal(@NO)); expect(message.correlationID).to(equal(@2500)); }); @@ -414,7 +414,7 @@ describe(@"BuildPerformInteraction Tests", ^ { it(@"Should build correctly", ^ { NSArray* vrHelp = @[[[SDLVRHelpItem alloc] init]]; SDLPerformInteraction* message = [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:@"Nothing" initialText:@"Still Nothing" interactionChoiceSetIDList:@[@4223, @1337] - helpPrompt:@"A Whole Lot of Nothing" timeoutPrompt:@"Time Remaining" interactionMode:SDLInteractionModeVrOnly + helpPrompt:@"A Whole Lot of Nothing" timeoutPrompt:@"Time Remaining" interactionMode:SDLInteractionModeVROnly timeout:@5600 vrHelp:vrHelp correlationID:@31564]; expect(((SDLTTSChunk*)[message initialPrompt][0]).text).to(equal(@"Nothing")); @@ -422,7 +422,7 @@ describe(@"BuildPerformInteraction Tests", ^ { expect(message.interactionChoiceSetIDList).to(equal(@[@4223, @1337])); expect(((SDLTTSChunk*)[message helpPrompt][0]).text).to(equal(@"A Whole Lot of Nothing")); expect(((SDLTTSChunk*)[message timeoutPrompt][0]).text).to(equal(@"Time Remaining")); - expect(message.interactionMode).to(equal(SDLInteractionModeVrOnly)); + expect(message.interactionMode).to(equal(SDLInteractionModeVROnly)); expect(message.timeout).to(equal(@5600)); expect(message.vrHelp).to(equal(vrHelp)); expect(message.interactionLayout).to(beNil()); @@ -474,10 +474,10 @@ describe(@"BuildPerformInteraction Tests", ^ { describe(@"BuildPutFile Tests", ^ { it(@"Should build correctly", ^ { - SDLPutFile *message = [SDLRPCRequestFactory buildPutFileWithFileName:@"YES!?" fileType:SDLFileTypeGraphicBmp persistentFile:@165636 correlationId:@147986]; + SDLPutFile *message = [SDLRPCRequestFactory buildPutFileWithFileName:@"YES!?" fileType:SDLFileTypeGraphicBMP persistentFile:@165636 correlationId:@147986]; expect(message.syncFileName).to(equal(@"YES!?")); - expect(message.fileType).to(equal(SDLFileTypeGraphicBmp)); + expect(message.fileType).to(equal(SDLFileTypeGraphicBMP)); expect(message.persistentFile).to(equal(@165636)); expect(message.correlationID).to(equal(@147986)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m index 6f8b7ceeb..b35d34d9c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_reason:SDLAppInterfaceUnregisteredReasonAppUnauthorized}, - NAMES_operation_name:NAMES_OnAppInterfaceUnregistered}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameReason:SDLAppInterfaceUnregisteredReasonAppUnauthorized}, + SDLNameOperationName:SDLNameOnAppInterfaceUnregistered}} mutableCopy]; SDLOnAppInterfaceUnregistered* testNotification = [[SDLOnAppInterfaceUnregistered alloc] initWithDictionary:dict]; expect(testNotification.reason).to(equal(SDLAppInterfaceUnregisteredReasonAppUnauthorized)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m index 55d4e564d..b303ffd1a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m @@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_buttonName:SDLButtonNameCustomButton, - NAMES_buttonEventMode:SDLButtonEventModeButtonDown, - NAMES_customButtonID:@4252}, - NAMES_operation_name:NAMES_OnButtonEvent}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameButtonName:SDLButtonNameCustomButton, + SDLNameButtonEventMode:SDLButtonEventModeButtonDown, + SDLNameCustomButtonId:@4252}, + SDLNameOperationName:SDLNameOnButtonEvent}} mutableCopy]; SDLOnButtonEvent* testNotification = [[SDLOnButtonEvent alloc] initWithDictionary:dict]; expect(testNotification.buttonName).to(equal(SDLButtonNameCustomButton)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m index 285060191..5737c2f81 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m @@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_buttonName:SDLButtonNameCustomButton, - NAMES_buttonPressMode:SDLButtonPressModeLong, - NAMES_customButtonID:@5642}, - NAMES_operation_name:NAMES_OnButtonPress}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameButtonName:SDLButtonNameCustomButton, + SDLNameButtonPressMode:SDLButtonPressModeLong, + SDLNameCustomButtonId:@5642}, + SDLNameOperationName:SDLNameOnButtonPress}} mutableCopy]; SDLOnButtonPress* testNotification = [[SDLOnButtonPress alloc] initWithDictionary:dict]; expect(testNotification.buttonName).to(equal(SDLButtonNameCustomButton)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m index 07837c023..6257a13cb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m @@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_cmdID:@5676544, - NAMES_triggerSource:SDLTriggerSourceKeyboard}, - NAMES_operation_name:NAMES_OnCommand}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameCommandId:@5676544, + SDLNameTriggerSource:SDLTriggerSourceKeyboard}, + SDLNameOperationName:SDLNameOnCommand}} mutableCopy]; SDLOnCommand* testNotification = [[SDLOnCommand alloc] initWithDictionary:dict]; expect(testNotification.cmdID).to(equal(@5676544)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m index a66f0bd6d..b46e31ee6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_state:SDLDriverDistractionStateOn}, - NAMES_operation_name:NAMES_OnDriverDistraction}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameState:SDLDriverDistractionStateOn}, + SDLNameOperationName:SDLNameOnDriverDistraction}} mutableCopy]; SDLOnDriverDistraction* testNotification = [[SDLOnDriverDistraction alloc] initWithDictionary:dict]; expect(testNotification.state).to(equal(SDLDriverDistractionStateOn)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m index a8844e22a..3e4b8878f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m @@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_data:[@[@0] mutableCopy], - NAMES_URL:@"www.zombo.com", - NAMES_Timeout:@564}, - NAMES_operation_name:NAMES_OnEncodedSyncPData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameData:[@[@0] mutableCopy], + SDLNameURLUppercase:@"www.zombo.com", + SDLNameTimeoutCapitalized:@564}, + SDLNameOperationName:SDLNameOnEncodedSyncPData}} mutableCopy]; SDLOnEncodedSyncPData* testNotification = [[SDLOnEncodedSyncPData alloc] initWithDictionary:dict]; expect(testNotification.data).to(equal([@[@0] mutableCopy])); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m index fb7546c3f..5f442276e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m @@ -23,25 +23,25 @@ describe(@"Getter/Setter Tests", ^ { testNotification.hmiLevel = SDLHMILevelLimited; testNotification.audioStreamingState = SDLAudioStreamingStateAttenuated; - testNotification.systemContext = SDLSystemContextHmiObscured; + testNotification.systemContext = SDLSystemContextHMIObscured; expect(testNotification.hmiLevel).to(equal(SDLHMILevelLimited)); expect(testNotification.audioStreamingState).to(equal(SDLAudioStreamingStateAttenuated)); - expect(testNotification.systemContext).to(equal(SDLSystemContextHmiObscured)); + expect(testNotification.systemContext).to(equal(SDLSystemContextHMIObscured)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_hmiLevel:SDLHMILevelLimited, - NAMES_audioStreamingState:SDLAudioStreamingStateAttenuated, - NAMES_systemContext:SDLSystemContextHmiObscured}, - NAMES_operation_name:NAMES_OnHMIStatus}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameHMILevel:SDLHMILevelLimited, + SDLNameAudioStreamingState:SDLAudioStreamingStateAttenuated, + SDLNameSystemContext:SDLSystemContextHMIObscured}, + SDLNameOperationName:SDLNameOnHMIStatus}} mutableCopy]; SDLOnHMIStatus* testNotification = [[SDLOnHMIStatus alloc] initWithDictionary:dict]; expect(testNotification.hmiLevel).to(equal(SDLHMILevelLimited)); expect(testNotification.audioStreamingState).to(equal(SDLAudioStreamingStateAttenuated)); - expect(testNotification.systemContext).to(equal(SDLSystemContextHmiObscured)); + expect(testNotification.systemContext).to(equal(SDLSystemContextHMIObscured)); }); it(@"Should return nil if not set", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m index 308347c61..ea87449c6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_hashID:@"hash"}, - NAMES_operation_name:NAMES_OnHashChange}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameHashId:@"hash"}, + SDLNameOperationName:SDLNameOnHashChange}} mutableCopy]; SDLOnHashChange* testNotification = [[SDLOnHashChange alloc] initWithDictionary:dict]; expect(testNotification.hashID).to(equal(@"hash")); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m index c17c0c94c..c8b101f65 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m @@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_event:SDLKeyboardEventEntrySubmitted, - NAMES_data:@"qwertyg"}, - NAMES_operation_name:NAMES_OnKeyboardInput}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameEvent:SDLKeyboardEventEntrySubmitted, + SDLNameData:@"qwertyg"}, + SDLNameOperationName:SDLNameOnKeyboardInput}} mutableCopy]; SDLOnKeyboardInput* testNotification = [[SDLOnKeyboardInput alloc] initWithDictionary:dict]; expect(testNotification.event).to(equal(SDLKeyboardEventEntrySubmitted)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m index 3f2206917..6dfa256f6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m @@ -27,11 +27,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_language:SDLLanguageEsEs, - NAMES_hmiDisplayLanguage:SDLLanguageDeDe}, - NAMES_operation_name:NAMES_OnLanguageChange}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameLanguage:SDLLanguageEsEs, + SDLNameHMIDisplayLanguage:SDLLanguageDeDe}, + SDLNameOperationName:SDLNameOnLanguageChange}} mutableCopy]; SDLOnLanguageChange* testNotification = [[SDLOnLanguageChange alloc] initWithDictionary:dict]; expect(testNotification.language).to(equal(SDLLanguageEsEs)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m index 5a0383060..1cff1434c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m @@ -31,13 +31,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: @{@"driverdistractionstatus":@NO, @"userselected":@3, @"OnLockScreenStatus":SDLLockScreenStatusRequired, @"hmilevel":SDLHMILevelNone}, - NAMES_operation_name:@"OnLockScreenStatus"}} mutableCopy]; + SDLNameOperationName:@"OnLockScreenStatus"}} mutableCopy]; SDLOnLockScreenStatus* testNotification = [[SDLOnLockScreenStatus alloc] initWithDictionary:dict]; expect(testNotification.driverDistractionStatus).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m index 5a5d349cc..9ad2026de 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m @@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_permissionItem:[@[item] mutableCopy]}, - NAMES_operation_name:NAMES_OnPermissionsChange}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNamePermissionItem:[@[item] mutableCopy]}, + SDLNameOperationName:SDLNameOnPermissionsChange}} mutableCopy]; SDLOnPermissionsChange* testNotification = [[SDLOnPermissionsChange alloc] initWithDictionary:dict]; expect(testNotification.permissionItem).to(equal([@[item] mutableCopy])); @@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m index 34ac9af9e..ff7f95509 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_URL:@"https://www.youtube.com/watch?v=ygr5AHufBN4", - NAMES_Timeout:@8357}, - NAMES_operation_name:NAMES_OnSyncPData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameURLUppercase:@"https://www.youtube.com/watch?v=ygr5AHufBN4", + SDLNameTimeoutCapitalized:@8357}, + SDLNameOperationName:SDLNameOnSyncPData}} mutableCopy]; SDLOnSyncPData* testNotification = [[SDLOnSyncPData alloc] initWithDictionary:dict]; expect(testNotification.URL).to(equal(@"https://www.youtube.com/watch?v=ygr5AHufBN4")); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m index e993a074b..5812d489d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m @@ -23,34 +23,34 @@ describe(@"Getter/Setter Tests", ^ { testNotification.requestType = SDLRequestTypeFileResume; testNotification.url = [@[@"www.google.com"] mutableCopy]; testNotification.timeout = @52345; - testNotification.fileType = SDLFileTypeGraphicPng; + testNotification.fileType = SDLFileTypeGraphicPNG; testNotification.offset = @2532678684; testNotification.length = @50000000000; expect(testNotification.requestType).to(equal(SDLRequestTypeFileResume)); expect(testNotification.url).to(equal([@[@"www.google.com"] mutableCopy])); expect(testNotification.timeout).to(equal(@52345)); - expect(testNotification.fileType).to(equal(SDLFileTypeGraphicPng)); + expect(testNotification.fileType).to(equal(SDLFileTypeGraphicPNG)); expect(testNotification.offset).to(equal(@2532678684)); expect(testNotification.length).to(equal(@50000000000)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_requestType:SDLRequestTypeFileResume, - NAMES_url:[@[@"www.google.com"] mutableCopy], - NAMES_timeout:@52345, - NAMES_fileType:SDLFileTypeGraphicPng, - NAMES_offset:@2532678684, - NAMES_length:@50000000000}, - NAMES_operation_name:NAMES_OnSystemRequest}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameRequestType:SDLRequestTypeFileResume, + SDLNameURL:[@[@"www.google.com"] mutableCopy], + SDLNameTimeout:@52345, + SDLNameFileType:SDLFileTypeGraphicPNG, + SDLNameOffset:@2532678684, + SDLNameLength:@50000000000}, + SDLNameOperationName:SDLNameOnSystemRequest}} mutableCopy]; SDLOnSystemRequest* testNotification = [[SDLOnSystemRequest alloc] initWithDictionary:dict]; expect(testNotification.requestType).to(equal(SDLRequestTypeFileResume)); expect(testNotification.url).to(equal([@[@"www.google.com"] mutableCopy])); expect(testNotification.timeout).to(equal(@52345)); - expect(testNotification.fileType).to(equal(SDLFileTypeGraphicPng)); + expect(testNotification.fileType).to(equal(SDLFileTypeGraphicPNG)); expect(testNotification.offset).to(equal(@2532678684)); expect(testNotification.length).to(equal(@50000000000)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m index 78805a437..70ed4648b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m @@ -19,19 +19,19 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { SDLOnTBTClientState* testNotification = [[SDLOnTBTClientState alloc] init]; - testNotification.state = SDLTBTStateEtaRequest; + testNotification.state = SDLTBTStateETARequest; - expect(testNotification.state).to(equal(SDLTBTStateEtaRequest)); + expect(testNotification.state).to(equal(SDLTBTStateETARequest)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_state:SDLTBTStateEtaRequest}, - NAMES_operation_name:NAMES_OnTBTClientState}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameState:SDLTBTStateETARequest}, + SDLNameOperationName:SDLNameOnTBTClientState}} mutableCopy]; SDLOnTBTClientState* testNotification = [[SDLOnTBTClientState alloc] initWithDictionary:dict]; - expect(testNotification.state).to(equal(SDLTBTStateEtaRequest)); + expect(testNotification.state).to(equal(SDLTBTStateETARequest)); }); it(@"Should return nil if not set", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m index daf236beb..930ed95f8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m @@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_type:SDLTouchTypeBegin, - NAMES_event:[@[event] mutableCopy]}, - NAMES_operation_name:NAMES_OnTouchEvent}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameType:SDLTouchTypeBegin, + SDLNameEvent:[@[event] mutableCopy]}, + SDLNameOperationName:SDLNameOnTouchEvent}} mutableCopy]; SDLOnTouchEvent* testNotification = [[SDLOnTouchEvent alloc] initWithDictionary:dict]; expect(testNotification.type).to(equal(SDLTouchTypeBegin)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m index 0d4219739..81d5a1a57 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -84,34 +84,34 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_gps:gps, - NAMES_speed:@70.1, - NAMES_rpm:@4242, - NAMES_fuelLevel:@10.3, - NAMES_fuelLevel_State:SDLComponentVolumeStatusAlert, - NAMES_instantFuelConsumption:@4000.63, - NAMES_externalTemperature:@-10, - NAMES_vin:@"222222222722", - NAMES_prndl:SDLPRNDLDrive, - NAMES_tirePressure:tires, - NAMES_odometer:@100050, - NAMES_beltStatus:belt, - NAMES_bodyInformation:body, - NAMES_deviceStatus:device, - NAMES_driverBraking:SDLVehicleDataEventStatusYes, - NAMES_wiperStatus:SDLWiperStatusStalled, - NAMES_headLampStatus:headLamp, - NAMES_engineTorque:@-200.124, - NAMES_accPedalPosition:@99.99999999, - NAMES_steeringWheelAngle:@0.000000001, - NAMES_eCallInfo:eCall, - NAMES_airbagStatus:airbag, - NAMES_emergencyEvent:event, - NAMES_clusterModeStatus:clusterMode, - NAMES_myKey:myKey}, - NAMES_operation_name:NAMES_OnVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameGPS:gps, + SDLNameSpeed:@70.1, + SDLNameRPM:@4242, + SDLNameFuelLevel:@10.3, + SDLNameFuelLevelState:SDLComponentVolumeStatusAlert, + SDLNameInstantFuelConsumption:@4000.63, + SDLNameExternalTemperature:@-10, + SDLNameVIN:@"222222222722", + SDLNamePRNDL:SDLPRNDLDrive, + SDLNameTirePressure:tires, + SDLNameOdometer:@100050, + SDLNameBeltStatus:belt, + SDLNameBodyInformation:body, + SDLNameDeviceStatus:device, + SDLNameDriverBraking:SDLVehicleDataEventStatusYes, + SDLNameWiperStatus:SDLWiperStatusStalled, + SDLNameHeadLampStatus:headLamp, + SDLNameEngineTorque:@-200.124, + SDLNameAccelerationPedalPosition:@99.99999999, + SDLNameSteeringWheelAngle:@0.000000001, + SDLNameECallInfo:eCall, + SDLNameAirbagStatus:airbag, + SDLNameEmergencyEvent:event, + SDLNameClusterModeStatus:clusterMode, + SDLNameMyKey:myKey}, + SDLNameOperationName:SDLNameOnVehicleData}} mutableCopy]; SDLOnVehicleData* testNotification = [[SDLOnVehicleData alloc] initWithDictionary:dict]; expect(testNotification.gps).to(equal(gps)); diff --git a/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m b/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m index bab540151..f0632eb87 100644 --- a/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m @@ -15,9 +15,9 @@ QuickSpecBegin(SDLRPCPayloadSpec) __block SDLRPCPayload* testPayload; -__block NSDictionary* dict = @{NAMES_response: - @{NAMES_parameters:@{}, - NAMES_operation_name:NAMES_DeleteCommand}}; +__block NSDictionary* dict = @{SDLNameResponse: + @{SDLNameParameters:@{}, + SDLNameOperationName:SDLNameDeleteCommand}}; NSData* (^testData)() = ^NSData* { NSData* jsonData = [NSJSONSerialization dataWithJSONObject:dict options:0 error:0]; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m index 455552bad..5e6385cee 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m @@ -34,13 +34,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_cmdID:@434577, - NAMES_menuParams:menu, - NAMES_vrCommands:[@[@"name", @"anotherName"] mutableCopy], - NAMES_cmdIcon:image}, - NAMES_operation_name:NAMES_AddCommand}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameCommandId:@434577, + SDLNameMenuParams:menu, + SDLNameVRCommands:[@[@"name", @"anotherName"] mutableCopy], + SDLNameCommandIcon:image}, + SDLNameOperationName:SDLNameAddCommand}} mutableCopy]; SDLAddCommand* testRequest = [[SDLAddCommand alloc] initWithDictionary:dict]; expect(testRequest.cmdID).to(equal(@434577)); @@ -59,4 +59,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m index 04a6526a8..890049e5f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m @@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_menuID:@4345645, - NAMES_position:@27, - NAMES_menuName:@"Welcome to the menu"}, - NAMES_operation_name:NAMES_AddSubMenu}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameMenuId:@4345645, + SDLNamePosition:@27, + SDLNameMenuName:@"Welcome to the menu"}, + SDLNameOperationName:SDLNameAddSubMenu}} mutableCopy]; SDLAddSubMenu* testRequest = [[SDLAddSubMenu alloc] initWithDictionary:dict]; expect(testRequest.menuID).to(equal(@4345645)); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m index 16d5aa0e6..48091794e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m @@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_ttsChunks:[@[tts] mutableCopy], - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_AlertManeuver}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTTSChunks:[@[tts] mutableCopy], + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameAlertManeuver}} mutableCopy]; SDLAlertManeuver* testRequest = [[SDLAlertManeuver alloc] initWithDictionary:dict]; expect(testRequest.ttsChunks).to(equal([@[tts] mutableCopy])); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m index b5725e168..158557002 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m @@ -42,17 +42,17 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_alertText1:@"alert#1", - NAMES_alertText2:@"alert#2", - NAMES_alertText3:@"alert#3", - NAMES_ttsChunks:[@[tts] mutableCopy], - NAMES_duration:@4357, - NAMES_playTone:@YES, - NAMES_progressIndicator:@NO, - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_Alert}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameAlertText1:@"alert#1", + SDLNameAlertText2:@"alert#2", + SDLNameAlertText3:@"alert#3", + SDLNameTTSChunks:[@[tts] mutableCopy], + SDLNameDuration:@4357, + SDLNamePlayTone:@YES, + SDLNameProgressIndicator:@NO, + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameAlert}} mutableCopy]; SDLAlert* testRequest = [[SDLAlert alloc] initWithDictionary:dict]; expect(testRequest.alertText1).to(equal(@"alert#1")); @@ -79,4 +79,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m index ff4bcc379..a7f73c8a1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m @@ -112,15 +112,15 @@ describe(@"change registration", ^ { someNGNMediaAppName = @"some media app name"; someVRSynonyms = @[@"some1", @"some2"]; - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_language:someLanguage, - NAMES_hmiDisplayLanguage:someOtherLanguage, - NAMES_appName:someAppName, - NAMES_ttsName:someTTSChunks, - NAMES_ngnMediaScreenAppName:someNGNMediaAppName, - NAMES_vrSynonyms:someVRSynonyms}, - NAMES_operation_name:NAMES_ChangeRegistration}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameLanguage:someLanguage, + SDLNameHMIDisplayLanguage:someOtherLanguage, + SDLNameAppName:someAppName, + SDLNameTTSName:someTTSChunks, + SDLNameNGNMediaScreenAppName:someNGNMediaAppName, + SDLNameVRSynonyms:someVRSynonyms}, + SDLNameOperationName:SDLNameChangeRegistration}} mutableCopy]; testRequest = [[SDLChangeRegistration alloc] initWithDictionary:dict]; }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m index 39cadb2d6..017b123f5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m @@ -28,11 +28,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_interactionChoiceSetID:@141414, - NAMES_choiceSet:[@[choice] mutableCopy]}, - NAMES_operation_name:NAMES_CreateInteractionChoiceSet}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameInteractionChoiceSetId:@141414, + SDLNameChoiceSet:[@[choice] mutableCopy]}, + SDLNameOperationName:SDLNameCreateInteractionChoiceSet}} mutableCopy]; SDLCreateInteractionChoiceSet* testRequest = [[SDLCreateInteractionChoiceSet alloc] initWithDictionary:dict]; expect(testRequest.interactionChoiceSetID).to(equal(@141414)); @@ -47,4 +47,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m index 2d0be62d8..89ed13257 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_cmdID:@11223344}, - NAMES_operation_name:NAMES_DeleteCommand}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameCommandId:@11223344}, + SDLNameOperationName:SDLNameDeleteCommand}} mutableCopy]; SDLDeleteCommand* testRequest = [[SDLDeleteCommand alloc] initWithDictionary:dict]; expect(testRequest.cmdID).to(equal(@11223344)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m index c6e471fc4..5946c7ec0 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncFileName:@"synchro"}, - NAMES_operation_name:NAMES_DeleteFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncFileName:@"synchro"}, + SDLNameOperationName:SDLNameDeleteFile}} mutableCopy]; SDLDeleteFile* testRequest = [[SDLDeleteFile alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"synchro")); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m index 6d42d114f..540c08cb4 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_interactionChoiceSetID:@20314}, - NAMES_operation_name:NAMES_DeleteInteractionChoiceSet}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameInteractionChoiceSetId:@20314}, + SDLNameOperationName:SDLNameDeleteInteractionChoiceSet}} mutableCopy]; SDLDeleteInteractionChoiceSet* testRequest = [[SDLDeleteInteractionChoiceSet alloc] initWithDictionary:dict]; expect(testRequest.interactionChoiceSetID).to(equal(@20314)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m index 9b2d6588d..3185391ec 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_menuID:@25614}, - NAMES_operation_name:NAMES_DeleteSubMenu}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameMenuId:@25614}, + SDLNameOperationName:SDLNameDeleteSubMenu}} mutableCopy]; SDLDeleteSubMenu* testRequest = [[SDLDeleteSubMenu alloc] initWithDictionary:dict]; expect(testRequest.menuID).to(equal(@25614)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m index 965920f39..fd25fd099 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m @@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_targetID:@3562, - NAMES_messageLength:@55555, - NAMES_messageData:[@[@1, @4, @16, @64] mutableCopy]}, - NAMES_operation_name:NAMES_DiagnosticMessage}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTargetId:@3562, + SDLNameMessageLength:@55555, + SDLNameMessageData:[@[@1, @4, @16, @64] mutableCopy]}, + SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy]; SDLDiagnosticMessage* testRequest = [[SDLDiagnosticMessage alloc] initWithDictionary:dict]; expect(testRequest.targetID).to(equal(@3562)); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m index 7371fedf3..a150144c1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m @@ -43,9 +43,9 @@ describe(@"Dial Number RPC", ^{ beforeEach(^{ somePhoneNumber = @"1234567890"; NSDictionary *initDict = @{ - NAMES_request: @{ - NAMES_parameters: @{ - NAMES_number: [somePhoneNumber copy] + SDLNameRequest: @{ + SDLNameParameters: @{ + SDLNameNumber: [somePhoneNumber copy] } } }; @@ -62,8 +62,8 @@ describe(@"Dial Number RPC", ^{ __block SDLDialNumber *testRequest = nil; beforeEach(^{ NSDictionary *initDict = @{ - NAMES_request: @{ - NAMES_parameters: @{ + SDLNameRequest: @{ + SDLNameParameters: @{ } } }; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m index 753608940..accdd94a6 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_data:[@[@2, @2, @2] mutableCopy]}, - NAMES_operation_name:NAMES_EncodedSyncPData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameData:[@[@2, @2, @2] mutableCopy]}, + SDLNameOperationName:SDLNameEncodedSyncPData}} mutableCopy]; SDLEncodedSyncPData* testRequest = [[SDLEncodedSyncPData alloc] initWithDictionary:dict]; expect(testRequest.data).to(equal([@[@2, @2, @2] mutableCopy])); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m index 87f84fd4d..0c4ca3af7 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_ecuName:@4321, - NAMES_dtcMask:@22}, - NAMES_operation_name:NAMES_EndAudioPassThru}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameECUName:@4321, + SDLNameDTCMask:@22}, + SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy]; SDLGetDTCs* testRequest = [[SDLGetDTCs alloc] initWithDictionary:dict]; expect(testRequest.ecuName).to(equal(@4321)); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 936550ce7..7e45c4bd6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -71,34 +71,34 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_gps:@NO, - NAMES_speed:@YES, - NAMES_rpm:@NO, - NAMES_fuelLevel:@YES, - NAMES_fuelLevel_State:@NO, - NAMES_instantFuelConsumption:@YES, - NAMES_externalTemperature:@NO, - NAMES_vin:@YES, - NAMES_prndl:@NO, - NAMES_tirePressure:@YES, - NAMES_odometer:@NO, - NAMES_beltStatus:@YES, - NAMES_bodyInformation:@NO, - NAMES_deviceStatus:@YES, - NAMES_driverBraking:@NO, - NAMES_wiperStatus:@YES, - NAMES_headLampStatus:@NO, - NAMES_engineTorque:@YES, - NAMES_accPedalPosition:@NO, - NAMES_steeringWheelAngle:@YES, - NAMES_eCallInfo:@NO, - NAMES_airbagStatus:@YES, - NAMES_emergencyEvent:@NO, - NAMES_clusterModeStatus:@YES, - NAMES_myKey:@NO}, - NAMES_operation_name:NAMES_GetVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameGPS:@NO, + SDLNameSpeed:@YES, + SDLNameRPM:@NO, + SDLNameFuelLevel:@YES, + SDLNameFuelLevelState:@NO, + SDLNameInstantFuelConsumption:@YES, + SDLNameExternalTemperature:@NO, + SDLNameVIN:@YES, + SDLNamePRNDL:@NO, + SDLNameTirePressure:@YES, + SDLNameOdometer:@NO, + SDLNameBeltStatus:@YES, + SDLNameBodyInformation:@NO, + SDLNameDeviceStatus:@YES, + SDLNameDriverBraking:@NO, + SDLNameWiperStatus:@YES, + SDLNameHeadLampStatus:@NO, + SDLNameEngineTorque:@YES, + SDLNameAccelerationPedalPosition:@NO, + SDLNameSteeringWheelAngle:@YES, + SDLNameECallInfo:@NO, + SDLNameAirbagStatus:@YES, + SDLNameEmergencyEvent:@NO, + SDLNameClusterModeStatus:@YES, + SDLNameMyKey:@NO}, + SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy]; SDLGetVehicleData* testRequest = [[SDLGetVehicleData alloc] initWithDictionary:dict]; expect(testRequest.gps).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m index 50de2bf85..e55cf86be 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m @@ -23,40 +23,40 @@ describe(@"Getter/Setter Tests", ^ { testRequest.audioPassThruDisplayText1 = @"passthru#1"; testRequest.audioPassThruDisplayText2 = @"passthru#2"; - testRequest.samplingRate = SDLSamplingRate22Khz; + testRequest.samplingRate = SDLSamplingRate22KHZ; testRequest.maxDuration = @34563; testRequest.bitsPerSample = SDLBitsPerSample16Bit; - testRequest.audioType = SDLAudioTypePcm; + testRequest.audioType = SDLAudioTypePCM; testRequest.muteAudio = @NO; expect(testRequest.audioPassThruDisplayText1).to(equal(@"passthru#1")); expect(testRequest.audioPassThruDisplayText2).to(equal(@"passthru#2")); - expect(testRequest.samplingRate).to(equal(SDLSamplingRate22Khz)); + expect(testRequest.samplingRate).to(equal(SDLSamplingRate22KHZ)); expect(testRequest.maxDuration).to(equal(@34563)); expect(testRequest.bitsPerSample).to(equal(SDLBitsPerSample16Bit)); - expect(testRequest.audioType).to(equal(SDLAudioTypePcm)); + expect(testRequest.audioType).to(equal(SDLAudioTypePCM)); expect(testRequest.muteAudio).to(equal(@NO)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_audioPassThruDisplayText1:@"passthru#1", - NAMES_audioPassThruDisplayText2:@"passthru#2", - NAMES_samplingRate:SDLSamplingRate22Khz, - NAMES_maxDuration:@34563, - NAMES_bitsPerSample:SDLBitsPerSample16Bit, - NAMES_audioType:SDLAudioTypePcm, - NAMES_muteAudio:@NO}, - NAMES_operation_name:NAMES_PerformAudioPassThru}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameAudioPassThruDisplayText1:@"passthru#1", + SDLNameAudioPassThruDisplayText2:@"passthru#2", + SDLNameSamplingRate:SDLSamplingRate22KHZ, + SDLNameMaxDuration:@34563, + SDLNameBitsPerSample:SDLBitsPerSample16Bit, + SDLNameAudioType:SDLAudioTypePCM, + SDLNameMuteAudio:@NO}, + SDLNameOperationName:SDLNamePerformAudioPassThru}} mutableCopy]; SDLPerformAudioPassThru* testRequest = [[SDLPerformAudioPassThru alloc] initWithDictionary:dict]; expect(testRequest.audioPassThruDisplayText1).to(equal(@"passthru#1")); expect(testRequest.audioPassThruDisplayText2).to(equal(@"passthru#2")); - expect(testRequest.samplingRate).to(equal(SDLSamplingRate22Khz)); + expect(testRequest.samplingRate).to(equal(SDLSamplingRate22KHZ)); expect(testRequest.maxDuration).to(equal(@34563)); expect(testRequest.bitsPerSample).to(equal(SDLBitsPerSample16Bit)); - expect(testRequest.audioType).to(equal(SDLAudioTypePcm)); + expect(testRequest.audioType).to(equal(SDLAudioTypePCM)); expect(testRequest.muteAudio).to(equal(@NO)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m index e36842fc9..a5bed69ae 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m @@ -28,7 +28,7 @@ describe(@"Getter/Setter Tests", ^ { testRequest.initialText = @"a"; testRequest.initialPrompt = [@[chunk1] mutableCopy]; - testRequest.interactionMode = SDLInteractionModeVrOnly; + testRequest.interactionMode = SDLInteractionModeVROnly; testRequest.interactionChoiceSetIDList = [@[@1, @2, @3] mutableCopy]; testRequest.helpPrompt = [@[chunk2] mutableCopy]; testRequest.timeoutPrompt = [@[chunk3] mutableCopy]; @@ -38,7 +38,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.initialText).to(equal(@"a")); expect(testRequest.initialPrompt).to(equal([@[chunk1] mutableCopy])); - expect(testRequest.interactionMode).to(equal(SDLInteractionModeVrOnly)); + expect(testRequest.interactionMode).to(equal(SDLInteractionModeVROnly)); expect(testRequest.interactionChoiceSetIDList).to(equal([@[@1, @2, @3] mutableCopy])); expect(testRequest.helpPrompt).to(equal([@[chunk2] mutableCopy])); expect(testRequest.timeoutPrompt).to(equal([@[chunk3] mutableCopy])); @@ -48,23 +48,23 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_initialText:@"a", - NAMES_initialPrompt:[@[chunk1] mutableCopy], - NAMES_interactionMode:SDLInteractionModeVrOnly, - NAMES_interactionChoiceSetIDList:[@[@1, @2, @3] mutableCopy], - NAMES_helpPrompt:[@[chunk2] mutableCopy], - NAMES_timeoutPrompt:[@[chunk3] mutableCopy], - NAMES_timeout:@42000, - NAMES_vrHelp:[@[helpItem] mutableCopy], - NAMES_interactionLayout:SDLLayoutModeIconWithSearch}, - NAMES_operation_name:NAMES_PerformInteraction}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameInitialText:@"a", + SDLNameInitialPrompt:[@[chunk1] mutableCopy], + SDLNameInteractionMode:SDLInteractionModeVROnly, + SDLNameInteractionChoiceSetIdList:[@[@1, @2, @3] mutableCopy], + SDLNameHelpPrompt:[@[chunk2] mutableCopy], + SDLNameTimeoutPrompt:[@[chunk3] mutableCopy], + SDLNameTimeout:@42000, + SDLNameVRHelp:[@[helpItem] mutableCopy], + SDLNameInteractionLayout:SDLLayoutModeIconWithSearch}, + SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy]; SDLPerformInteraction* testRequest = [[SDLPerformInteraction alloc] initWithDictionary:dict]; expect(testRequest.initialText).to(equal(@"a")); expect(testRequest.initialPrompt).to(equal([@[chunk1] mutableCopy])); - expect(testRequest.interactionMode).to(equal(SDLInteractionModeVrOnly)); + expect(testRequest.interactionMode).to(equal(SDLInteractionModeVROnly)); expect(testRequest.interactionChoiceSetIDList).to(equal([@[@1, @2, @3] mutableCopy])); expect(testRequest.helpPrompt).to(equal([@[chunk2] mutableCopy])); expect(testRequest.timeoutPrompt).to(equal([@[chunk3] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m index 02f5a1db2..3e3bed897 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m @@ -20,14 +20,14 @@ describe(@"Getter/Setter Tests", ^ { SDLPutFile* testRequest = [[SDLPutFile alloc] init]; testRequest.syncFileName = @"fileName"; - testRequest.fileType = SDLFileTypeGraphicJpeg; + testRequest.fileType = SDLFileTypeGraphicJPEG; testRequest.persistentFile = @YES; testRequest.systemFile = @NO; testRequest.offset = @987654321; testRequest.length = @123456789; expect(testRequest.syncFileName).to(equal(@"fileName")); - expect(testRequest.fileType).to(equal(SDLFileTypeGraphicJpeg)); + expect(testRequest.fileType).to(equal(SDLFileTypeGraphicJPEG)); expect(testRequest.persistentFile).to(equal(@YES)); expect(testRequest.systemFile).to(equal(@NO)); expect(testRequest.offset).to(equal(@987654321)); @@ -35,19 +35,19 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncFileName:@"fileName", - NAMES_fileType:SDLFileTypeGraphicJpeg, - NAMES_persistentFile:@YES, - NAMES_systemFile:@NO, - NAMES_offset:@987654321, - NAMES_length:@123456789}, - NAMES_operation_name:NAMES_PutFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncFileName:@"fileName", + SDLNameFileType:SDLFileTypeGraphicJPEG, + SDLNamePersistentFile:@YES, + SDLNameSystemFile:@NO, + SDLNameOffset:@987654321, + SDLNameLength:@123456789}, + SDLNameOperationName:SDLNamePutFile}} mutableCopy]; SDLPutFile* testRequest = [[SDLPutFile alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"fileName")); - expect(testRequest.fileType).to(equal(SDLFileTypeGraphicJpeg)); + expect(testRequest.fileType).to(equal(SDLFileTypeGraphicJPEG)); expect(testRequest.persistentFile).to(equal(@YES)); expect(testRequest.systemFile).to(equal(@NO)); expect(testRequest.offset).to(equal(@987654321)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m index 7c5598bbb..31b65061f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_ecuName:@33112, - NAMES_didLocation:[@[@200, @201, @205] mutableCopy]}, - NAMES_operation_name:NAMES_EndAudioPassThru}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameECUName:@33112, + SDLNameDIDLocation:[@[@200, @201, @205] mutableCopy]}, + SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy]; SDLReadDID* testRequest = [[SDLReadDID alloc] initWithDictionary:dict]; expect(testRequest.ecuName).to(equal(@33112)); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m index d4b88cf2b..b3e926715 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m @@ -59,22 +59,22 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncMsgVersion:version, - NAMES_appName:@"app56", - NAMES_ttsName:[@[chunk] mutableCopy], - NAMES_ngnMediaScreenAppName:@"whatisanngn", - NAMES_vrSynonyms:[@[@"paraphrase of the original name"] mutableCopy], - NAMES_isMediaApplication:@NO, - NAMES_languageDesired:SDLLanguageNoNo, - NAMES_hmiDisplayLanguageDesired:SDLLanguagePtPt, - NAMES_appHMIType:[@[SDLAppHMITypeMessaging, SDLAppHMITypeInformation] copy], - NAMES_hashID:@"gercd35grw2", - NAMES_deviceInfo:info, - NAMES_appID:@"123456789", - NAMES_appInfo:appInfo}, - NAMES_operation_name:NAMES_RegisterAppInterface}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncMessageVersion:version, + SDLNameAppName:@"app56", + SDLNameTTSName:[@[chunk] mutableCopy], + SDLNameNGNMediaScreenAppName:@"whatisanngn", + SDLNameVRSynonyms:[@[@"paraphrase of the original name"] mutableCopy], + SDLNameIsMediaApplication:@NO, + SDLNameLanguageDesired:SDLLanguageNoNo, + SDLNameHMIDisplayLanguageDesired:SDLLanguagePtPt, + SDLNameAppHMIType:[@[SDLAppHMITypeMessaging, SDLAppHMITypeInformation] copy], + SDLNameHashId:@"gercd35grw2", + SDLNameDeviceInfo:info, + SDLNameAppId:@"123456789", + SDLNameAppInfo:appInfo}, + SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy]; SDLRegisterAppInterface* testRequest = [[SDLRegisterAppInterface alloc] initWithDictionary:dict]; expect(testRequest.syncMsgVersion).to(equal(version)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m index a71b8c4b1..6f9b03c44 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m @@ -18,19 +18,19 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { SDLResetGlobalProperties* testRequest = [[SDLResetGlobalProperties alloc] init]; - testRequest.properties = [@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVrHelpTitle] copy]; + testRequest.properties = [@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVRHelpTitle] copy]; - expect(testRequest.properties).to(equal([@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVrHelpTitle] copy])); + expect(testRequest.properties).to(equal([@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVRHelpTitle] copy])); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_properties:[@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVrHelpTitle] copy]}, - NAMES_operation_name:NAMES_ResetGlobalProperties}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameProperties:[@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVRHelpTitle] copy]}, + SDLNameOperationName:SDLNameResetGlobalProperties}} mutableCopy]; SDLResetGlobalProperties* testRequest = [[SDLResetGlobalProperties alloc] initWithDictionary:dict]; - expect(testRequest.properties).to(equal([@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVrHelpTitle] copy])); + expect(testRequest.properties).to(equal([@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVRHelpTitle] copy])); }); it(@"Should return nil if not set", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m index 6b1142d6b..0787d4e34 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m @@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_scrollableMessageBody:@"thatmessagebody", - NAMES_timeout:@9182, - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_ScrollableMessage}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameScrollableMessageBody:@"thatmessagebody", + SDLNameTimeout:@9182, + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameScrollableMessage}} mutableCopy]; SDLScrollableMessage* testRequest = [[SDLScrollableMessage alloc] initWithDictionary:dict]; expect(testRequest.scrollableMessageBody).to(equal(@"thatmessagebody")); @@ -52,4 +52,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m index ccd4bafdb..c1532a4ec 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m @@ -124,15 +124,15 @@ describe(@"Send Location RPC", ^{ somePhoneNumber = @"248-591-0333"; someImage = [[SDLImage alloc] init]; NSDictionary *initDict = @{ - NAMES_request: @{ - NAMES_parameters: @{ - NAMES_longitudeDegrees: someLongitude, - NAMES_latitudeDegrees: someLatitude, - NAMES_locationName: someLocation, - NAMES_locationDescription: someLocationDescription, - NAMES_addressLines: someAddressLines, - NAMES_phoneNumber: somePhoneNumber, - NAMES_locationImage: someImage + SDLNameRequest: @{ + SDLNameParameters: @{ + SDLNameLongitudeDegrees: someLongitude, + SDLNameLatitudeDegrees: someLatitude, + SDLNameLocationName: someLocation, + SDLNameLocationDescription: someLocationDescription, + SDLNameAddressLines: someAddressLines, + SDLNamePhoneNumber: somePhoneNumber, + SDLNameLocationImage: someImage } } }; @@ -180,8 +180,8 @@ describe(@"Send Location RPC", ^{ context(@"when parameters are not set", ^{ beforeEach(^{ NSDictionary *initDict = @{ - NAMES_request: @{ - NAMES_parameters: @{} + SDLNameRequest: @{ + SDLNameParameters: @{} } }; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m index 9c24c9e91..af6e55771 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncFileName:@"A/File/Name"}, - NAMES_operation_name:NAMES_SetAppIcon}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncFileName:@"A/File/Name"}, + SDLNameOperationName:SDLNameSetAppIcon}} mutableCopy]; SDLSetAppIcon* testRequest = [[SDLSetAppIcon alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"A/File/Name")); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m index 41e63323a..74684e7a7 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_displayLayout:@"wat"}, - NAMES_operation_name:NAMES_SetDisplayLayout}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameDisplayLayout:@"wat"}, + SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy]; SDLSetDisplayLayout* testRequest = [[SDLSetDisplayLayout alloc] initWithDictionary:dict]; expect(testRequest.displayLayout).to(equal(@"wat")); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m index 437218896..b5228cc0a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m @@ -46,16 +46,16 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_helpPrompt:[@[chunk1] mutableCopy], - NAMES_timeoutPrompt:[@[chunk2] mutableCopy], - NAMES_vrHelpTitle:@"vr", - NAMES_vrHelp:[@[help] mutableCopy], - NAMES_menuTitle:@"TheNewMenu", - NAMES_menuIcon:image, - NAMES_keyboardProperties:keyboard}, - NAMES_operation_name:NAMES_SetGlobalProperties}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameHelpPrompt:[@[chunk1] mutableCopy], + SDLNameTimeoutPrompt:[@[chunk2] mutableCopy], + SDLNameVRHelpTitle:@"vr", + SDLNameVRHelp:[@[help] mutableCopy], + SDLNameMenuTitle:@"TheNewMenu", + SDLNameMenuIcon:image, + SDLNameKeyboardProperties:keyboard}, + SDLNameOperationName:SDLNameSetGlobalProperties}} mutableCopy]; SDLSetGlobalProperties* testRequest = [[SDLSetGlobalProperties alloc] initWithDictionary:dict]; expect(testRequest.helpPrompt).to(equal([@[chunk1] mutableCopy])); @@ -80,4 +80,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m index 46a278124..bf8243ab8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m @@ -33,12 +33,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_startTime:time1, - NAMES_endTime:time2, - NAMES_updateMode:SDLUpdateModeCountUp}, - NAMES_operation_name:NAMES_SetMediaClockTimer}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameStartTime:time1, + SDLNameEndTime:time2, + SDLNameUpdateMode:SDLUpdateModeCountUp}, + SDLNameOperationName:SDLNameSetMediaClockTimer}} mutableCopy]; SDLSetMediaClockTimer* testRequest = [[SDLSetMediaClockTimer alloc] initWithDictionary:dict]; expect(testRequest.startTime).to(equal(time1)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m index 3af100462..8b8c0928b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m @@ -50,20 +50,20 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_navigationText1:@"nav1", - NAMES_navigationText2:@"nav2", - NAMES_eta:@"4/1/7015", - NAMES_timeToDestination:@"5000 Years", - NAMES_totalDistance:@"1 parsec", - NAMES_turnIcon:image1, - NAMES_nextTurnIcon:image2, - NAMES_distanceToManeuver:@2, - NAMES_distanceToManeuverScale:@4, - NAMES_maneuverComplete:@NO, - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_ShowConstantTBT}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameNavigationText1:@"nav1", + SDLNameNavigationText2:@"nav2", + SDLNameETA:@"4/1/7015", + SDLNameTimeToDestination:@"5000 Years", + SDLNameTotalDistance:@"1 parsec", + SDLNameTurnIcon:image1, + SDLNameNextTurnIcon:image2, + SDLNameDistanceToManeuver:@2, + SDLNameDistanceToManeuverScale:@4, + SDLNameManeuverComplete:@NO, + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameShowConstantTBT}} mutableCopy]; SDLShowConstantTBT* testRequest = [[SDLShowConstantTBT alloc] initWithDictionary:dict]; expect(testRequest.navigationText1).to(equal(@"nav1")); @@ -96,4 +96,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m index fb2a91e86..1c4796bff 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m @@ -53,21 +53,21 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_mainField1:@"field1", - NAMES_mainField2:@"field2", - NAMES_mainField3:@"field3", - NAMES_mainField4:@"field4", - NAMES_alignment:SDLTextAlignmentLeftAligned, - NAMES_statusBar:@"status", - NAMES_mediaClock:@"TheTime", - NAMES_mediaTrack:@"In The Clear", - NAMES_graphic:image1, - NAMES_secondaryGraphic:image2, - NAMES_softButtons:[@[button] mutableCopy], - NAMES_customPresets:[@[@"preset1", @"preset2"] mutableCopy]}, - NAMES_operation_name:NAMES_Show}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameMainField1:@"field1", + SDLNameMainField2:@"field2", + SDLNameMainField3:@"field3", + SDLNameMainField4:@"field4", + SDLNameAlignment:SDLTextAlignmentLeftAligned, + SDLNameStatusBar:@"status", + SDLNameMediaClock:@"TheTime", + SDLNameMediaTrack:@"In The Clear", + SDLNameGraphic:image1, + SDLNameSecondaryGraphic:image2, + SDLNameSoftButtons:[@[button] mutableCopy], + SDLNameCustomPresets:[@[@"preset1", @"preset2"] mutableCopy]}, + SDLNameOperationName:SDLNameShow}} mutableCopy]; SDLShow* testRequest = [[SDLShow alloc] initWithDictionary:dict]; expect(testRequest.mainField1).to(equal(@"field1")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m index 7455bcf51..e0e49ca3c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m @@ -31,14 +31,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_numTicks:@2, - NAMES_position:@1, - NAMES_sliderHeader:@"Head", - NAMES_sliderFooter:[@[@"LeftFoot", @"RightFoot"] mutableCopy], - NAMES_timeout:@2000}, - NAMES_operation_name:NAMES_Slider}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameNumberTicks:@2, + SDLNamePosition:@1, + SDLNameSliderHeader:@"Head", + SDLNameSliderFooter:[@[@"LeftFoot", @"RightFoot"] mutableCopy], + SDLNameTimeout:@2000}, + SDLNameOperationName:SDLNameSlider}} mutableCopy]; SDLSlider* testRequest = [[SDLSlider alloc] initWithDictionary:dict]; expect(testRequest.numTicks).to(equal(@2)); @@ -59,4 +59,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m index dd6b6a400..7781f4458 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m @@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_ttsChunks:[@[chunk] mutableCopy]}, - NAMES_operation_name:NAMES_Speak}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTTSChunks:[@[chunk] mutableCopy]}, + SDLNameOperationName:SDLNameSpeak}} mutableCopy]; SDLSpeak* testRequest = [[SDLSpeak alloc] initWithDictionary:dict]; expect(testRequest.ttsChunks).to(equal([@[chunk] mutableCopy])); @@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m index 0b4d8d591..c541ccc40 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m @@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_buttonName:SDLButtonNamePreset5}, - NAMES_operation_name:NAMES_SubscribeButton}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameButtonName:SDLButtonNamePreset5}, + SDLNameOperationName:SDLNameSubscribeButton}} mutableCopy]; SDLSubscribeButton* testRequest = [[SDLSubscribeButton alloc] initWithDictionary:dict]; expect(testRequest.buttonName).to(equal(SDLButtonNamePreset5)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index c35d45db3..25af6ca52 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -69,33 +69,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_gps:@YES, - NAMES_speed:@NO, - NAMES_rpm:@YES, - NAMES_fuelLevel:@NO, - NAMES_fuelLevel_State:@YES, - NAMES_instantFuelConsumption:@NO, - NAMES_externalTemperature:@YES, - NAMES_prndl:@YES, - NAMES_tirePressure:@NO, - NAMES_odometer:@YES, - NAMES_beltStatus:@NO, - NAMES_bodyInformation:@YES, - NAMES_deviceStatus:@NO, - NAMES_driverBraking:@YES, - NAMES_wiperStatus:@NO, - NAMES_headLampStatus:@YES, - NAMES_engineTorque:@NO, - NAMES_accPedalPosition:@YES, - NAMES_steeringWheelAngle:@NO, - NAMES_eCallInfo:@YES, - NAMES_airbagStatus:@NO, - NAMES_emergencyEvent:@YES, - NAMES_clusterModeStatus:@NO, - NAMES_myKey:@YES}, - NAMES_operation_name:NAMES_SubscribeVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameGPS:@YES, + SDLNameSpeed:@NO, + SDLNameRPM:@YES, + SDLNameFuelLevel:@NO, + SDLNameFuelLevelState:@YES, + SDLNameInstantFuelConsumption:@NO, + SDLNameExternalTemperature:@YES, + SDLNamePRNDL:@YES, + SDLNameTirePressure:@NO, + SDLNameOdometer:@YES, + SDLNameBeltStatus:@NO, + SDLNameBodyInformation:@YES, + SDLNameDeviceStatus:@NO, + SDLNameDriverBraking:@YES, + SDLNameWiperStatus:@NO, + SDLNameHeadLampStatus:@YES, + SDLNameEngineTorque:@NO, + SDLNameAccelerationPedalPosition:@YES, + SDLNameSteeringWheelAngle:@NO, + SDLNameECallInfo:@YES, + SDLNameAirbagStatus:@NO, + SDLNameEmergencyEvent:@YES, + SDLNameClusterModeStatus:@NO, + SDLNameMyKey:@YES}, + SDLNameOperationName:SDLNameSubscribeVehicleData}} mutableCopy]; SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithDictionary:dict]; expect(testRequest.gps).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m index 4f7cb780c..d7ccade49 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m @@ -18,22 +18,22 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { SDLSystemRequest* testRequest = [[SDLSystemRequest alloc] init]; - testRequest.requestType = SDLRequestTypeAuthRequest; + testRequest.requestType = SDLRequestTypeAuthenticationRequest; testRequest.fileName = @"AnotherFile"; - expect(testRequest.requestType).to(equal(SDLRequestTypeAuthRequest)); + expect(testRequest.requestType).to(equal(SDLRequestTypeAuthenticationRequest)); expect(testRequest.fileName).to(equal(@"AnotherFile")); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_requestType:SDLRequestTypeAuthRequest, - NAMES_fileName:@"AnotherFile"}, - NAMES_operation_name:NAMES_SystemRequest}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameRequestType:SDLRequestTypeAuthenticationRequest, + SDLNameFilename:@"AnotherFile"}, + SDLNameOperationName:SDLNameSystemRequest}} mutableCopy]; SDLSystemRequest* testRequest = [[SDLSystemRequest alloc] initWithDictionary:dict]; - expect(testRequest.requestType).to(equal(SDLRequestTypeAuthRequest)); + expect(testRequest.requestType).to(equal(SDLRequestTypeAuthenticationRequest)); expect(testRequest.fileName).to(equal(@"AnotherFile")); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m index 701263d6c..e4d693685 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m @@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_buttonName:SDLButtonNamePreset0}, - NAMES_operation_name:NAMES_UnsubscribeButton}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameButtonName:SDLButtonNamePreset0}, + SDLNameOperationName:SDLNameUnsubscribeButton}} mutableCopy]; SDLUnsubscribeButton* testRequest = [[SDLUnsubscribeButton alloc] initWithDictionary:dict]; expect(testRequest.buttonName).to(equal(SDLButtonNamePreset0)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index 1bb2cb125..f4efec0fc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -69,33 +69,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_gps:@YES, - NAMES_speed:@YES, - NAMES_rpm:@YES, - NAMES_fuelLevel:@YES, - NAMES_fuelLevel_State:@YES, - NAMES_instantFuelConsumption:@YES, - NAMES_externalTemperature:@YES, - NAMES_prndl:@YES, - NAMES_tirePressure:@YES, - NAMES_odometer:@YES, - NAMES_beltStatus:@YES, - NAMES_bodyInformation:@YES, - NAMES_deviceStatus:@YES, - NAMES_driverBraking:@YES, - NAMES_wiperStatus:@YES, - NAMES_headLampStatus:@YES, - NAMES_engineTorque:@YES, - NAMES_accPedalPosition:@YES, - NAMES_steeringWheelAngle:@YES, - NAMES_eCallInfo:@YES, - NAMES_airbagStatus:@YES, - NAMES_emergencyEvent:@YES, - NAMES_clusterModeStatus:@YES, - NAMES_myKey:@YES}, - NAMES_operation_name:NAMES_UnsubscribeVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameGPS:@YES, + SDLNameSpeed:@YES, + SDLNameRPM:@YES, + SDLNameFuelLevel:@YES, + SDLNameFuelLevelState:@YES, + SDLNameInstantFuelConsumption:@YES, + SDLNameExternalTemperature:@YES, + SDLNamePRNDL:@YES, + SDLNameTirePressure:@YES, + SDLNameOdometer:@YES, + SDLNameBeltStatus:@YES, + SDLNameBodyInformation:@YES, + SDLNameDeviceStatus:@YES, + SDLNameDriverBraking:@YES, + SDLNameWiperStatus:@YES, + SDLNameHeadLampStatus:@YES, + SDLNameEngineTorque:@YES, + SDLNameAccelerationPedalPosition:@YES, + SDLNameSteeringWheelAngle:@YES, + SDLNameECallInfo:@YES, + SDLNameAirbagStatus:@YES, + SDLNameEmergencyEvent:@YES, + SDLNameClusterModeStatus:@YES, + SDLNameMyKey:@YES}, + SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy]; SDLUnsubscribeVehicleData* testRequest = [[SDLUnsubscribeVehicleData alloc] initWithDictionary:dict]; expect(testRequest.gps).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m index ae1d55823..4806ef21f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m @@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_turnList:[@[turn] mutableCopy], - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_UpdateTurnList}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTurnList:[@[turn] mutableCopy], + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameUpdateTurnList}} mutableCopy]; SDLUpdateTurnList* testRequest = [[SDLUpdateTurnList alloc] initWithDictionary:dict]; expect(testRequest.turnList).to(equal([@[turn] mutableCopy])); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m index 64e8522c9..a78d757c8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_spaceAvailable:@0}, - NAMES_operation_name:NAMES_DeleteFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameSpaceAvailable:@0}, + SDLNameOperationName:SDLNameDeleteFile}} mutableCopy]; SDLDeleteFileResponse* testResponse = [[SDLDeleteFileResponse alloc] initWithDictionary:dict]; expect(testResponse.spaceAvailable).to(equal(@0)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m index 7507bbe5a..b322f961d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_messageDataResult:[@[@3, @9, @27, @81] mutableCopy]}, - NAMES_operation_name:NAMES_DiagnosticMessage}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameMessageDataResult:[@[@3, @9, @27, @81] mutableCopy]}, + SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy]; SDLDiagnosticMessageResponse* testResponse = [[SDLDiagnosticMessageResponse alloc] initWithDictionary:dict]; expect(testResponse.messageDataResult).to(equal([@[@3, @9, @27, @81] mutableCopy])); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m index 150f9bd73..deb787b9a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_ecuHeader:@404, - NAMES_dtc:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]}, - NAMES_operation_name:NAMES_GetDTCs}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameECUHeader:@404, + SDLNameDTC:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]}, + SDLNameOperationName:SDLNameGetDTCs}} mutableCopy]; SDLGetDTCsResponse* testResponse = [[SDLGetDTCsResponse alloc] initWithDictionary:dict]; expect(testResponse.ecuHeader).to(equal(@404)); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index e9206bb9c..9831ec761 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -45,7 +45,7 @@ describe(@"Getter/Setter Tests", ^ { testResponse.bodyInformation = body; testResponse.deviceStatus = device; testResponse.driverBraking = SDLVehicleDataEventStatusNoEvent; - testResponse.wiperStatus = SDLWiperStatusAutoHigh; + testResponse.wiperStatus = SDLWiperStatusAutomaticHigh; testResponse.headLampStatus = headLamp; testResponse.engineTorque = @630.4; testResponse.accPedalPosition = @0; @@ -71,7 +71,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.bodyInformation).to(equal(body)); expect(testResponse.deviceStatus).to(equal(device)); expect(testResponse.driverBraking).to(equal(SDLVehicleDataEventStatusNoEvent)); - expect(testResponse.wiperStatus).to(equal(SDLWiperStatusAutoHigh)); + expect(testResponse.wiperStatus).to(equal(SDLWiperStatusAutomaticHigh)); expect(testResponse.headLampStatus).to(equal(headLamp)); expect(testResponse.engineTorque).to(equal(@630.4)); expect(testResponse.accPedalPosition).to(equal(@0)); @@ -84,34 +84,34 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_gps:gps, - NAMES_speed:@100, - NAMES_rpm:@3, - NAMES_fuelLevel:@99.9999, - NAMES_fuelLevel_State:SDLComponentVolumeStatusFault, - NAMES_instantFuelConsumption:@40.7, - NAMES_externalTemperature:@0, - NAMES_vin:@"6574839201", - NAMES_prndl:SDLPRNDLPark, - NAMES_tirePressure:tires, - NAMES_odometer:@70000, - NAMES_beltStatus:belt, - NAMES_bodyInformation:body, - NAMES_deviceStatus:device, - NAMES_driverBraking:SDLVehicleDataEventStatusNoEvent, - NAMES_wiperStatus:SDLWiperStatusAutoHigh, - NAMES_headLampStatus:headLamp, - NAMES_engineTorque:@630.4, - NAMES_accPedalPosition:@0, - NAMES_steeringWheelAngle:@-1500, - NAMES_eCallInfo:eCall, - NAMES_airbagStatus:airbag, - NAMES_emergencyEvent:event, - NAMES_clusterModeStatus:clusterMode, - NAMES_myKey:myKey}, - NAMES_operation_name:NAMES_GetVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameGPS:gps, + SDLNameSpeed:@100, + SDLNameRPM:@3, + SDLNameFuelLevel:@99.9999, + SDLNameFuelLevelState:SDLComponentVolumeStatusFault, + SDLNameInstantFuelConsumption:@40.7, + SDLNameExternalTemperature:@0, + SDLNameVIN:@"6574839201", + SDLNamePRNDL:SDLPRNDLPark, + SDLNameTirePressure:tires, + SDLNameOdometer:@70000, + SDLNameBeltStatus:belt, + SDLNameBodyInformation:body, + SDLNameDeviceStatus:device, + SDLNameDriverBraking:SDLVehicleDataEventStatusNoEvent, + SDLNameWiperStatus:SDLWiperStatusAutomaticHigh, + SDLNameHeadLampStatus:headLamp, + SDLNameEngineTorque:@630.4, + SDLNameAccelerationPedalPosition:@0, + SDLNameSteeringWheelAngle:@-1500, + SDLNameECallInfo:eCall, + SDLNameAirbagStatus:airbag, + SDLNameEmergencyEvent:event, + SDLNameClusterModeStatus:clusterMode, + SDLNameMyKey:myKey}, + SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy]; SDLGetVehicleDataResponse* testResponse = [[SDLGetVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(gps)); @@ -129,7 +129,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.bodyInformation).to(equal(body)); expect(testResponse.deviceStatus).to(equal(device)); expect(testResponse.driverBraking).to(equal(SDLVehicleDataEventStatusNoEvent)); - expect(testResponse.wiperStatus).to(equal(SDLWiperStatusAutoHigh)); + expect(testResponse.wiperStatus).to(equal(SDLWiperStatusAutomaticHigh)); expect(testResponse.headLampStatus).to(equal(headLamp)); expect(testResponse.engineTorque).to(equal(@630.4)); expect(testResponse.accPedalPosition).to(equal(@0)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m index 824bc7517..8934562eb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_filenames:[@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy], - NAMES_spaceAvailable:@500000000}, - NAMES_operation_name:NAMES_ListFiles}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameFilenames:[@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy], + SDLNameSpaceAvailable:@500000000}, + SDLNameOperationName:SDLNameListFiles}} mutableCopy]; SDLListFilesResponse* testResponse = [[SDLListFilesResponse alloc] initWithDictionary:dict]; expect(testResponse.filenames).to(equal([@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy])); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m index a7d595c0e..fc2219356 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m @@ -29,12 +29,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_choiceID:@25, - NAMES_manualTextEntry:@"entry", - NAMES_triggerSource:SDLTriggerSourceKeyboard}, - NAMES_operation_name:NAMES_PerformInteraction}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameChoiceId:@25, + SDLNameManualTextEntry:@"entry", + SDLNameTriggerSource:SDLTriggerSourceKeyboard}, + SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy]; SDLPerformInteractionResponse* testResponse = [[SDLPerformInteractionResponse alloc] initWithDictionary:dict]; expect(testResponse.choiceID).to(equal(@25)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m index 565f97a79..52ed9bf7b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_spaceAvailable:@1248}, - NAMES_operation_name:NAMES_PutFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameSpaceAvailable:@1248}, + SDLNameOperationName:SDLNamePutFile}} mutableCopy]; SDLPutFileResponse* testResponse = [[SDLPutFileResponse alloc] initWithDictionary:dict]; expect(testResponse.spaceAvailable).to(equal(@1248)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m index 0ae2c5b9d..d5f080aba 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m @@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_didResult:[@[result] mutableCopy]}, - NAMES_operation_name:NAMES_ReadDID}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameDIDResult:[@[result] mutableCopy]}, + SDLNameOperationName:SDLNameReadDID}} mutableCopy]; SDLReadDIDResponse* testResponse = [[SDLReadDIDResponse alloc] initWithDictionary:dict]; expect(testResponse.didResult).to(equal([@[result] mutableCopy])); @@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m index 7dfefaad6..81f64528f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m @@ -35,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ { testResponse.softButtonCapabilities = [@[softButton] mutableCopy]; testResponse.presetBankCapabilities = presetBank; testResponse.hmiZoneCapabilities = [@[SDLHMIZoneCapabilitiesBack, SDLHMIZoneCapabilitiesFront] copy]; - testResponse.speechCapabilities = [@[SDLSpeechCapabilitiesSapiPhonemes, SDLSpeechCapabilitiesSilence] copy]; + testResponse.speechCapabilities = [@[SDLSpeechCapabilitiesSAPIPhonemes, SDLSpeechCapabilitiesSilence] copy]; testResponse.vrCapabilities = [@[SDLVRCapabilitiesText] copy]; testResponse.audioPassThruCapabilities = [@[audioPassThru] mutableCopy]; testResponse.vehicleType = vehicle; - testResponse.prerecordedSpeech = [@[SDLPrerecordedSpeechListenJingle, SDLPrerecordedSpeechHelpJingle] copy]; + testResponse.prerecordedSpeech = [@[SDLPrerecordedSpeechListen, SDLPrerecordedSpeechHelp] copy]; testResponse.supportedDiagModes = [@[@67, @99, @111] mutableCopy]; testResponse.hmiCapabilities = hmiCapabilities; testResponse.sdlVersion = @"sdlVersion"; @@ -53,11 +53,11 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.softButtonCapabilities).to(equal([@[softButton] mutableCopy])); expect(testResponse.presetBankCapabilities).to(equal(presetBank)); expect(testResponse.hmiZoneCapabilities).to(equal([@[SDLHMIZoneCapabilitiesBack, SDLHMIZoneCapabilitiesFront] copy])); - expect(testResponse.speechCapabilities).to(equal([@[SDLSpeechCapabilitiesSapiPhonemes, SDLSpeechCapabilitiesSilence] copy])); + expect(testResponse.speechCapabilities).to(equal([@[SDLSpeechCapabilitiesSAPIPhonemes, SDLSpeechCapabilitiesSilence] copy])); expect(testResponse.vrCapabilities).to(equal([@[SDLVRCapabilitiesText] copy])); expect(testResponse.audioPassThruCapabilities).to(equal([@[audioPassThru] mutableCopy])); expect(testResponse.vehicleType).to(equal(vehicle)); - expect(testResponse.prerecordedSpeech).to(equal([@[SDLPrerecordedSpeechListenJingle, SDLPrerecordedSpeechHelpJingle] copy])); + expect(testResponse.prerecordedSpeech).to(equal([@[SDLPrerecordedSpeechListen, SDLPrerecordedSpeechHelp] copy])); expect(testResponse.supportedDiagModes).to(equal([@[@67, @99, @111] mutableCopy])); expect(testResponse.hmiCapabilities).to(equal(hmiCapabilities)); expect(testResponse.sdlVersion).to(equal(@"sdlVersion")); @@ -65,26 +65,27 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncMsgVersion:version, - NAMES_language:SDLLanguageEsMx, - NAMES_hmiDisplayLanguage:SDLLanguageRuRu, NAMES_displayCapabilities:info, - NAMES_buttonCapabilities:[@[button] mutableCopy], - NAMES_softButtonCapabilities:[@[softButton] mutableCopy], - NAMES_presetBankCapabilities:presetBank, - NAMES_hmiZoneCapabilities:[@[SDLHMIZoneCapabilitiesBack, SDLHMIZoneCapabilitiesFront] copy], - NAMES_speechCapabilities:[@[SDLSpeechCapabilitiesSapiPhonemes, SDLSpeechCapabilitiesSilence] copy], - NAMES_vrCapabilities:[@[SDLVRCapabilitiesText] copy], - NAMES_audioPassThruCapabilities:[@[audioPassThru] mutableCopy], - NAMES_vehicleType:vehicle, - NAMES_prerecordedSpeech:[@[SDLPrerecordedSpeechListenJingle, SDLPrerecordedSpeechHelpJingle] mutableCopy], - NAMES_supportedDiagModes:[@[@67, @99, @111] mutableCopy], - NAMES_hmiCapabilities: hmiCapabilities, - NAMES_sdlVersion: @"sdlVersion", - NAMES_systemSoftwareVersion: @"systemSoftwareVersion" + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncMessageVersion:version, + SDLNameLanguage:SDLLanguageEsMx, + SDLNameHMIDisplayLanguage:SDLLanguageRuRu, + SDLNameDisplayCapabilities:info, + SDLNameButtonCapabilities:[@[button] mutableCopy], + SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy], + SDLNamePresetBankCapabilities:presetBank, + SDLNameHMIZoneCapabilities:[@[SDLHMIZoneCapabilitiesBack, SDLHMIZoneCapabilitiesFront] copy], + SDLNameSpeechCapabilities:[@[SDLSpeechCapabilitiesSAPIPhonemes, SDLSpeechCapabilitiesSilence] copy], + SDLNameVRCapabilities:[@[SDLVRCapabilitiesText] copy], + SDLNameAudioPassThruCapabilities:[@[audioPassThru] mutableCopy], + SDLNameVehicleType:vehicle, + SDLNamePrerecordedSpeech:[@[SDLPrerecordedSpeechListen, SDLPrerecordedSpeechHelp] mutableCopy], + SDLNameSupportedDiagnosticModes:[@[@67, @99, @111] mutableCopy], + SDLNameHMICapabilities: hmiCapabilities, + SDLNameSDLVersion: @"sdlVersion", + SDLNameSystemSoftwareVersion: @"systemSoftwareVersion" }, - NAMES_operation_name:NAMES_RegisterAppInterface}} mutableCopy]; + SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy]; SDLRegisterAppInterfaceResponse* testResponse = [[SDLRegisterAppInterfaceResponse alloc] initWithDictionary:dict]; expect(testResponse.syncMsgVersion).to(equal(version)); @@ -95,11 +96,11 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.softButtonCapabilities).to(equal([@[softButton] mutableCopy])); expect(testResponse.presetBankCapabilities).to(equal(presetBank)); expect(testResponse.hmiZoneCapabilities).to(equal([@[SDLHMIZoneCapabilitiesBack, SDLHMIZoneCapabilitiesFront] copy])); - expect(testResponse.speechCapabilities).to(equal([@[SDLSpeechCapabilitiesSapiPhonemes, SDLSpeechCapabilitiesSilence] copy])); + expect(testResponse.speechCapabilities).to(equal([@[SDLSpeechCapabilitiesSAPIPhonemes, SDLSpeechCapabilitiesSilence] copy])); expect(testResponse.vrCapabilities).to(equal([@[SDLVRCapabilitiesText] copy])); expect(testResponse.audioPassThruCapabilities).to(equal([@[audioPassThru] mutableCopy])); expect(testResponse.vehicleType).to(equal(vehicle)); - expect(testResponse.prerecordedSpeech).to(equal([@[SDLPrerecordedSpeechListenJingle, SDLPrerecordedSpeechHelpJingle] copy])); + expect(testResponse.prerecordedSpeech).to(equal([@[SDLPrerecordedSpeechListen, SDLPrerecordedSpeechHelp] copy])); expect(testResponse.supportedDiagModes).to(equal([@[@67, @99, @111] mutableCopy])); expect(testResponse.hmiCapabilities).to(equal(hmiCapabilities)); expect(testResponse.sdlVersion).to(equal(@"sdlVersion")); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m index 3eeab76a1..a589bfeea 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m @@ -39,13 +39,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_displayCapabilities:info, - NAMES_buttonCapabilities:[@[button] mutableCopy], - NAMES_softButtonCapabilities:[@[softButton] mutableCopy], - NAMES_presetBankCapabilities:presetBank}, - NAMES_operation_name:NAMES_SetDisplayLayout}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameDisplayCapabilities:info, + SDLNameButtonCapabilities:[@[button] mutableCopy], + SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy], + SDLNamePresetBankCapabilities:presetBank}, + SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy]; SDLSetDisplayLayoutResponse* testResponse = [[SDLSetDisplayLayoutResponse alloc] initWithDictionary:dict]; expect(testResponse.displayCapabilities).to(equal(info)); @@ -64,4 +64,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m index 6f92c1e48..61666d57b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_sliderPosition:@13}, - NAMES_operation_name:NAMES_Slider}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameSliderPosition:@13}, + SDLNameOperationName:SDLNameSlider}} mutableCopy]; SDLSliderResponse* testResponse = [[SDLSliderResponse alloc] initWithDictionary:dict]; expect(testResponse.sliderPosition).to(equal(@13)); @@ -40,4 +40,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index d6c0dc6ac..6b6b93ddc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -73,33 +73,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_gps:vehicleDataResult, - NAMES_speed:vehicleDataResult, - NAMES_rpm:vehicleDataResult, - NAMES_fuelLevel:vehicleDataResult, - NAMES_fuelLevel_State:vehicleDataResult, - NAMES_instantFuelConsumption:vehicleDataResult, - NAMES_externalTemperature:vehicleDataResult, - NAMES_prndl:vehicleDataResult, - NAMES_tirePressure:vehicleDataResult, - NAMES_odometer:vehicleDataResult, - NAMES_beltStatus:vehicleDataResult, - NAMES_bodyInformation:vehicleDataResult, - NAMES_deviceStatus:vehicleDataResult, - NAMES_driverBraking:vehicleDataResult, - NAMES_wiperStatus:vehicleDataResult, - NAMES_headLampStatus:vehicleDataResult, - NAMES_engineTorque:vehicleDataResult, - NAMES_accPedalPosition:vehicleDataResult, - NAMES_steeringWheelAngle:vehicleDataResult, - NAMES_eCallInfo:vehicleDataResult, - NAMES_airbagStatus:vehicleDataResult, - NAMES_emergencyEvent:vehicleDataResult, - NAMES_clusterModes:vehicleDataResult, - NAMES_myKey:vehicleDataResult}, - NAMES_operation_name:NAMES_SubscribeVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameGPS:vehicleDataResult, + SDLNameSpeed:vehicleDataResult, + SDLNameRPM:vehicleDataResult, + SDLNameFuelLevel:vehicleDataResult, + SDLNameFuelLevelState:vehicleDataResult, + SDLNameInstantFuelConsumption:vehicleDataResult, + SDLNameExternalTemperature:vehicleDataResult, + SDLNamePRNDL:vehicleDataResult, + SDLNameTirePressure:vehicleDataResult, + SDLNameOdometer:vehicleDataResult, + SDLNameBeltStatus:vehicleDataResult, + SDLNameBodyInformation:vehicleDataResult, + SDLNameDeviceStatus:vehicleDataResult, + SDLNameDriverBraking:vehicleDataResult, + SDLNameWiperStatus:vehicleDataResult, + SDLNameHeadLampStatus:vehicleDataResult, + SDLNameEngineTorque:vehicleDataResult, + SDLNameAccelerationPedalPosition:vehicleDataResult, + SDLNameSteeringWheelAngle:vehicleDataResult, + SDLNameECallInfo:vehicleDataResult, + SDLNameAirbagStatus:vehicleDataResult, + SDLNameEmergencyEvent:vehicleDataResult, + SDLNameClusterModes:vehicleDataResult, + SDLNameMyKey:vehicleDataResult}, + SDLNameOperationName:SDLNameSubscribeVehicleData}} mutableCopy]; SDLSubscribeVehicleDataResponse* testResponse = [[SDLSubscribeVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(vehicleDataResult)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 29cb4e08c..022dd306f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -73,33 +73,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_gps:vehicleDataResult, - NAMES_speed:vehicleDataResult, - NAMES_rpm:vehicleDataResult, - NAMES_fuelLevel:vehicleDataResult, - NAMES_fuelLevel_State:vehicleDataResult, - NAMES_instantFuelConsumption:vehicleDataResult, - NAMES_externalTemperature:vehicleDataResult, - NAMES_prndl:vehicleDataResult, - NAMES_tirePressure:vehicleDataResult, - NAMES_odometer:vehicleDataResult, - NAMES_beltStatus:vehicleDataResult, - NAMES_bodyInformation:vehicleDataResult, - NAMES_deviceStatus:vehicleDataResult, - NAMES_driverBraking:vehicleDataResult, - NAMES_wiperStatus:vehicleDataResult, - NAMES_headLampStatus:vehicleDataResult, - NAMES_engineTorque:vehicleDataResult, - NAMES_accPedalPosition:vehicleDataResult, - NAMES_steeringWheelAngle:vehicleDataResult, - NAMES_eCallInfo:vehicleDataResult, - NAMES_airbagStatus:vehicleDataResult, - NAMES_emergencyEvent:vehicleDataResult, - NAMES_clusterModes:vehicleDataResult, - NAMES_myKey:vehicleDataResult}, - NAMES_operation_name:NAMES_UnsubscribeVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameGPS:vehicleDataResult, + SDLNameSpeed:vehicleDataResult, + SDLNameRPM:vehicleDataResult, + SDLNameFuelLevel:vehicleDataResult, + SDLNameFuelLevelState:vehicleDataResult, + SDLNameInstantFuelConsumption:vehicleDataResult, + SDLNameExternalTemperature:vehicleDataResult, + SDLNamePRNDL:vehicleDataResult, + SDLNameTirePressure:vehicleDataResult, + SDLNameOdometer:vehicleDataResult, + SDLNameBeltStatus:vehicleDataResult, + SDLNameBodyInformation:vehicleDataResult, + SDLNameDeviceStatus:vehicleDataResult, + SDLNameDriverBraking:vehicleDataResult, + SDLNameWiperStatus:vehicleDataResult, + SDLNameHeadLampStatus:vehicleDataResult, + SDLNameEngineTorque:vehicleDataResult, + SDLNameAccelerationPedalPosition:vehicleDataResult, + SDLNameSteeringWheelAngle:vehicleDataResult, + SDLNameECallInfo:vehicleDataResult, + SDLNameAirbagStatus:vehicleDataResult, + SDLNameEmergencyEvent:vehicleDataResult, + SDLNameClusterModes:vehicleDataResult, + SDLNameMyKey:vehicleDataResult}, + SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy]; SDLUnsubscribeVehicleDataResponse* testResponse = [[SDLUnsubscribeVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(vehicleDataResult)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m index d410bf112..01a535ce4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m @@ -39,14 +39,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_driverAirbagDeployed:SDLVehicleDataEventStatusYes, - NAMES_driverSideAirbagDeployed:SDLVehicleDataEventStatusNoEvent, - NAMES_driverCurtainAirbagDeployed:SDLVehicleDataEventStatusNo, - NAMES_passengerAirbagDeployed:SDLVehicleDataEventStatusNotSupported, - NAMES_passengerCurtainAirbagDeployed:SDLVehicleDataEventStatusFault, - NAMES_driverKneeAirbagDeployed:SDLVehicleDataEventStatusNo, - NAMES_passengerSideAirbagDeployed:SDLVehicleDataEventStatusYes, - NAMES_passengerKneeAirbagDeployed:SDLVehicleDataEventStatusNoEvent} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameDriverAirbagDeployed:SDLVehicleDataEventStatusYes, + SDLNameDriverSideAirbagDeployed:SDLVehicleDataEventStatusNoEvent, + SDLNameDriverCurtainAirbagDeployed:SDLVehicleDataEventStatusNo, + SDLNamePassengerAirbagDeployed:SDLVehicleDataEventStatusNotSupported, + SDLNamePassengerCurtainAirbagDeployed:SDLVehicleDataEventStatusFault, + SDLNameDriverKneeAirbagDeployed:SDLVehicleDataEventStatusNo, + SDLNamePassengerSideAirbagDeployed:SDLVehicleDataEventStatusYes, + SDLNamePassengerKneeAirbagDeployed:SDLVehicleDataEventStatusNoEvent} mutableCopy]; SDLAirbagStatus* testStruct = [[SDLAirbagStatus alloc] initWithDictionary:dict]; expect(testStruct.driverAirbagDeployed).to(equal(SDLVehicleDataEventStatusYes)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m index 424c299b8..73e2fc1bd 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m @@ -28,9 +28,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_appDisplayName:@"display name", - NAMES_appVersion:@"1.2.3.4", - NAMES_appBundleID:@"com.app.bundle"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameAppDisplayName:@"display name", + SDLNameAppVersion:@"1.2.3.4", + SDLNameAppBundleId:@"com.app.bundle"} mutableCopy]; SDLAppInfo* testStruct = [[SDLAppInfo alloc] initWithDictionary:dict]; expect(testStruct.appDisplayName).to(equal(@"display name")); @@ -47,4 +47,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m index 5594325e8..5e2981852 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m @@ -21,24 +21,24 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { SDLAudioPassThruCapabilities* testStruct = [[SDLAudioPassThruCapabilities alloc] init]; - testStruct.samplingRate = SDLSamplingRate22Khz; + testStruct.samplingRate = SDLSamplingRate22KHZ; testStruct.bitsPerSample = SDLBitsPerSample8Bit; - testStruct.audioType = SDLAudioTypePcm; + testStruct.audioType = SDLAudioTypePCM; - expect(testStruct.samplingRate).to(equal(SDLSamplingRate22Khz)); + expect(testStruct.samplingRate).to(equal(SDLSamplingRate22KHZ)); expect(testStruct.bitsPerSample).to(equal(SDLBitsPerSample8Bit)); - expect(testStruct.audioType).to(equal(SDLAudioTypePcm)); + expect(testStruct.audioType).to(equal(SDLAudioTypePCM)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_samplingRate:SDLSamplingRate22Khz, - NAMES_bitsPerSample:SDLBitsPerSample8Bit, - NAMES_audioType:SDLAudioTypePcm} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameSamplingRate:SDLSamplingRate22KHZ, + SDLNameBitsPerSample:SDLBitsPerSample8Bit, + SDLNameAudioType:SDLAudioTypePCM} mutableCopy]; SDLAudioPassThruCapabilities* testStruct = [[SDLAudioPassThruCapabilities alloc] initWithDictionary:dict]; - expect(testStruct.samplingRate).to(equal(SDLSamplingRate22Khz)); + expect(testStruct.samplingRate).to(equal(SDLSamplingRate22KHZ)); expect(testStruct.bitsPerSample).to(equal(SDLBitsPerSample8Bit)); - expect(testStruct.audioType).to(equal(SDLAudioTypePcm)); + expect(testStruct.audioType).to(equal(SDLAudioTypePCM)); }); it(@"Should return nil if not set", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m index a9d67e0a7..e6e9495c5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m @@ -53,21 +53,21 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_driverBeltDeployed:SDLVehicleDataEventStatusNoEvent, - NAMES_passengerBeltDeployed:SDLVehicleDataEventStatusYes, - NAMES_passengerBuckleBelted:SDLVehicleDataEventStatusNo, - NAMES_driverBuckleBelted:SDLVehicleDataEventStatusFault, - NAMES_leftRow2BuckleBelted:SDLVehicleDataEventStatusYes, - NAMES_passengerChildDetected:SDLVehicleDataEventStatusNo, - NAMES_rightRow2BuckleBelted:SDLVehicleDataEventStatusNotSupported, - NAMES_middleRow2BuckleBelted:SDLVehicleDataEventStatusNoEvent, - NAMES_middleRow3BuckleBelted:SDLVehicleDataEventStatusYes, - NAMES_leftRow3BuckleBelted:SDLVehicleDataEventStatusFault, - NAMES_rightRow3BuckleBelted:SDLVehicleDataEventStatusNo, - NAMES_leftRearInflatableBelted:SDLVehicleDataEventStatusNotSupported, - NAMES_rightRearInflatableBelted:SDLVehicleDataEventStatusFault, - NAMES_middleRow1BeltDeployed:SDLVehicleDataEventStatusNoEvent, - NAMES_middleRow1BuckleBelted:SDLVehicleDataEventStatusNotSupported} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameDriverBeltDeployed:SDLVehicleDataEventStatusNoEvent, + SDLNamePassengerBeltDeployed:SDLVehicleDataEventStatusYes, + SDLNamePassengerBuckleBelted:SDLVehicleDataEventStatusNo, + SDLNameDriverBuckleBelted:SDLVehicleDataEventStatusFault, + SDLNameLeftRow2BuckleBelted:SDLVehicleDataEventStatusYes, + SDLNamePassengerChildDetected:SDLVehicleDataEventStatusNo, + SDLNameRightRow2BuckleBelted:SDLVehicleDataEventStatusNotSupported, + SDLNameMiddleRow2BuckleBelted:SDLVehicleDataEventStatusNoEvent, + SDLNameMiddleRow3BuckleBelted:SDLVehicleDataEventStatusYes, + SDLNameLeftRow3BuckleBelted:SDLVehicleDataEventStatusFault, + SDLNameRightRow3BuckleBelted:SDLVehicleDataEventStatusNo, + SDLNameLeftRearInflatableBelted:SDLVehicleDataEventStatusNotSupported, + SDLNameRightRearInflatableBelted:SDLVehicleDataEventStatusFault, + SDLNameMiddleRow1BeltDeployed:SDLVehicleDataEventStatusNoEvent, + SDLNameMiddleRow1BuckleBelted:SDLVehicleDataEventStatusNotSupported} mutableCopy]; SDLBeltStatus* testStruct = [[SDLBeltStatus alloc] initWithDictionary:dict]; expect(testStruct.driverBeltDeployed).to(equal(SDLVehicleDataEventStatusNoEvent)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m index eb2ac4b9c..6ed210075 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m @@ -37,13 +37,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_parkBrakeActive:@YES, - NAMES_ignitionStableStatus:SDLIgnitionStableStatusNotStable, - NAMES_ignitionStatus:SDLIgnitionStatusStart, - NAMES_driverDoorAjar:@NO, - NAMES_passengerDoorAjar:@NO, - NAMES_rearLeftDoorAjar:@NO, - NAMES_rearRightDoorAjar:@YES} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameParkBrakeActive:@YES, + SDLNameIgnitionStableStatus:SDLIgnitionStableStatusNotStable, + SDLNameIgnitionStatus:SDLIgnitionStatusStart, + SDLNameDriverDoorAjar:@NO, + SDLNamePassengerDoorAjar:@NO, + SDLNameRearLeftDoorAjar:@NO, + SDLNameRearRightDoorAjar:@YES} mutableCopy]; SDLBodyInformation* testStruct = [[SDLBodyInformation alloc] initWithDictionary:dict]; expect(testStruct.parkBrakeActive).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m index 602467baa..b10e0b094 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m @@ -31,10 +31,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_name:SDLButtonNameCustomButton, - NAMES_shortPressAvailable:@YES, - NAMES_longPressAvailable:@YES, - NAMES_upDownAvailable:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameName:SDLButtonNameCustomButton, + SDLNameShortPressAvailable:@YES, + SDLNameLongPressAvailable:@YES, + SDLNameUpDownAvailable:@NO} mutableCopy]; SDLButtonCapabilities* testStruct = [[SDLButtonCapabilities alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal(SDLButtonNameCustomButton)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m index 63116976a..51405d639 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m @@ -40,13 +40,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_choiceID:@3, - NAMES_menuName:@"Hello", - NAMES_vrCommands:[@[@"1", @"2"] mutableCopy], - NAMES_image:image, - NAMES_secondaryText:@"Arbitrary", - NAMES_tertiaryText:@"qwerty", - NAMES_secondaryImage:secondaryImage} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameChoiceId:@3, + SDLNameMenuName:@"Hello", + SDLNameVRCommands:[@[@"1", @"2"] mutableCopy], + SDLNameImage:image, + SDLNameSecondaryText:@"Arbitrary", + SDLNameTertiaryText:@"qwerty", + SDLNameSecondaryImage:secondaryImage} mutableCopy]; SDLChoice* testStruct = [[SDLChoice alloc] initWithDictionary:dict]; expect(testStruct.choiceID).to(equal(@3)); @@ -71,4 +71,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m index 790395244..f61afe79e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m @@ -21,25 +21,25 @@ describe(@"Getter/Setter Tests", ^ { SDLClusterModeStatus* testStruct = [[SDLClusterModeStatus alloc] init]; testStruct.powerModeActive = @YES; - testStruct.powerModeQualificationStatus = SDLPowerModeQualificationStatusPowerModeEvaluationInProgress; + testStruct.powerModeQualificationStatus = SDLPowerModeQualificationStatusEvaluationInProgress; testStruct.carModeStatus = SDLCarModeStatusCrash; testStruct.powerModeStatus = SDLPowerModeStatusIgnitionOn; expect(testStruct.powerModeActive).to(equal(@YES)); - expect(testStruct.powerModeQualificationStatus).to(equal(SDLPowerModeQualificationStatusPowerModeEvaluationInProgress)); + expect(testStruct.powerModeQualificationStatus).to(equal(SDLPowerModeQualificationStatusEvaluationInProgress)); expect(testStruct.carModeStatus).to(equal(SDLCarModeStatusCrash)); expect(testStruct.powerModeStatus).to(equal(SDLPowerModeStatusIgnitionOn)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_powerModeActive:@NO, - NAMES_powerModeQualificationStatus:SDLPowerModeQualificationStatusPowerModeOk, - NAMES_carModeStatus:SDLCarModeStatusCrash, - NAMES_powerModeStatus:SDLPowerModeStatusKeyOut} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNamePowerModeActive:@NO, + SDLNamePowerModeQualificationStatus:SDLPowerModeQualificationStatusOk, + SDLNameCarModeStatus:SDLCarModeStatusCrash, + SDLNamePowerModeStatus:SDLPowerModeStatusKeyOut} mutableCopy]; SDLClusterModeStatus* testStruct = [[SDLClusterModeStatus alloc] initWithDictionary:dict]; expect(testStruct.powerModeActive).to(equal(@NO)); - expect(testStruct.powerModeQualificationStatus).to(equal(SDLPowerModeQualificationStatusPowerModeOk)); + expect(testStruct.powerModeQualificationStatus).to(equal(SDLPowerModeQualificationStatusOk)); expect(testStruct.carModeStatus).to(equal(SDLCarModeStatusCrash)); expect(testStruct.powerModeStatus).to(equal(SDLPowerModeStatusKeyOut)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m index e5f44532b..d0715bded 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m @@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_resultCode:SDLVehicleDataResultCodeDataNotSubscribed, - NAMES_didLocation:@300, - NAMES_data:@"gertwydhty4235tdhedt4tue"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResultCode:SDLVehicleDataResultCodeDataNotSubscribed, + SDLNameDIDLocation:@300, + SDLNameData:@"gertwydhty4235tdhedt4tue"} mutableCopy]; SDLDIDResult* testStruct = [[SDLDIDResult alloc] initWithDictionary:dict]; expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDataNotSubscribed)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m index beb3b2d80..785a53877 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m @@ -33,12 +33,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_hardware:@"GDFR34F", - NAMES_firmwareRev:@"4.2a", - NAMES_os:@"Robot", - NAMES_osVersion:@"9.9", - NAMES_carrier:@"ThatOneWirelessCompany", - NAMES_maxNumberRFCOMMPorts:@20} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameHardware:@"GDFR34F", + SDLNameFirmwareRevision:@"4.2a", + SDLNameOS:@"Robot", + SDLNameOSVersion:@"9.9", + SDLNameCarrier:@"ThatOneWirelessCompany", + SDLNameMaxNumberRFCOMMPorts:@20} mutableCopy]; SDLDeviceInfo* testStruct = [[SDLDeviceInfo alloc] initWithDictionary:dict]; expect(testStruct.hardware).to(equal(@"GDFR34F")); @@ -61,4 +61,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m index 5b5a52fb4..eb56a11a0 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m @@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { testStruct.callActive = @YES; testStruct.phoneRoaming = @NO; testStruct.textMsgAvailable = @YES; - testStruct.battLevelStatus = SDLDeviceLevelStatusFourLevelBars; + testStruct.battLevelStatus = SDLDeviceLevelStatusFourBars; testStruct.stereoAudioOutputMuted = @YES; testStruct.monoAudioOutputMuted = @YES; - testStruct.signalLevelStatus = SDLDeviceLevelStatusTwoLevelBars; + testStruct.signalLevelStatus = SDLDeviceLevelStatusTwoBars; testStruct.primaryAudioSource = SDLPrimaryAudioSourceBluetoothStereo; testStruct.eCallEventActive = @NO; @@ -37,26 +37,26 @@ describe(@"Getter/Setter Tests", ^ { expect(testStruct.callActive).to(equal(@YES)); expect(testStruct.phoneRoaming).to(equal(@NO)); expect(testStruct.textMsgAvailable).to(equal(@YES)); - expect(testStruct.battLevelStatus).to(equal(SDLDeviceLevelStatusFourLevelBars)); + expect(testStruct.battLevelStatus).to(equal(SDLDeviceLevelStatusFourBars)); expect(testStruct.stereoAudioOutputMuted).to(equal(@YES)); expect(testStruct.monoAudioOutputMuted).to(equal(@YES)); - expect(testStruct.signalLevelStatus).to(equal(SDLDeviceLevelStatusTwoLevelBars)); + expect(testStruct.signalLevelStatus).to(equal(SDLDeviceLevelStatusTwoBars)); expect(testStruct.primaryAudioSource).to(equal(SDLPrimaryAudioSourceBluetoothStereo)); expect(testStruct.eCallEventActive).to(equal(@NO)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_voiceRecOn:@NO, - NAMES_btIconOn:@NO, - NAMES_callActive:@YES, - NAMES_phoneRoaming:@NO, - NAMES_textMsgAvailable:@YES, - NAMES_battLevelStatus:SDLDeviceLevelStatusFourLevelBars, - NAMES_stereoAudioOutputMuted:@YES, - NAMES_monoAudioOutputMuted:@YES, - NAMES_signalLevelStatus:SDLDeviceLevelStatusTwoLevelBars, - NAMES_primaryAudioSource:SDLPrimaryAudioSourceBluetoothStereo, - NAMES_eCallEventActive:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameVoiceRecognitionOn:@NO, + SDLNameBluetoothIconOn:@NO, + SDLNameCallActive:@YES, + SDLNamePhoneRoaming:@NO, + SDLNameTextMessageAvailable:@YES, + SDLNameBatteryLevelStatus:SDLDeviceLevelStatusFourBars, + SDLNameStereoAudioOutputMuted:@YES, + SDLNameMonoAudioOutputMuted:@YES, + SDLNameSignalLevelStatus:SDLDeviceLevelStatusTwoBars, + SDLNamePrimaryAudioSource:SDLPrimaryAudioSourceBluetoothStereo, + SDLNameECallEventActive:@NO} mutableCopy]; SDLDeviceStatus* testStruct = [[SDLDeviceStatus alloc] initWithDictionary:dict]; expect(testStruct.voiceRecOn).to(equal(@NO)); @@ -64,10 +64,10 @@ describe(@"Getter/Setter Tests", ^ { expect(testStruct.callActive).to(equal(@YES)); expect(testStruct.phoneRoaming).to(equal(@NO)); expect(testStruct.textMsgAvailable).to(equal(@YES)); - expect(testStruct.battLevelStatus).to(equal(SDLDeviceLevelStatusFourLevelBars)); + expect(testStruct.battLevelStatus).to(equal(SDLDeviceLevelStatusFourBars)); expect(testStruct.stereoAudioOutputMuted).to(equal(@YES)); expect(testStruct.monoAudioOutputMuted).to(equal(@YES)); - expect(testStruct.signalLevelStatus).to(equal(SDLDeviceLevelStatusTwoLevelBars)); + expect(testStruct.signalLevelStatus).to(equal(SDLDeviceLevelStatusTwoBars)); expect(testStruct.primaryAudioSource).to(equal(SDLPrimaryAudioSourceBluetoothStereo)); expect(testStruct.eCallEventActive).to(equal(@NO)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m index 6d1d101d8..32bbeb29d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m @@ -27,7 +27,7 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { SDLDisplayCapabilities* testStruct = [[SDLDisplayCapabilities alloc] init]; - testStruct.displayType = SDLDisplayTypeGen26Dma; + testStruct.displayType = SDLDisplayTypeGen26DMA; testStruct.textFields = [@[textField] mutableCopy]; testStruct.imageFields = [@[imageField] mutableCopy]; testStruct.mediaClockFormats = [@[SDLMediaClockFormatClockText1, SDLMediaClockFormatClock3, SDLMediaClockFormatClockText3] copy]; @@ -36,7 +36,7 @@ describe(@"Getter/Setter Tests", ^ { testStruct.screenParams = screenParams; testStruct.numCustomPresetsAvailable = @43; - expect(testStruct.displayType).to(equal(SDLDisplayTypeGen26Dma)); + expect(testStruct.displayType).to(equal(SDLDisplayTypeGen26DMA)); expect(testStruct.textFields).to(equal([@[textField] mutableCopy])); expect(testStruct.imageFields).to(equal([@[imageField] mutableCopy])); expect(testStruct.mediaClockFormats).to(equal([@[SDLMediaClockFormatClockText1, SDLMediaClockFormatClock3, SDLMediaClockFormatClockText3] copy])); @@ -47,17 +47,17 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_displayType:SDLDisplayTypeGen26Dma, - NAMES_textFields:[@[textField] mutableCopy], - NAMES_imageFields:[@[imageField] mutableCopy], - NAMES_mediaClockFormats:[@[SDLMediaClockFormatClockText1, SDLMediaClockFormatClock3, SDLMediaClockFormatClockText3] copy], - NAMES_graphicSupported:@YES, - NAMES_templatesAvailable:[@[@"String", @"String", @"String"] mutableCopy], - NAMES_screenParams:screenParams, - NAMES_numCustomPresetsAvailable:@43} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameDisplayType:SDLDisplayTypeGen26DMA, + SDLNameTextFields:[@[textField] mutableCopy], + SDLNameImageFields:[@[imageField] mutableCopy], + SDLNameMediaClockFormats:[@[SDLMediaClockFormatClockText1, SDLMediaClockFormatClock3, SDLMediaClockFormatClockText3] copy], + SDLNameGraphicSupported:@YES, + SDLNameTemplatesAvailable:[@[@"String", @"String", @"String"] mutableCopy], + SDLNameScreenParams:screenParams, + SDLNameNumberCustomPresetsAvailable:@43} mutableCopy]; SDLDisplayCapabilities* testStruct = [[SDLDisplayCapabilities alloc] initWithDictionary:dict]; - expect(testStruct.displayType).to(equal(SDLDisplayTypeGen26Dma)); + expect(testStruct.displayType).to(equal(SDLDisplayTypeGen26DMA)); expect(testStruct.textFields).to(equal([@[textField] mutableCopy])); expect(testStruct.imageFields).to(equal([@[imageField] mutableCopy])); expect(testStruct.mediaClockFormats).to(equal([@[SDLMediaClockFormatClockText1, SDLMediaClockFormatClock3, SDLMediaClockFormatClockText3] copy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m index 5e84d206c..c69c46b84 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m @@ -30,9 +30,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_eCallNotificationStatus:SDLVehicleDataNotificationStatusNormal, - NAMES_auxECallNotificationStatus:SDLVehicleDataNotificationStatusActive, - NAMES_eCallConfirmationStatus:SDLECallConfirmationStatusInProgress} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameECallNotificationStatus:SDLVehicleDataNotificationStatusNormal, + SDLNameAuxECallNotificationStatus:SDLVehicleDataNotificationStatusActive, + SDLNameECallConfirmationStatus:SDLECallConfirmationStatusInProgress} mutableCopy]; SDLECallInfo* testStruct = [[SDLECallInfo alloc] initWithDictionary:dict]; expect(testStruct.eCallNotificationStatus).to(equal(SDLVehicleDataNotificationStatusNormal)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m index f955d5a90..0048ffdff 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m @@ -35,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_emergencyEventType:SDLEmergencyEventTypeFrontal, - NAMES_fuelCutoffStatus:SDLFuelCutoffStatusNormalOperation, - NAMES_rolloverEvent:SDLVehicleDataEventStatusYes, - NAMES_maximumChangeVelocity:@33, - NAMES_multipleEvents:SDLVehicleDataEventStatusNo} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameEmergencyEventType:SDLEmergencyEventTypeFrontal, + SDLNameFuelCutoffStatus:SDLFuelCutoffStatusNormalOperation, + SDLNameRolloverEvent:SDLVehicleDataEventStatusYes, + SDLNameMaximumChangeVelocity:@33, + SDLNameMultipleEvents:SDLVehicleDataEventStatusNo} mutableCopy]; SDLEmergencyEvent* testStruct = [[SDLEmergencyEvent alloc] initWithDictionary:dict]; expect(testStruct.emergencyEventType).to(equal(SDLEmergencyEventTypeFrontal)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m index 8ce756486..35cc2b659 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m @@ -34,7 +34,7 @@ describe(@"Getter/Setter Tests", ^ { testStruct.vdop = @0; testStruct.actual = @NO; testStruct.satellites = @12; - testStruct.dimension = SDLDimension3d; + testStruct.dimension = SDLDimension3D; testStruct.altitude = @3000; testStruct.heading = @96; testStruct.speed = @64; @@ -53,31 +53,31 @@ describe(@"Getter/Setter Tests", ^ { expect(testStruct.vdop).to(equal(@0)); expect(testStruct.actual).to(equal(@NO)); expect(testStruct.satellites).to(equal(@12)); - expect(testStruct.dimension).to(equal(SDLDimension3d)); + expect(testStruct.dimension).to(equal(SDLDimension3D)); expect(testStruct.altitude).to(equal(@3000)); expect(testStruct.heading).to(equal(@96)); expect(testStruct.speed).to(equal(@64)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_longitudeDegrees:@31.41592653589793, - NAMES_latitudeDegrees:@45, - NAMES_utcYear:@2015, - NAMES_utcMonth:@1, - NAMES_utcDay:@26, - NAMES_utcHours:@23, - NAMES_utcMinutes:@59, - NAMES_utcSeconds:@59, - NAMES_compassDirection:SDLCompassDirectionSoutheast, - NAMES_pdop:@3.4, - NAMES_hdop:@9.9, - NAMES_vdop:@0, - NAMES_actual:@NO, - NAMES_satellites:@12, - NAMES_dimension:SDLDimension3d, - NAMES_altitude:@3000, - NAMES_heading:@96, - NAMES_speed:@64} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameLongitudeDegrees:@31.41592653589793, + SDLNameLatitudeDegrees:@45, + SDLNameUTCYear:@2015, + SDLNameUTCMonth:@1, + SDLNameUTCDay:@26, + SDLNameUTCHours:@23, + SDLNameUTCMinutes:@59, + SDLNameUTCSeconds:@59, + SDLNameCompassDirection:SDLCompassDirectionSoutheast, + SDLNamePDOP:@3.4, + SDLNameHDOP:@9.9, + SDLNameVDOP:@0, + SDLNameActual:@NO, + SDLNameSatellites:@12, + SDLNameDimension:SDLDimension3D, + SDLNameAltitude:@3000, + SDLNameHeading:@96, + SDLNameSpeed:@64} mutableCopy]; SDLGPSData* testStruct = [[SDLGPSData alloc] initWithDictionary:dict]; expect(testStruct.longitudeDegrees).to(equal(@31.41592653589793)); @@ -94,7 +94,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testStruct.vdop).to(equal(@0)); expect(testStruct.actual).to(equal(@NO)); expect(testStruct.satellites).to(equal(@12)); - expect(testStruct.dimension).to(equal(SDLDimension3d)); + expect(testStruct.dimension).to(equal(SDLDimension3D)); expect(testStruct.altitude).to(equal(@3000)); expect(testStruct.heading).to(equal(@96)); expect(testStruct.speed).to(equal(@64)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m index e9935bedf..4121992df 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m @@ -36,8 +36,8 @@ describe(@"SDLHMICapabilities struct", ^{ context(@"When initialized with a dictionary", ^{ beforeEach(^{ NSDictionary *structInitDict = @{ - NAMES_navigation: someNavigationState, - NAMES_phoneCall: somePhoneCallState + SDLNameNavigation: someNavigationState, + SDLNamePhoneCall: somePhoneCallState }; testStruct = [[SDLHMICapabilities alloc] initWithDictionary:[structInitDict mutableCopy]]; }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m index 3a9082c97..aed9830d4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m @@ -26,8 +26,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_allowed:[@[SDLHMILevelBackground, SDLHMILevelFull] copy], - NAMES_userDisallowed:[@[SDLHMILevelNone, SDLHMILevelLimited] copy]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameAllowed:[@[SDLHMILevelBackground, SDLHMILevelFull] copy], + SDLNameUserDisallowed:[@[SDLHMILevelNone, SDLHMILevelLimited] copy]} mutableCopy]; SDLHMIPermissions* testStruct = [[SDLHMIPermissions alloc] initWithDictionary:dict]; expect(testStruct.allowed).to(equal([@[SDLHMILevelBackground, SDLHMILevelFull] copy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m index c588bb0f6..fe7a21198 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m @@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_lowBeamsOn:@YES, - NAMES_highBeamsOn:@NO, - NAMES_ambientLightSensorStatus:SDLAmbientLightStatusTwilight3} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameLowBeamsOn:@YES, + SDLNameHighBeamsOn:@NO, + SDLNameAmbientLightSensorStatus:SDLAmbientLightStatusTwilight3} mutableCopy]; SDLHeadLampStatus* testStruct = [[SDLHeadLampStatus alloc] initWithDictionary:dict]; expect(testStruct.lowBeamsOn).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m index f18520bf4..d555c8520 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m @@ -24,22 +24,22 @@ describe(@"Getter/Setter Tests", ^ { SDLImageField* testStruct = [[SDLImageField alloc] init]; testStruct.name = SDLImageFieldNameTurnIcon; - testStruct.imageTypeSupported = [@[SDLFileTypeGraphicPng, SDLFileTypeGraphicJpeg] copy]; + testStruct.imageTypeSupported = [@[SDLFileTypeGraphicPNG, SDLFileTypeGraphicJPEG] copy]; testStruct.imageResolution = resolution; expect(testStruct.name).to(equal(SDLImageFieldNameTurnIcon)); - expect(testStruct.imageTypeSupported).to(equal([@[SDLFileTypeGraphicPng, SDLFileTypeGraphicJpeg] copy])); + expect(testStruct.imageTypeSupported).to(equal([@[SDLFileTypeGraphicPNG, SDLFileTypeGraphicJPEG] copy])); expect(testStruct.imageResolution).to(equal(resolution)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_name:SDLImageFieldNameTurnIcon, - NAMES_imageTypeSupported:[@[SDLFileTypeGraphicPng, SDLFileTypeGraphicJpeg] copy], - NAMES_imageResolution:resolution} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameName:SDLImageFieldNameTurnIcon, + SDLNameImageTypeSupported:[@[SDLFileTypeGraphicPNG, SDLFileTypeGraphicJPEG] copy], + SDLNameImageResolution:resolution} mutableCopy]; SDLImageField* testStruct = [[SDLImageField alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal(SDLImageFieldNameTurnIcon)); - expect(testStruct.imageTypeSupported).to(equal([@[SDLFileTypeGraphicPng, SDLFileTypeGraphicJpeg] copy])); + expect(testStruct.imageTypeSupported).to(equal([@[SDLFileTypeGraphicPNG, SDLFileTypeGraphicJPEG] copy])); expect(testStruct.imageResolution).to(equal(resolution)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m index 7cd754b09..f1364c819 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m @@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_value:@"value", - NAMES_imageType:SDLImageTypeStatic} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameValue:@"value", + SDLNameImageType:SDLImageTypeStatic} mutableCopy]; SDLImage* testStruct = [[SDLImage alloc] initWithDictionary:dict]; expect(testStruct.value).to(equal(@"value")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m index b8eb3092a..4a8dc21bb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m @@ -22,28 +22,28 @@ describe(@"Getter/Setter Tests", ^ { SDLKeyboardProperties* testStruct = [[SDLKeyboardProperties alloc] init]; testStruct.language = SDLLanguageDaDk; - testStruct.keyboardLayout = SDLKeyboardLayoutQwertz; + testStruct.keyboardLayout = SDLKeyboardLayoutQWERTZ; testStruct.keypressMode = SDLKeypressModeResendCurrentEntry; testStruct.limitedCharacterList = [@[@"s", @"r", @"f", @"q"] mutableCopy]; testStruct.autoCompleteText = @"Auto Carrot"; expect(testStruct.language).to(equal(SDLLanguageDaDk)); - expect(testStruct.keyboardLayout).to(equal(SDLKeyboardLayoutQwertz)); + expect(testStruct.keyboardLayout).to(equal(SDLKeyboardLayoutQWERTZ)); expect(testStruct.keypressMode).to(equal(SDLKeypressModeResendCurrentEntry)); expect(testStruct.limitedCharacterList).to(equal([@[@"s", @"r", @"f", @"q"] mutableCopy])); expect(testStruct.autoCompleteText).to(equal(@"Auto Carrot")); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_language:SDLLanguageDaDk, - NAMES_keyboardLayout:SDLKeyboardLayoutQwertz, - NAMES_keypressMode:SDLKeypressModeResendCurrentEntry, - NAMES_limitedCharacterList:[@[@"s", @"r", @"f", @"q"] mutableCopy], - NAMES_autoCompleteText:@"Auto Carrot"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameLanguage:SDLLanguageDaDk, + SDLNameKeyboardLayout:SDLKeyboardLayoutQWERTZ, + SDLNameKeypressMode:SDLKeypressModeResendCurrentEntry, + SDLNameLimitedCharacterList:[@[@"s", @"r", @"f", @"q"] mutableCopy], + SDLNameAutoCompleteText:@"Auto Carrot"} mutableCopy]; SDLKeyboardProperties* testStruct = [[SDLKeyboardProperties alloc] initWithDictionary:dict]; expect(testStruct.language).to(equal(SDLLanguageDaDk)); - expect(testStruct.keyboardLayout).to(equal(SDLKeyboardLayoutQwertz)); + expect(testStruct.keyboardLayout).to(equal(SDLKeyboardLayoutQWERTZ)); expect(testStruct.keypressMode).to(equal(SDLKeypressModeResendCurrentEntry)); expect(testStruct.limitedCharacterList).to(equal([@[@"s", @"r", @"f", @"q"] mutableCopy])); expect(testStruct.autoCompleteText).to(equal(@"Auto Carrot")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m index 3d6bc6462..72b8029d4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_parentID:@504320489, - NAMES_position:@256, - NAMES_menuName:@"Menu"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameParentId:@504320489, + SDLNamePosition:@256, + SDLNameMenuName:@"Menu"} mutableCopy]; SDLMenuParams* testStruct = [[SDLMenuParams alloc] initWithDictionary:dict]; expect(testStruct.parentID).to(equal(@504320489)); @@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m index bc0fb0448..6d0a462fb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m @@ -25,7 +25,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_e911Override:SDLVehicleDataStatusOn} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameE911Override:SDLVehicleDataStatusOn} mutableCopy]; SDLMyKey* testStruct = [[SDLMyKey alloc] initWithDictionary:dict]; expect(testStruct.e911Override).to(equal(SDLVehicleDataStatusOn)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m index 5c1e36d11..92b6a5ef6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m @@ -26,8 +26,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_allowed:[@[SDLHMILevelBackground, SDLHMILevelFull] copy], - NAMES_userDisallowed:[@[SDLHMILevelNone, SDLHMILevelLimited] copy]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameAllowed:[@[SDLHMILevelBackground, SDLHMILevelFull] copy], + SDLNameUserDisallowed:[@[SDLHMILevelNone, SDLHMILevelLimited] copy]} mutableCopy]; SDLParameterPermissions* testStruct = [[SDLParameterPermissions alloc] initWithDictionary:dict]; expect(testStruct.allowed).to(equal([@[SDLHMILevelBackground, SDLHMILevelFull] copy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m index 0e5b367d1..ee502ebf8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m @@ -32,9 +32,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_rpcName:@"RPCNameThing", - NAMES_hmiPermissions:hmiPermissions, - NAMES_parameterPermissions:parameterPermissions} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRPCName:@"RPCNameThing", + SDLNameHMIPermissions:hmiPermissions, + SDLNameParameterPermissions:parameterPermissions} mutableCopy]; SDLPermissionItem* testStruct = [[SDLPermissionItem alloc] initWithDictionary:dict]; expect(testStruct.rpcName).to(equal(@"RPCNameThing")); @@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m index f473c60b6..16330022f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m @@ -23,7 +23,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_onScreenPresetsAvailable:@YES} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameOnScreenPresetsAvailable:@YES} mutableCopy]; SDLPresetBankCapabilities* testStruct = [[SDLPresetBankCapabilities alloc] initWithDictionary:dict]; expect(testStruct.onScreenPresetsAvailable).to(equal(@YES)); @@ -36,4 +36,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m index 0438b8a21..e24ee7ee8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m @@ -31,8 +31,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_resolution:resolution, - NAMES_touchEventAvailable:capabilities} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResolution:resolution, + SDLNameTouchEventAvailable:capabilities} mutableCopy]; SDLScreenParams* testStruct = [[SDLScreenParams alloc] initWithDictionary:dict]; expect(testStruct.resolution).to(equal(resolution)); @@ -47,4 +47,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m index af6f85fbd..69c0d347d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m @@ -24,7 +24,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_status:SDLComponentVolumeStatusLow} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameStatus:SDLComponentVolumeStatusLow} mutableCopy]; SDLSingleTireStatus* testStruct = [[SDLSingleTireStatus alloc] initWithDictionary:dict]; expect(testStruct.status).to(equal(SDLComponentVolumeStatusLow)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m index 0cb200414..6301272d6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m @@ -29,10 +29,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_shortPressAvailable:@NO, - NAMES_longPressAvailable:@YES, - NAMES_upDownAvailable:@NO, - NAMES_imageSupported:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameShortPressAvailable:@NO, + SDLNameLongPressAvailable:@YES, + SDLNameUpDownAvailable:@NO, + SDLNameImageSupported:@NO} mutableCopy]; SDLSoftButtonCapabilities* testStruct = [[SDLSoftButtonCapabilities alloc] initWithDictionary:dict]; expect(testStruct.shortPressAvailable).to(equal(@NO)); @@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m index d5b9fda4f..df938b7dc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m @@ -39,12 +39,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_type:SDLSoftButtonTypeImage, - NAMES_text:@"Button", - NAMES_image:image, - NAMES_isHighlighted:@YES, - NAMES_softButtonID:@5423, - NAMES_systemAction:SDLSystemActionKeepContext} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameType:SDLSoftButtonTypeImage, + SDLNameText:@"Button", + SDLNameImage:image, + SDLNameIsHighlighted:@YES, + SDLNameSoftButtonId:@5423, + SDLNameSystemAction:SDLSystemActionKeepContext} mutableCopy]; SDLSoftButton* testStruct = [[SDLSoftButton alloc] initWithDictionary:dict]; expect(testStruct.type).to(equal(SDLSoftButtonTypeImage)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m index 476fc6500..201863048 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_hours:@22, - NAMES_minutes:@39, - NAMES_seconds:@11} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameHours:@22, + SDLNameMinutes:@39, + SDLNameSeconds:@11} mutableCopy]; SDLStartTime* testStruct = [[SDLStartTime alloc] initWithDictionary:dict]; expect(testStruct.hours).to(equal(@22)); @@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m index 56c74cd18..75e06f8de 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m @@ -25,8 +25,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_majorVersion:@4, - NAMES_minorVersion:@532} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameMajorVersion:@4, + SDLNameMinorVersion:@532} mutableCopy]; SDLSyncMsgVersion* testStruct = [[SDLSyncMsgVersion alloc] initWithDictionary:dict]; expect(testStruct.majorVersion).to(equal(@4)); @@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m index 1fceb2516..52fef2d53 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m @@ -20,19 +20,19 @@ describe(@"Getter/Setter Tests", ^ { SDLTTSChunk* testStruct = [[SDLTTSChunk alloc] init]; testStruct.text = @"TEXT"; - testStruct.type = SDLSpeechCapabilitiesPreRecorded; + testStruct.type = SDLSpeechCapabilitiesPrerecorded; expect(testStruct.text).to(equal(@"TEXT")); - expect(testStruct.type).to(equal(SDLSpeechCapabilitiesPreRecorded)); + expect(testStruct.type).to(equal(SDLSpeechCapabilitiesPrerecorded)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_text:@"TEXT", - NAMES_type:SDLSpeechCapabilitiesPreRecorded} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameText:@"TEXT", + SDLNameType:SDLSpeechCapabilitiesPrerecorded} mutableCopy]; SDLTTSChunk* testStruct = [[SDLTTSChunk alloc] initWithDictionary:dict]; expect(testStruct.text).to(equal(@"TEXT")); - expect(testStruct.type).to(equal(SDLSpeechCapabilitiesPreRecorded)); + expect(testStruct.type).to(equal(SDLSpeechCapabilitiesPrerecorded)); }); it(@"Should return nil if not set", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m index d62fedc42..094c78994 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m @@ -32,10 +32,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_name:SDLTextFieldNameTertiaryText, - NAMES_characterSet:SDLCharacterSetType5Set, - NAMES_width:@111, - NAMES_rows:@4} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameName:SDLTextFieldNameTertiaryText, + SDLNameCharacterSet:SDLCharacterSetType5Set, + SDLNameWidth:@111, + SDLNameRows:@4} mutableCopy]; SDLTextField* testStruct = [[SDLTextField alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal(SDLTextFieldNameTertiaryText)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m index ed8353b8d..ebe9eb7e3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m @@ -44,13 +44,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_pressureTelltale:SDLWarningLightStatusOff, - NAMES_leftFront:tire1, - NAMES_rightFront:tire2, - NAMES_leftRear:tire3, - NAMES_rightRear:tire4, - NAMES_innerLeftRear:tire5, - NAMES_innerRightRear:tire6} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNamePressureTelltale:SDLWarningLightStatusOff, + SDLNameLeftFront:tire1, + SDLNameRightFront:tire2, + SDLNameLeftRear:tire3, + SDLNameRightRear:tire4, + SDLNameInnerLeftRear:tire5, + SDLNameInnerRightRear:tire6} mutableCopy]; SDLTireStatus* testStruct = [[SDLTireStatus alloc] initWithDictionary:dict]; expect(testStruct.pressureTelltale).to(equal(SDLWarningLightStatusOff)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m index eedca3a9b..0431fe455 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m @@ -25,8 +25,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_x:@67, - NAMES_y:@362} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameX:@67, + SDLNameY:@362} mutableCopy]; SDLTouchCoord* testStruct = [[SDLTouchCoord alloc] initWithDictionary:dict]; expect(testStruct.x).to(equal(@67)); @@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m index a8b8c73e0..cdda41afc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_pressAvailable:@YES, - NAMES_multiTouchAvailable:@NO, - NAMES_doublePressAvailable:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNamePressAvailable:@YES, + SDLNameMultiTouchAvailable:@NO, + SDLNameDoublePressAvailable:@NO} mutableCopy]; SDLTouchEventCapabilities* testStruct = [[SDLTouchEventCapabilities alloc] initWithDictionary:dict]; expect(testStruct.pressAvailable).to(equal(@YES)); @@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m index c95cfb525..d21dedb97 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m @@ -30,9 +30,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_id:@3, - NAMES_ts:[@[@23, @52, @41345234] mutableCopy], - NAMES_c:[@[coord] mutableCopy]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameId:@3, + SDLNameTimestamp:[@[@23, @52, @41345234] mutableCopy], + SDLNameCoordinate:[@[coord] mutableCopy]} mutableCopy]; SDLTouchEvent* testStruct = [[SDLTouchEvent alloc] initWithDictionary:dict]; expect(testStruct.touchEventId).to(equal(@3)); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m index 07152ad92..7b44c251e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m @@ -28,8 +28,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_navigationText:@"NAVTEXT", - NAMES_turnIcon:image} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNavigationText:@"NAVTEXT", + SDLNameTurnIcon:image} mutableCopy]; SDLTurn* testStruct = [[SDLTurn alloc] initWithDictionary:dict]; expect(testStruct.navigationText).to(equal(@"NAVTEXT")); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m index 3d417dc32..fba4445bc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m @@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_dataType:SDLVehicleDataTypeAirbagStatus, - NAMES_resultCode:SDLVehicleDataResultCodeDisallowed} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameDataType:SDLVehicleDataTypeAirbagStatus, + SDLNameResultCode:SDLVehicleDataResultCodeDisallowed} mutableCopy]; SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithDictionary:dict]; expect(testStruct.dataType).to(equal(SDLVehicleDataTypeAirbagStatus)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m index 9a282b72e..0eaa6e698 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m @@ -29,10 +29,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_make:@"Make", - NAMES_model:@"Model", - NAMES_modelYear:@"3.141*10^36", - NAMES_trim:@"AE"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameMake:@"Make", + SDLNameModel:@"Model", + SDLNameModelYear:@"3.141*10^36", + SDLNameTrim:@"AE"} mutableCopy]; SDLVehicleType* testStruct = [[SDLVehicleType alloc] initWithDictionary:dict]; expect(testStruct.make).to(equal(@"Make")); @@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m index e76be2558..6afde1d0a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m @@ -31,9 +31,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_text:@"DON'T PANIC", - NAMES_image:image, - NAMES_position:@42} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameText:@"DON'T PANIC", + SDLNameImage:image, + SDLNamePosition:@42} mutableCopy]; SDLVRHelpItem* testStruct = [[SDLVRHelpItem alloc] initWithDictionary:dict]; expect(testStruct.text).to(equal(@"DON'T PANIC")); @@ -50,4 +50,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m index 477925141..57dbd3513 100644 --- a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m @@ -21,13 +21,13 @@ describe(@"Readonly Property Tests", ^ { }); it(@"Should get correctly when initialized with dictionary", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_notification: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification: + @{SDLNameParameters: @{@"name":@"George"}, - NAMES_operation_name:@"Poorly Named"}} mutableCopy]]; + SDLNameOperationName:@"Poorly Named"}} mutableCopy]]; expect(testMessage.name).to(equal(@"Poorly Named")); - expect(testMessage.messageType).to(equal(NAMES_notification)); + expect(testMessage.messageType).to(equal(SDLNameNotification)); }); }); @@ -41,10 +41,10 @@ describe(@"Parameter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_response: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameResponse: + @{SDLNameParameters: @{@"age":@25}, - NAMES_operation_name:@"Nameless"}} mutableCopy]]; + SDLNameOperationName:@"Nameless"}} mutableCopy]]; expect([testMessage getParameters:@"age"]).to(equal(@25)); }); @@ -66,10 +66,10 @@ describe(@"FunctionName Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_request: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameRequest: + @{SDLNameParameters: @{@"age":@25}, - NAMES_operation_name:@"DoNothing"}} mutableCopy]]; + SDLNameOperationName:@"DoNothing"}} mutableCopy]]; expect([testMessage getFunctionName]).to(equal(@"DoNothing")); @@ -79,8 +79,8 @@ describe(@"FunctionName Tests", ^ { }); it(@"Should be nil if not set", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_notification: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification: + @{SDLNameParameters: @{}}} mutableCopy]]; expect([testMessage getFunctionName]).to(beNil()); }); @@ -97,10 +97,10 @@ describe(@"BulkDataTests", ^ { }); it(@"Should get correctly when initialized", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_notification: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification: + @{SDLNameParameters: @{}}, - NAMES_bulkData:[NSData dataWithBytes:"ImageData" length:strlen("ImageData")]} mutableCopy]]; + SDLNameBulkData:[NSData dataWithBytes:"ImageData" length:strlen("ImageData")]} mutableCopy]]; expect(testMessage.bulkData).to(equal([NSData dataWithBytes:"ImageData" length:strlen("ImageData")])); }); |