diff options
author | Joel Fischer <joel@livioradio.com> | 2015-04-07 15:06:19 -0400 |
---|---|---|
committer | Joel Fischer <joel@livioradio.com> | 2015-04-07 15:06:19 -0400 |
commit | aa286fbc47a7daeffac49957699c41a7b11bf3ce (patch) | |
tree | 6fb8b1d84b2a1850eaa6a5f6168b98254a2332dd /SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/StructSpecs | |
parent | 5964c1a7d85663ef2698713561c39dd3077faf7c (diff) | |
download | sdl_ios-aa286fbc47a7daeffac49957699c41a7b11bf3ce.tar.gz |
Change SDLHMILevel method names to match
HMI_FULL -> FULL, etc.
Change code referencing these methods, including tests
Diffstat (limited to 'SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/StructSpecs')
2 files changed, 16 insertions, 16 deletions
diff --git a/SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m b/SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m index 1fb6c031a..258a98fce 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m +++ b/SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m @@ -18,20 +18,20 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { SDLHMIPermissions* testStruct = [[SDLHMIPermissions alloc] init]; - testStruct.allowed = [@[[SDLHMILevel HMI_BACKGROUND], [SDLHMILevel HMI_FULL]] mutableCopy]; - testStruct.userDisallowed = [@[[SDLHMILevel HMI_NONE], [SDLHMILevel HMI_LIMITED]] mutableCopy]; + testStruct.allowed = [@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] mutableCopy]; + testStruct.userDisallowed = [@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] mutableCopy]; - expect(testStruct.allowed).to(equal([@[[SDLHMILevel HMI_BACKGROUND], [SDLHMILevel HMI_FULL]] mutableCopy])); - expect(testStruct.userDisallowed).to(equal([@[[SDLHMILevel HMI_NONE], [SDLHMILevel HMI_LIMITED]] mutableCopy])); + expect(testStruct.allowed).to(equal([@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] mutableCopy])); + expect(testStruct.userDisallowed).to(equal([@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] mutableCopy])); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_allowed:[@[[SDLHMILevel HMI_BACKGROUND], [SDLHMILevel HMI_FULL]] mutableCopy], - NAMES_userDisallowed:[@[[SDLHMILevel HMI_NONE], [SDLHMILevel HMI_LIMITED]] mutableCopy]} mutableCopy]; + NSMutableDictionary* dict = [@{NAMES_allowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] mutableCopy], + NAMES_userDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] mutableCopy]} mutableCopy]; SDLHMIPermissions* testStruct = [[SDLHMIPermissions alloc] initWithDictionary:dict]; - expect(testStruct.allowed).to(equal([@[[SDLHMILevel HMI_BACKGROUND], [SDLHMILevel HMI_FULL]] mutableCopy])); - expect(testStruct.userDisallowed).to(equal([@[[SDLHMILevel HMI_NONE], [SDLHMILevel HMI_LIMITED]] mutableCopy])); + expect(testStruct.allowed).to(equal([@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] mutableCopy])); + expect(testStruct.userDisallowed).to(equal([@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] mutableCopy])); }); it(@"Should return nil if not set", ^ { diff --git a/SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m b/SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m index 229cd864f..231b5934b 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m +++ b/SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m @@ -18,20 +18,20 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { SDLParameterPermissions* testStruct = [[SDLParameterPermissions alloc] init]; - testStruct.allowed = [@[[SDLHMILevel HMI_BACKGROUND], [SDLHMILevel HMI_FULL]] mutableCopy]; - testStruct.userDisallowed = [@[[SDLHMILevel HMI_NONE], [SDLHMILevel HMI_LIMITED]] mutableCopy]; + testStruct.allowed = [@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] mutableCopy]; + testStruct.userDisallowed = [@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] mutableCopy]; - expect(testStruct.allowed).to(equal([@[[SDLHMILevel HMI_BACKGROUND], [SDLHMILevel HMI_FULL]] mutableCopy])); - expect(testStruct.userDisallowed).to(equal([@[[SDLHMILevel HMI_NONE], [SDLHMILevel HMI_LIMITED]] mutableCopy])); + expect(testStruct.allowed).to(equal([@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] mutableCopy])); + expect(testStruct.userDisallowed).to(equal([@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] mutableCopy])); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_allowed:[@[[SDLHMILevel HMI_BACKGROUND], [SDLHMILevel HMI_FULL]] mutableCopy], - NAMES_userDisallowed:[@[[SDLHMILevel HMI_NONE], [SDLHMILevel HMI_LIMITED]] mutableCopy]} mutableCopy]; + NSMutableDictionary* dict = [@{NAMES_allowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] mutableCopy], + NAMES_userDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] mutableCopy]} mutableCopy]; SDLParameterPermissions* testStruct = [[SDLParameterPermissions alloc] initWithDictionary:dict]; - expect(testStruct.allowed).to(equal([@[[SDLHMILevel HMI_BACKGROUND], [SDLHMILevel HMI_FULL]] mutableCopy])); - expect(testStruct.userDisallowed).to(equal([@[[SDLHMILevel HMI_NONE], [SDLHMILevel HMI_LIMITED]] mutableCopy])); + expect(testStruct.allowed).to(equal([@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] mutableCopy])); + expect(testStruct.userDisallowed).to(equal([@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] mutableCopy])); }); it(@"Should return nil if not set", ^ { |