diff options
author | NicoleYarroch <nicole@livio.io> | 2019-02-27 15:49:12 -0500 |
---|---|---|
committer | NicoleYarroch <nicole@livio.io> | 2019-02-27 15:49:12 -0500 |
commit | c5731dbe636043f0a0a2e9b07480bee5878e3bcd (patch) | |
tree | 41b5df21b497993d7dcb6071f558731330c345de | |
parent | 445ae08b4a0f058ade1d07fb124f98bd10baca6c (diff) | |
download | sdl_ios-c5731dbe636043f0a0a2e9b07480bee5878e3bcd.tar.gz |
Added `AuthToken` key to ControlFramePayloadConstants
Added test cases for the SDLControlFramePayloadConstants class
4 files changed, 50 insertions, 4 deletions
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj index 35262d40d..c39332552 100644 --- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj +++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj @@ -1241,6 +1241,7 @@ 8877F5EE1F34A72200DC128A /* SDLSendHapticDataResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 8877F5EC1F34A72200DC128A /* SDLSendHapticDataResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8877F5EF1F34A72200DC128A /* SDLSendHapticDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 8877F5ED1F34A72200DC128A /* SDLSendHapticDataResponse.m */; }; 8877F5F11F34AA2D00DC128A /* SDLSendHapticDataResponseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8877F5F01F34AA2D00DC128A /* SDLSendHapticDataResponseSpec.m */; }; + 887BE4D422272B2200B397C2 /* SDLControlFramePayloadConstantsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 887BE4D322272B2200B397C2 /* SDLControlFramePayloadConstantsSpec.m */; }; 88802FE920853AE600E9EBC6 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 5D9FDA971F2A7D3F00A495C8 /* LICENSE */; }; 88802FEA20853AE600E9EBC6 /* SDLAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5D6F7A3D1BC811FC0070BF37 /* SDLAssets.xcassets */; }; 88802FEB20853AE600E9EBC6 /* SDLLockScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5D616B481D552F7A00553F6B /* SDLLockScreen.storyboard */; }; @@ -2767,6 +2768,7 @@ 8877F5EC1F34A72200DC128A /* SDLSendHapticDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSendHapticDataResponse.h; sourceTree = "<group>"; }; 8877F5ED1F34A72200DC128A /* SDLSendHapticDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSendHapticDataResponse.m; sourceTree = "<group>"; }; 8877F5F01F34AA2D00DC128A /* SDLSendHapticDataResponseSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSendHapticDataResponseSpec.m; sourceTree = "<group>"; }; + 887BE4D322272B2200B397C2 /* SDLControlFramePayloadConstantsSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLControlFramePayloadConstantsSpec.m; sourceTree = "<group>"; }; 88802FEF20853AE600E9EBC6 /* SmartDeviceLinkSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SmartDeviceLinkSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8881AFAA2225D61900EA870B /* SDLSetCloudAppProperties.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLSetCloudAppProperties.h; sourceTree = "<group>"; }; 8881AFAB2225D61900EA870B /* SDLSetCloudAppProperties.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLSetCloudAppProperties.m; sourceTree = "<group>"; }; @@ -3389,6 +3391,7 @@ 1680B10A1A9CD7AD00DBD79E /* SDLProtocolMessageSpec.m */, 1680B10C1A9CD7AD00DBD79E /* SDLV1ProtocolMessageSpec.m */, 1680B10D1A9CD7AD00DBD79E /* SDLV2ProtocolMessageSpec.m */, + 887BE4D322272B2200B397C2 /* SDLControlFramePayloadConstantsSpec.m */, ); path = MessageSpecs; sourceTree = "<group>"; @@ -7232,6 +7235,7 @@ 162E82D41A9BDE8A00906325 /* SDLCharacterSetSpec.m in Sources */, 162E830F1A9BDE8B00906325 /* SDLOnAppInterfaceUnregisteredSpec.m in Sources */, 162E83971A9BDE8B00906325 /* SDLVehicleTypeSpec.m in Sources */, + 887BE4D422272B2200B397C2 /* SDLControlFramePayloadConstantsSpec.m in Sources */, 885468382225CBA400994D8D /* SDLCloudAppPropertiesSpec.m in Sources */, 88A795D5210678E000056542 /* SDLStaticIconNameSpec.m in Sources */, 1680B1131A9CD7AD00DBD79E /* SDLProtocolHeaderSpec.m in Sources */, diff --git a/SmartDeviceLink/SDLControlFramePayloadConstants.h b/SmartDeviceLink/SDLControlFramePayloadConstants.h index 37eb51dfc..e0bd1d5e8 100644 --- a/SmartDeviceLink/SDLControlFramePayloadConstants.h +++ b/SmartDeviceLink/SDLControlFramePayloadConstants.h @@ -25,3 +25,4 @@ extern char *const SDLControlFrameAudioServiceTransportsKey; extern char *const SDLControlFrameVideoServiceTransportsKey; extern char *const SDLControlFrameTCPIPAddressKey; extern char *const SDLControlFrameTCPPortKey; +extern char *const SDLControlFrameAuthTokenKey; diff --git a/SmartDeviceLink/SDLControlFramePayloadConstants.m b/SmartDeviceLink/SDLControlFramePayloadConstants.m index 41048765d..c365c78a8 100644 --- a/SmartDeviceLink/SDLControlFramePayloadConstants.m +++ b/SmartDeviceLink/SDLControlFramePayloadConstants.m @@ -14,14 +14,15 @@ int64_t const SDLControlFrameInt64NotFound = -1; char *const SDLControlFrameProtocolVersionKey = "protocolVersion"; char *const SDLControlFrameHashIdKey = "hashId"; char *const SDLControlFrameMTUKey = "mtu"; -char *const SDLControlFrameReasonKey = "reason"; +char *const SDLControlFrameSecondaryTransportsKey = "secondaryTransports"; +char *const SDLControlFrameAudioServiceTransportsKey = "audioServiceTransports"; +char *const SDLControlFrameVideoServiceTransportsKey = "videoServiceTransports"; +char *const SDLControlFrameAuthTokenKey = "authToken"; char *const SDLControlFrameRejectedParams = "rejectedParams"; +char *const SDLControlFrameReasonKey = "reason"; char *const SDLControlFrameVideoProtocolKey = "videoProtocol"; char *const SDLControlFrameVideoCodecKey = "videoCodec"; char *const SDLControlFrameHeightKey = "height"; char *const SDLControlFrameWidthKey = "width"; -char *const SDLControlFrameSecondaryTransportsKey = "secondaryTransports"; -char *const SDLControlFrameAudioServiceTransportsKey = "audioServiceTransports"; -char *const SDLControlFrameVideoServiceTransportsKey = "videoServiceTransports"; char *const SDLControlFrameTCPIPAddressKey = "tcpIpAddress"; char *const SDLControlFrameTCPPortKey = "tcpPort"; diff --git a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLControlFramePayloadConstantsSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLControlFramePayloadConstantsSpec.m new file mode 100644 index 000000000..dba3e9a8b --- /dev/null +++ b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLControlFramePayloadConstantsSpec.m @@ -0,0 +1,40 @@ +// +// SDLControlFramePayloadConstantsSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/27/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLControlFramePayloadConstants.h" + +QuickSpecBegin(SDLControlFramePayloadConstantsSpec) + +describe(@"Individual Enum Value Tests", ^ { + it(@"Should match internal values", ^ { + expect(SDLControlFrameInt32NotFound).to(equal(-1)); + expect(SDLControlFrameInt64NotFound).to(equal(-1)); + expect(SDLControlFrameProtocolVersionKey).to(equal(@"protocolVersion")); + expect(SDLControlFrameHashIdKey).to(equal(@"hashId")); + expect(SDLControlFrameMTUKey).to(equal(@"mtu")); + expect(SDLControlFrameSecondaryTransportsKey).to(equal(@"secondaryTransports")); + expect(SDLControlFrameAudioServiceTransportsKey).to(equal(@"audioServiceTransports")); + expect(SDLControlFrameVideoServiceTransportsKey).to(equal(@"videoServiceTransports")); + expect(SDLControlFrameAuthTokenKey).to(equal(@"authToken")); + expect(SDLControlFrameRejectedParams).to(equal(@"rejectedParams")); + expect(SDLControlFrameReasonKey).to(equal(@"reason")); + expect(SDLControlFrameVideoProtocolKey).to(equal(@"videoProtocol")); + expect(SDLControlFrameVideoCodecKey).to(equal(@"videoCodec")); + expect(SDLControlFrameHeightKey).to(equal(@"height")); + expect(SDLControlFrameWidthKey).to(equal(@"width")); + expect(SDLControlFrameTCPIPAddressKey).to(equal(@"tcpIpAddress")); + expect(SDLControlFrameTCPPortKey).to(equal(@"tcpPort")); + }); +}); + +QuickSpecEnd + + |