Fix position not being set on SDLChoiceSet VRHelpListbugfix/issue_1291_fix_choiceset_helplist_position

2 files changed, 21 insertions, 0 deletions

diff --git a/SmartDeviceLink/SDLChoiceSet.m b/SmartDeviceLink/SDLChoiceSet.m
index b7aa12388..0892e611d 100644
--- a/SmartDeviceLink/SDLChoiceSet.m
+++ b/SmartDeviceLink/SDLChoiceSet.m
@@ -123,6 +123,14 @@ static SDLChoiceSetLayout _defaultLayout = SDLChoiceSetLayoutList;
     _defaultLayout = defaultLayout;
 }
 
+- (void)setHelpList:(nullable NSArray<SDLVRHelpItem *> *)helpList {
+    _helpList = helpList;
+
+    for (NSUInteger i = 0; i < _helpList.count; i++) {
+        _helpList[i].position = @(i + 1);
+    }
+}
+
 #pragma mark - Etc.
 
 - (NSString *)description {
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLChoiceSetSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLChoiceSetSpec.m
index c89a969be..bce012034 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLChoiceSetSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLChoiceSetSpec.m
@@ -69,6 +69,7 @@ describe(@"an SDLChoiceSet", ^{
             expect(testChoiceSet.timeoutPrompt).to(equal([SDLTTSChunk textChunksFromString:testTimeoutPrompt]));
             expect(testChoiceSet.helpPrompt).to(equal([SDLTTSChunk textChunksFromString:testHelpPrompt]));
             expect(testChoiceSet.helpList).to(equal(@[testHelpItem]));
+            expect(testChoiceSet.helpList.firstObject.position).to(equal(1));
             expect(testChoiceSet.delegate).to(equal(testDelegate));
             expect(testChoiceSet.choices).to(equal(@[testCell]));
         });
@@ -150,6 +151,18 @@ describe(@"an SDLChoiceSet", ^{
             });
         });
     });
+
+    describe(@"setting data", ^{
+        beforeEach(^{
+            testChoiceSet = [[SDLChoiceSet alloc] init];
+        });
+
+        it(@"should properly set help list position", ^{
+            testChoiceSet.helpList = @[testHelpItem];
+
+            expect(testHelpItem.position).to(equal(1));
+        });
+    });
 });
 
 QuickSpecEnd