Added conv. init to `GetAppServiceData` structbugfix/issue_1188_add_convenience_init_to_GetAppServiceData_struct

3 files changed, 19 insertions, 0 deletions

diff --git a/SmartDeviceLink/SDLGetAppServiceData.h b/SmartDeviceLink/SDLGetAppServiceData.h
index eaec788b9..78ceee436 100644
--- a/SmartDeviceLink/SDLGetAppServiceData.h
+++ b/SmartDeviceLink/SDLGetAppServiceData.h
@@ -35,6 +35,14 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithAppServiceType:(SDLAppServiceType)serviceType;
 
 /**
+ *  Convenience init for subscribing to a service type.
+ *
+ *  @param serviceType      The app service type
+ *  @return                 A SDLGetAppServiceData object
+ */
+- (instancetype)initAndSubscribeToAppServiceType:(SDLAppServiceType)serviceType;
+
+/**
  *  Convenience init for all parameters.
  *
  *  @param serviceType      The app service type
diff --git a/SmartDeviceLink/SDLGetAppServiceData.m b/SmartDeviceLink/SDLGetAppServiceData.m
index 778741303..0122fb088 100644
--- a/SmartDeviceLink/SDLGetAppServiceData.m
+++ b/SmartDeviceLink/SDLGetAppServiceData.m
@@ -37,6 +37,10 @@ NS_ASSUME_NONNULL_BEGIN
     return [self initWithServiceType:serviceType];
 }
 
+- (instancetype)initAndSubscribeToAppServiceType:(SDLAppServiceType)serviceType {
+    return [self initWithServiceType:serviceType subscribe:YES];
+}
+
 - (instancetype)initWithServiceType:(NSString *)serviceType subscribe:(BOOL)subscribe {
     self = [self initWithServiceType:serviceType];
     if (!self) {
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetAppServiceDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetAppServiceDataSpec.m
index a094ef46d..fcc89caea 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetAppServiceDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetAppServiceDataSpec.m
@@ -63,6 +63,13 @@ describe(@"Getter/Setter Tests", ^{
         expect(testRequest.subscribe).to(beNil());
     });
 
+    it(@"Should initialize correctly with initAndSubscribeToAppServiceType:", ^{
+        SDLGetAppServiceData *testRequest = [[SDLGetAppServiceData alloc] initAndSubscribeToAppServiceType:testAppServiceType];
+
+        expect(testRequest.serviceType).to(equal(testAppServiceType));
+        expect(testRequest.subscribe).to(beTrue());
+    });
+
     it(@"Should initialize correctly with initWithServiceType:subscribe:", ^{
         SDLGetAppServiceData *testRequest = [[SDLGetAppServiceData alloc] initWithServiceType:testServiceType subscribe:testSubscribe];