diff options
author | Brett W <geekman3454@protonmail.com> | 2017-08-16 14:35:17 -0400 |
---|---|---|
committer | Brett W <geekman3454@protonmail.com> | 2017-08-16 14:35:17 -0400 |
commit | 450b5728c72fa837378e3be53f2c8e324c856b17 (patch) | |
tree | 98531ad45337cf23f66098252ce9f14042cc70cd | |
parent | af03d292b429b901a150386518c8edbaf4ed7dd4 (diff) | |
download | sdl_ios-450b5728c72fa837378e3be53f2c8e324c856b17.tar.gz |
finished renaming show param
-rw-r--r-- | SmartDeviceLink/SDLNames.h | 2 | ||||
-rw-r--r-- | SmartDeviceLink/SDLShow.h | 2 | ||||
-rw-r--r-- | SmartDeviceLink/SDLShow.m | 18 | ||||
-rw-r--r-- | SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m | 12 |
4 files changed, 17 insertions, 17 deletions
diff --git a/SmartDeviceLink/SDLNames.h b/SmartDeviceLink/SDLNames.h index 0979c3983..e34f02b2d 100644 --- a/SmartDeviceLink/SDLNames.h +++ b/SmartDeviceLink/SDLNames.h @@ -216,6 +216,7 @@ #define NAMES_messageData @"messageData" #define NAMES_messageDataResult @"messageDataResult" #define NAMES_messageLength @"messageLength" +#define NAMES_metadataTags @"metadataTags" #define NAMES_middleRow1BeltDeployed @"middleRow1BeltDeployed" #define NAMES_middleRow1BuckleBelted @"middleRow1BuckleBelted" #define NAMES_middleRow2BuckleBelted @"middleRow2BuckleBelted" @@ -398,7 +399,6 @@ #define NAMES_tertiaryText @"tertiaryText" #define NAMES_text @"text" #define NAMES_textFields @"textFields" -#define NAMES_textFieldMetadata @"textFieldMetadata" #define NAMES_textMsgAvailable @"textMsgAvailable" #define NAMES_thoroughfare @"thoroughfare" #define NAMES_timeout @"timeout" diff --git a/SmartDeviceLink/SDLShow.h b/SmartDeviceLink/SDLShow.h index 43932b722..b941d1625 100644 --- a/SmartDeviceLink/SDLShow.h +++ b/SmartDeviceLink/SDLShow.h @@ -259,6 +259,6 @@ * If any text field contains no tags or the none tag, the metadata tag for that textfield should be removed. * @since SmartDeviceLink 2.0 */ -@property (strong) SDLMetadataTags *textFieldMetadata; +@property (strong) SDLMetadataTags *metadataTags; @end diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m index b687271b0..0a7949b3e 100644 --- a/SmartDeviceLink/SDLShow.m +++ b/SmartDeviceLink/SDLShow.m @@ -42,7 +42,7 @@ self.mainField1 = mainField1; self.mainField2 = mainField2; self.alignment = alignment; - self.textFieldMetadata = fieldsStruct; + self.metadataTags = fieldsStruct; return self; } @@ -72,7 +72,7 @@ self.mainField3 = mainField3; self.mainField4 = mainField4; self.alignment = alignment; - self.textFieldMetadata = fieldsStruct; + self.metadataTags = fieldsStruct; return self; } @@ -115,7 +115,7 @@ self.graphic = graphic; self.softButtons = [softButtons mutableCopy]; self.customPresets = [customPresets mutableCopy]; - self.textFieldMetadata = metadata; + self.metadataTags = metadata; return self; @@ -291,16 +291,16 @@ return [parameters objectForKey:NAMES_customPresets]; } -- (void)setTextFieldMetadata:(SDLMetadataTags *)textFieldMetadata { - if (textFieldMetadata != nil) { - [parameters setObject:textFieldMetadata forKey:NAMES_textFieldMetadata]; +- (void)setMetadataTags:(SDLMetadataTags *)metadataTags { + if (metadataTags != nil) { + [parameters setObject:metadataTags forKey:NAMES_metadataTags]; } else { - [parameters removeObjectForKey:NAMES_textFieldMetadata]; + [parameters removeObjectForKey:NAMES_metadataTags]; } } -- (SDLMetadataTags *)textFieldMetadata { - NSObject *obj = [parameters objectForKey:NAMES_textFieldMetadata]; +- (SDLMetadataTags *)metadataTags { + NSObject *obj = [parameters objectForKey:NAMES_metadataTags]; if (obj == nil || [obj isKindOfClass:SDLMetadataTags.class]) { return (SDLMetadataTags *)obj; } else { diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m index c63325cfb..8d0896240 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m @@ -41,7 +41,7 @@ describe(@"Getter/Setter Tests", ^ { testRequest.secondaryGraphic = image2; testRequest.softButtons = [@[button] mutableCopy]; testRequest.customPresets = [@[@"preset1", @"preset2"] mutableCopy]; - testRequest.textFieldMetadata = testMetadata; + testRequest.metadataTags = testMetadata; expect(testRequest.mainField1).to(equal(@"field1")); expect(testRequest.mainField2).to(equal(@"field2")); @@ -55,7 +55,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.secondaryGraphic).to(equal(image2)); expect(testRequest.softButtons).to(equal([@[button] mutableCopy])); expect(testRequest.customPresets).to(equal([@[@"preset1", @"preset2"] mutableCopy])); - expect(testRequest.textFieldMetadata).to(equal(testMetadata)); + expect(testRequest.metadataTags).to(equal(testMetadata)); }); it(@"Should get correctly when initialized", ^ { @@ -73,7 +73,7 @@ describe(@"Getter/Setter Tests", ^ { NAMES_secondaryGraphic:image2, NAMES_softButtons:[@[button] mutableCopy], NAMES_customPresets:[@[@"preset1", @"preset2"] mutableCopy], - NAMES_textFieldMetadata: testMetadata}, + NAMES_metadataTags: testMetadata}, NAMES_operation_name:NAMES_Show}} mutableCopy]; SDLShow* testRequest = [[SDLShow alloc] initWithDictionary:dict]; @@ -89,7 +89,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.secondaryGraphic).to(equal(image2)); expect(testRequest.softButtons).to(equal([@[button] mutableCopy])); expect(testRequest.customPresets).to(equal([@[@"preset1", @"preset2"] mutableCopy])); - expect(testRequest.textFieldMetadata).to(equal(testMetadata)); + expect(testRequest.metadataTags).to(equal(testMetadata)); }); it(@"Should get correctly when initialized without a dictionary", ^ { @@ -107,7 +107,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.graphic).to(equal(image1)); expect(testRequest.softButtons).to(equal([@[button] mutableCopy])); expect(testRequest.customPresets).to(equal([@[@"preset1", @"preset2"] mutableCopy])); - expect(testRequest.textFieldMetadata).to(equal(testMetadata)); + expect(testRequest.metadataTags).to(equal(testMetadata)); }); it(@"Should return nil if not set", ^ { @@ -125,7 +125,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.secondaryGraphic).to(beNil()); expect(testRequest.softButtons).to(beNil()); expect(testRequest.customPresets).to(beNil()); - expect(testRequest.textFieldMetadata).to(beNil()); + expect(testRequest.metadataTags).to(beNil()); }); }); |