Merge remote-tracking branch 'origin/develop' into feature/issue_247_objc_generics

* origin/develop:
  reverting function renaming in SDLRPCMessage.
  Fixed accidental function renaming.
  Updated SDLFunctionID to project instead of private.
  Updated SDLFunctionID to be private.
  Fixed remaining failing tests.
  Updated SDLFunctionID to be a singleton.
  Fixed issue with tests not passing
  Updated naming of some constant.
  Removed extensibility from SDLName
  Reverted SDLNames to Project instead of Public.
  Replaced all defines with constant strings of the SDLName typedef. Also modified SDLFunctionID to use a static dictionary.

# Conflicts:
#	SmartDeviceLink/SDLAddCommand.m
#	SmartDeviceLink/SDLAlert.m
#	SmartDeviceLink/SDLAlertManeuver.m
#	SmartDeviceLink/SDLChangeRegistration.m
#	SmartDeviceLink/SDLChoice.m
#	SmartDeviceLink/SDLCreateInteractionChoiceSet.m
#	SmartDeviceLink/SDLDiagnosticMessage.m
#	SmartDeviceLink/SDLDiagnosticMessageResponse.m
#	SmartDeviceLink/SDLDisplayCapabilities.m
#	SmartDeviceLink/SDLEncodedSyncPData.m
#	SmartDeviceLink/SDLGetDTCsResponse.m
#	SmartDeviceLink/SDLHMIPermissions.m
#	SmartDeviceLink/SDLImageField.m
#	SmartDeviceLink/SDLKeyboardProperties.m
#	SmartDeviceLink/SDLListFilesResponse.m
#	SmartDeviceLink/SDLOnEncodedSyncPData.m
#	SmartDeviceLink/SDLOnPermissionsChange.m
#	SmartDeviceLink/SDLOnTouchEvent.m
#	SmartDeviceLink/SDLParameterPermissions.m
#	SmartDeviceLink/SDLPerformAudioPassThru.m
#	SmartDeviceLink/SDLPerformInteraction.m
#	SmartDeviceLink/SDLRPCStruct.m
#	SmartDeviceLink/SDLReadDID.m
#	SmartDeviceLink/SDLReadDIDResponse.m
#	SmartDeviceLink/SDLRegisterAppInterface.m
#	SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
#	SmartDeviceLink/SDLResetGlobalProperties.m
#	SmartDeviceLink/SDLScrollableMessage.m
#	SmartDeviceLink/SDLSendLocation.m
#	SmartDeviceLink/SDLSetDisplayLayoutResponse.m
#	SmartDeviceLink/SDLSetGlobalProperties.m
#	SmartDeviceLink/SDLShow.m
#	SmartDeviceLink/SDLShowConstantTBT.m
#	SmartDeviceLink/SDLSlider.m
#	SmartDeviceLink/SDLSpeak.m
#	SmartDeviceLink/SDLTouchEvent.m
#	SmartDeviceLink/SDLUpdateTurnList.m
#	SmartDeviceLink/SDLV2ProtocolMessage.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m

1 files changed, 8 insertions, 7 deletions

diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
index f93ebfc01..0119291d9 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
@@ -34,13 +34,14 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should get correctly when initialized", ^ {
-        NSMutableDictionary<NSString *, id> *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<NSString *, id> *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));