diff options
author | Muller, Alexander (A.) <amulle19@ford.com> | 2016-10-14 11:51:24 -0700 |
---|---|---|
committer | Muller, Alexander (A.) <amulle19@ford.com> | 2016-10-14 11:51:24 -0700 |
commit | 1dd5e8372bdd79d769cd880303520cdcfb20e801 (patch) | |
tree | 34d10dc154c679b903bfe8907137d4095530c7e3 | |
parent | 8587f21bcfb2326f291c4fea22f2e5f6ed61aa58 (diff) | |
download | sdl_ios-1dd5e8372bdd79d769cd880303520cdcfb20e801.tar.gz |
Renamed some enums to improve legibility.
17 files changed, 66 insertions, 66 deletions
diff --git a/SmartDeviceLink/SDLCharacterSet.h b/SmartDeviceLink/SDLCharacterSet.h index c5654f96f..7dff6dbaf 100644 --- a/SmartDeviceLink/SDLCharacterSet.h +++ b/SmartDeviceLink/SDLCharacterSet.h @@ -11,11 +11,11 @@ */ typedef SDLEnum SDLCharacterSet NS_STRING_ENUM; -extern SDLCharacterSet const SDLCharacterSetType2Set; +extern SDLCharacterSet const SDLCharacterSetType2; -extern SDLCharacterSet const SDLCharacterSetType5Set; +extern SDLCharacterSet const SDLCharacterSetType5; -extern SDLCharacterSet const SDLCharacterSetCID1Set; +extern SDLCharacterSet const SDLCharacterSetCID1; -extern SDLCharacterSet const SDLCharacterSetCID2Set; +extern SDLCharacterSet const SDLCharacterSetCID2; diff --git a/SmartDeviceLink/SDLCharacterSet.m b/SmartDeviceLink/SDLCharacterSet.m index 2b0d4a820..64733c0dc 100644 --- a/SmartDeviceLink/SDLCharacterSet.m +++ b/SmartDeviceLink/SDLCharacterSet.m @@ -4,7 +4,7 @@ #import "SDLCharacterSet.h" -SDLCharacterSet const SDLCharacterSetType2Set = @"TYPE2SET"; -SDLCharacterSet const SDLCharacterSetType5Set = @"TYPE5SET"; -SDLCharacterSet const SDLCharacterSetCID1Set = @"CID1SET"; -SDLCharacterSet const SDLCharacterSetCID2Set = @"CID2SET"; +SDLCharacterSet const SDLCharacterSetType2 = @"TYPE2SET"; +SDLCharacterSet const SDLCharacterSetType5 = @"TYPE5SET"; +SDLCharacterSet const SDLCharacterSetCID1 = @"CID1SET"; +SDLCharacterSet const SDLCharacterSetCID2 = @"CID2SET"; diff --git a/SmartDeviceLink/SDLFile.m b/SmartDeviceLink/SDLFile.m index 63ec9d4aa..e7bed7f74 100644 --- a/SmartDeviceLink/SDLFile.m +++ b/SmartDeviceLink/SDLFile.m @@ -102,18 +102,18 @@ NS_ASSUME_NONNULL_BEGIN + (SDLFileType)sdl_fileTypeFromFileExtension:(NSString *)fileExtension { if ([fileExtension caseInsensitiveCompare:@"bmp"] == NSOrderedSame) { - return SDLFileTypeGraphicBMP; + return SDLFileTypeBMP; } else if (([fileExtension caseInsensitiveCompare:@"jpg"] == NSOrderedSame) || ([fileExtension caseInsensitiveCompare:@"jpeg"] == NSOrderedSame)) { - return SDLFileTypeGraphicJPEG; + return SDLFileTypeJPEG; } else if ([fileExtension caseInsensitiveCompare:@"png"] == NSOrderedSame) { - return SDLFileTypeGraphicPNG; + return SDLFileTypePNG; } else if ([fileExtension caseInsensitiveCompare:@"wav"] == NSOrderedSame) { - return SDLFileTypeAudioWAV; + return SDLFileTypeWAV; } else if ([fileExtension caseInsensitiveCompare:@"mp3"] == NSOrderedSame) { - return SDLFileTypeAudioMP3; + return SDLFileTypeMP3; } else if ([fileExtension caseInsensitiveCompare:@"aac"] == NSOrderedSame) { - return SDLFileTypeAudioAAC; + return SDLFileTypeAAC; } else if ([fileExtension caseInsensitiveCompare:@"json"] == NSOrderedSame) { return SDLFileTypeJSON; } else { diff --git a/SmartDeviceLink/SDLFileType.h b/SmartDeviceLink/SDLFileType.h index 1547ab206..41f1e4350 100644 --- a/SmartDeviceLink/SDLFileType.h +++ b/SmartDeviceLink/SDLFileType.h @@ -14,32 +14,32 @@ typedef SDLEnum SDLFileType NS_STRING_ENUM; /** * @abstract file type: Bitmap (BMP) */ -extern SDLFileType const SDLFileTypeGraphicBMP; +extern SDLFileType const SDLFileTypeBMP; /** * @abstract file type: JPEG */ -extern SDLFileType const SDLFileTypeGraphicJPEG; +extern SDLFileType const SDLFileTypeJPEG; /** * @abstract file type: PNG */ -extern SDLFileType const SDLFileTypeGraphicPNG; +extern SDLFileType const SDLFileTypePNG; /** * @abstract file type: WAVE (WAV) */ -extern SDLFileType const SDLFileTypeAudioWAV; +extern SDLFileType const SDLFileTypeWAV; /** * @abstract file type: MP3 */ -extern SDLFileType const SDLFileTypeAudioMP3; +extern SDLFileType const SDLFileTypeMP3; /** * @abstract file type: AAC */ -extern SDLFileType const SDLFileTypeAudioAAC; +extern SDLFileType const SDLFileTypeAAC; /** * @abstract file type: BINARY diff --git a/SmartDeviceLink/SDLFileType.m b/SmartDeviceLink/SDLFileType.m index 8c3c7060d..b86dc3539 100644 --- a/SmartDeviceLink/SDLFileType.m +++ b/SmartDeviceLink/SDLFileType.m @@ -4,11 +4,11 @@ #import "SDLFileType.h" -SDLFileType const SDLFileTypeGraphicBMP = @"GRAPHIC_BMP"; -SDLFileType const SDLFileTypeGraphicJPEG = @"GRAPHIC_JPEG"; -SDLFileType const SDLFileTypeGraphicPNG = @"GRAPHIC_PNG"; -SDLFileType const SDLFileTypeAudioWAV = @"AUDIO_WAVE"; -SDLFileType const SDLFileTypeAudioMP3 = @"AUDIO_MP3"; -SDLFileType const SDLFileTypeAudioAAC = @"AUDIO_AAC"; +SDLFileType const SDLFileTypeBMP = @"GRAPHIC_BMP"; +SDLFileType const SDLFileTypeJPEG = @"GRAPHIC_JPEG"; +SDLFileType const SDLFileTypePNG = @"GRAPHIC_PNG"; +SDLFileType const SDLFileTypeWAV = @"AUDIO_WAVE"; +SDLFileType const SDLFileTypeMP3 = @"AUDIO_MP3"; +SDLFileType const SDLFileTypeAAC = @"AUDIO_AAC"; SDLFileType const SDLFileTypeBinary = @"BINARY"; SDLFileType const SDLFileTypeJSON = @"JSON"; diff --git a/SmartDeviceLink/SDLImageFieldName.h b/SmartDeviceLink/SDLImageFieldName.h index a34c6ba25..2746accf8 100644 --- a/SmartDeviceLink/SDLImageFieldName.h +++ b/SmartDeviceLink/SDLImageFieldName.h @@ -30,7 +30,7 @@ extern SDLImageFieldName const SDLImageFieldNameChoiceSecondaryImage; /** The image field for vrHelpItem. * */ -extern SDLImageFieldName const SDLImageFieldNameVrHelpItem; +extern SDLImageFieldName const SDLImageFieldNameVRHelpItem; /** The image field for Turn. * diff --git a/SmartDeviceLink/SDLImageFieldName.m b/SmartDeviceLink/SDLImageFieldName.m index 4c83beaf4..4ac549a81 100644 --- a/SmartDeviceLink/SDLImageFieldName.m +++ b/SmartDeviceLink/SDLImageFieldName.m @@ -7,7 +7,7 @@ SDLImageFieldName const SDLImageFieldNameSoftButtonImage = @"softButtonImage"; SDLImageFieldName const SDLImageFieldNameChoiceImage = @"choiceImage"; SDLImageFieldName const SDLImageFieldNameChoiceSecondaryImage = @"choiceSecondaryImage"; -SDLImageFieldName const SDLImageFieldNameVrHelpItem = @"vrHelpItem"; +SDLImageFieldName const SDLImageFieldNameVRHelpItem = @"vrHelpItem"; SDLImageFieldName const SDLImageFieldNameTurnIcon = @"turnIcon"; SDLImageFieldName const SDLImageFieldNameMenuIcon = @"menuIcon"; SDLImageFieldName const SDLImageFieldNameCommandIcon = @"cmdIcon"; diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLArtworkSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLArtworkSpec.m index 16ffa8b2a..026ab2609 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLArtworkSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLArtworkSpec.m @@ -32,7 +32,7 @@ describe(@"SDLArtwork", ^{ }); it(@"should correctly store format", ^{ - expect(testArtwork.fileType).to(equal(SDLFileTypeGraphicPNG)); + expect(testArtwork.fileType).to(equal(SDLFileTypePNG)); }); it(@"should correctly store persistence", ^{ @@ -62,7 +62,7 @@ describe(@"SDLArtwork", ^{ }); it(@"should correctly store format", ^{ - expect(testArtwork.fileType).to(equal(SDLFileTypeGraphicJPEG)); + expect(testArtwork.fileType).to(equal(SDLFileTypeJPEG)); }); it(@"should correctly store persistence", ^{ diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLFileSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLFileSpec.m index cb50dba36..c994c00a9 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLFileSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLFileSpec.m @@ -40,7 +40,7 @@ describe(@"SDLFile", ^{ }); it(@"should correctly store file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeAudioMP3)); + expect(testFile.fileType).to(equal(SDLFileTypeMP3)); }); it(@"should correctly start as non-overwrite", ^{ @@ -86,7 +86,7 @@ describe(@"SDLFile", ^{ }); it(@"should correctly store file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeGraphicJPEG)); + expect(testFile.fileType).to(equal(SDLFileTypeJPEG)); }); it(@"should correctly store persistence", ^{ @@ -116,7 +116,7 @@ describe(@"SDLFile", ^{ }); it(@"should correctly store file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeGraphicJPEG)); + expect(testFile.fileType).to(equal(SDLFileTypeJPEG)); }); it(@"should correctly store persistence", ^{ @@ -140,7 +140,7 @@ describe(@"SDLFile", ^{ }); it(@"should properly interpret file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeGraphicJPEG)); + expect(testFile.fileType).to(equal(SDLFileTypeJPEG)); }); }); @@ -154,7 +154,7 @@ describe(@"SDLFile", ^{ }); it(@"should properly interpret file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeGraphicJPEG)); + expect(testFile.fileType).to(equal(SDLFileTypeJPEG)); }); }); @@ -168,7 +168,7 @@ describe(@"SDLFile", ^{ }); it(@"should properly interpret file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeGraphicPNG)); + expect(testFile.fileType).to(equal(SDLFileTypePNG)); }); }); @@ -182,7 +182,7 @@ describe(@"SDLFile", ^{ }); it(@"should properly interpret file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeGraphicBMP)); + expect(testFile.fileType).to(equal(SDLFileTypeBMP)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m index 219c44437..293b2f3fe 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m @@ -14,10 +14,10 @@ QuickSpecBegin(SDLCharacterSetSpec) 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(SDLCharacterSetType2).to(equal(@"TYPE2SET")); + expect(SDLCharacterSetType5).to(equal(@"TYPE5SET")); + expect(SDLCharacterSetCID1).to(equal(@"CID1SET")); + expect(SDLCharacterSetCID2).to(equal(@"CID2SET")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m index 7b36a863e..3fe02b7cc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m @@ -14,12 +14,12 @@ 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(SDLFileTypeAudioWAV).to(equal(@"AUDIO_WAVE")); - expect(SDLFileTypeAudioMP3).to(equal(@"AUDIO_MP3")); - expect(SDLFileTypeAudioAAC).to(equal(@"AUDIO_AAC")); + expect(SDLFileTypeBMP).to(equal(@"GRAPHIC_BMP")); + expect(SDLFileTypeJPEG).to(equal(@"GRAPHIC_JPEG")); + expect(SDLFileTypePNG).to(equal(@"GRAPHIC_PNG")); + expect(SDLFileTypeWAV).to(equal(@"AUDIO_WAVE")); + expect(SDLFileTypeMP3).to(equal(@"AUDIO_MP3")); + expect(SDLFileTypeAAC).to(equal(@"AUDIO_AAC")); expect(SDLFileTypeBinary).to(equal(@"BINARY")); expect(SDLFileTypeJSON).to(equal(@"JSON")); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m index 6841858fe..9d537e096 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m @@ -17,7 +17,7 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLImageFieldNameSoftButtonImage).to(equal(@"softButtonImage")); expect(SDLImageFieldNameChoiceImage).to(equal(@"choiceImage")); expect(SDLImageFieldNameChoiceSecondaryImage).to(equal(@"choiceSecondaryImage")); - expect(SDLImageFieldNameVrHelpItem).to(equal(@"vrHelpItem")); + expect(SDLImageFieldNameVRHelpItem).to(equal(@"vrHelpItem")); expect(SDLImageFieldNameTurnIcon).to(equal(@"turnIcon")); expect(SDLImageFieldNameMenuIcon).to(equal(@"menuIcon")); expect(SDLImageFieldNameCommandIcon).to(equal(@"cmdIcon")); diff --git a/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m b/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m index 6e918e95f..580431e60 100644 --- a/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m @@ -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:SDLFileTypeBMP persistentFile:@165636 correlationId:@147986]; expect(message.syncFileName).to(equal(@"YES!?")); - expect(message.fileType).to(equal(SDLFileTypeGraphicBMP)); + expect(message.fileType).to(equal(SDLFileTypeBMP)); expect(message.persistentFile).to(equal(@165636)); expect(message.correlationID).to(equal(@147986)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m index 5812d489d..6a3f51772 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m @@ -23,14 +23,14 @@ describe(@"Getter/Setter Tests", ^ { testNotification.requestType = SDLRequestTypeFileResume; testNotification.url = [@[@"www.google.com"] mutableCopy]; testNotification.timeout = @52345; - testNotification.fileType = SDLFileTypeGraphicPNG; + testNotification.fileType = SDLFileTypePNG; 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(SDLFileTypePNG)); expect(testNotification.offset).to(equal(@2532678684)); expect(testNotification.length).to(equal(@50000000000)); }); @@ -41,7 +41,7 @@ describe(@"Getter/Setter Tests", ^ { @{SDLNameRequestType:SDLRequestTypeFileResume, SDLNameURL:[@[@"www.google.com"] mutableCopy], SDLNameTimeout:@52345, - SDLNameFileType:SDLFileTypeGraphicPNG, + SDLNameFileType:SDLFileTypePNG, SDLNameOffset:@2532678684, SDLNameLength:@50000000000}, SDLNameOperationName:SDLNameOnSystemRequest}} mutableCopy]; @@ -50,7 +50,7 @@ describe(@"Getter/Setter Tests", ^ { 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(SDLFileTypePNG)); expect(testNotification.offset).to(equal(@2532678684)); expect(testNotification.length).to(equal(@50000000000)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m index 3e3bed897..54ad81b28 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 = SDLFileTypeJPEG; 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(SDLFileTypeJPEG)); expect(testRequest.persistentFile).to(equal(@YES)); expect(testRequest.systemFile).to(equal(@NO)); expect(testRequest.offset).to(equal(@987654321)); @@ -38,7 +38,7 @@ describe(@"Getter/Setter Tests", ^ { NSMutableDictionary* dict = [@{SDLNameRequest: @{SDLNameParameters: @{SDLNameSyncFileName:@"fileName", - SDLNameFileType:SDLFileTypeGraphicJPEG, + SDLNameFileType:SDLFileTypeJPEG, SDLNamePersistentFile:@YES, SDLNameSystemFile:@NO, SDLNameOffset:@987654321, @@ -47,7 +47,7 @@ describe(@"Getter/Setter Tests", ^ { SDLPutFile* testRequest = [[SDLPutFile alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"fileName")); - expect(testRequest.fileType).to(equal(SDLFileTypeGraphicJPEG)); + expect(testRequest.fileType).to(equal(SDLFileTypeJPEG)); expect(testRequest.persistentFile).to(equal(@YES)); expect(testRequest.systemFile).to(equal(@NO)); expect(testRequest.offset).to(equal(@987654321)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m index d555c8520..b40371a4d 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 = [@[SDLFileTypePNG, SDLFileTypeJPEG] copy]; testStruct.imageResolution = resolution; expect(testStruct.name).to(equal(SDLImageFieldNameTurnIcon)); - expect(testStruct.imageTypeSupported).to(equal([@[SDLFileTypeGraphicPNG, SDLFileTypeGraphicJPEG] copy])); + expect(testStruct.imageTypeSupported).to(equal([@[SDLFileTypePNG, SDLFileTypeJPEG] copy])); expect(testStruct.imageResolution).to(equal(resolution)); }); it(@"Should get correctly when initialized", ^ { NSMutableDictionary* dict = [@{SDLNameName:SDLImageFieldNameTurnIcon, - SDLNameImageTypeSupported:[@[SDLFileTypeGraphicPNG, SDLFileTypeGraphicJPEG] copy], + SDLNameImageTypeSupported:[@[SDLFileTypePNG, SDLFileTypeJPEG] 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([@[SDLFileTypePNG, SDLFileTypeJPEG] copy])); expect(testStruct.imageResolution).to(equal(resolution)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m index 094c78994..065945f48 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m @@ -21,25 +21,25 @@ describe(@"Getter/Setter Tests", ^ { SDLTextField* testStruct = [[SDLTextField alloc] init]; testStruct.name = SDLTextFieldNameTertiaryText; - testStruct.characterSet = SDLCharacterSetType5Set; + testStruct.characterSet = SDLCharacterSetType5; testStruct.width = @111; testStruct.rows = @4; expect(testStruct.name).to(equal(SDLTextFieldNameTertiaryText)); - expect(testStruct.characterSet).to(equal(SDLCharacterSetType5Set)); + expect(testStruct.characterSet).to(equal(SDLCharacterSetType5)); expect(testStruct.width).to(equal(@111)); expect(testStruct.rows).to(equal(@4)); }); it(@"Should get correctly when initialized", ^ { NSMutableDictionary* dict = [@{SDLNameName:SDLTextFieldNameTertiaryText, - SDLNameCharacterSet:SDLCharacterSetType5Set, + SDLNameCharacterSet:SDLCharacterSetType5, SDLNameWidth:@111, SDLNameRows:@4} mutableCopy]; SDLTextField* testStruct = [[SDLTextField alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal(SDLTextFieldNameTertiaryText)); - expect(testStruct.characterSet).to(equal(SDLCharacterSetType5Set)); + expect(testStruct.characterSet).to(equal(SDLCharacterSetType5)); expect(testStruct.width).to(equal(@111)); expect(testStruct.rows).to(equal(@4)); }); |