Address review comments

7 files changed, 81 insertions, 45 deletions

diff --git a/SmartDeviceLink/SDLNames.h b/SmartDeviceLink/SDLNames.h
index b464b751c..fb9d04cb8 100644
--- a/SmartDeviceLink/SDLNames.h
+++ b/SmartDeviceLink/SDLNames.h
@@ -179,8 +179,8 @@ extern SDLName const SDLNameHashId;
 extern SDLName const SDLNameHDOP;
 extern SDLName const SDLNameHDChannel;
 extern SDLName const SDLNameHDChannelAvailable;
-extern SDLName const SDLNameHdRadioEnable;
-extern SDLName const SDLNameHdRadioEnableAvailable;
+extern SDLName const SDLNameHDRadioEnable;
+extern SDLName const SDLNameHDRadioEnableAvailable;
 extern SDLName const SDLNameHeading;
 extern SDLName const SDLNameHeadLampStatus;
 extern SDLName const SDLNameHeight;
@@ -441,7 +441,7 @@ extern SDLName const SDLNameSignalChangeThreshold;
 extern SDLName const SDLNameSignalChangeThresholdAvailable;
 extern SDLName const SDLNameSignalStrength;
 extern SDLName const SDLNameSignalStrengthAvailable;
-extern SDLName const SDLNameSiriusXmRadioAvailable;
+extern SDLName const SDLNameSiriusXMRadioAvailable;
 extern SDLName const SDLNameSlider;
 extern SDLName const SDLNameSliderFooter;
 extern SDLName const SDLNameSliderHeader;
diff --git a/SmartDeviceLink/SDLNames.m b/SmartDeviceLink/SDLNames.m
index 378d1e207..264c7b5e1 100644
--- a/SmartDeviceLink/SDLNames.m
+++ b/SmartDeviceLink/SDLNames.m
@@ -175,8 +175,8 @@ SDLName const SDLNameHashId = @"hashID";
 SDLName const SDLNameHDChannel = @"hdChannel";
 SDLName const SDLNameHDChannelAvailable = @"hdChannelAvailable";
 SDLName const SDLNameHDOP = @"hdop";
-SDLName const SDLNameHdRadioEnable = @"hdRadioEnable";
-SDLName const SDLNameHdRadioEnableAvailable = @"hdRadioEnableAvailable";
+SDLName const SDLNameHDRadioEnable = @"hdRadioEnable";
+SDLName const SDLNameHDRadioEnableAvailable = @"hdRadioEnableAvailable";
 SDLName const SDLNameHeading = @"heading";
 SDLName const SDLNameHeadLampStatus = @"headLampStatus";
 SDLName const SDLNameHeight = @"height";
@@ -435,7 +435,7 @@ SDLName const SDLNameSignalChangeThreshold = @"signalChangeThreshold";
 SDLName const SDLNameSignalChangeThresholdAvailable = @"signalChangeThresholdAvailable";
 SDLName const SDLNameSignalStrength = @"signalStrength";
 SDLName const SDLNameSignalStrengthAvailable = @"signalStrengthAvailable";
-SDLName const SDLNameSiriusXmRadioAvailable = @"siriusxmRadioAvailable";
+SDLName const SDLNameSiriusXMRadioAvailable = @"siriusxmRadioAvailable";
 SDLName const SDLNameSlider = @"Slider";
 SDLName const SDLNameSliderFooter = @"sliderFooter";
 SDLName const SDLNameSliderHeader = @"sliderHeader";
diff --git a/SmartDeviceLink/SDLRadioControlCapabilities.h b/SmartDeviceLink/SDLRadioControlCapabilities.h
index 477f45fa4..43fee2c3a 100644
--- a/SmartDeviceLink/SDLRadioControlCapabilities.h
+++ b/SmartDeviceLink/SDLRadioControlCapabilities.h
@@ -11,11 +11,44 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface SDLRadioControlCapabilities : SDLRPCStruct
 
-- (instancetype)initWithModuleName:(NSString *)moduleName radioEnableAvailable:(BOOL)radioEnableAvailable radioBandAvailable:(BOOL)radioBandAvailable radioFrequencyAvailable:(BOOL)radioFrequencyAvailable hdChannelAvailable:(BOOL)hdChannelAvailable rdsDataAvailable:(BOOL)rdsDataAvailable availableHDsAvailable:(BOOL)availableHDsAvailable stateAvailable:(BOOL)stateAvailable signalStrengthAvailable:(BOOL)signalStrengthAvailable signalChangeThresholdAvailable:(BOOL)signalChangeThresholdAvailable;
-- (instancetype)initWithModuleName:(NSString *)moduleName radioEnableAvailable:(BOOL)radioEnableAvailable radioBandAvailable:(BOOL)radioBandAvailable radioFrequencyAvailable:(BOOL)radioFrequencyAvailable hdChannelAvailable:(BOOL)hdChannelAvailable rdsDataAvailable:(BOOL)rdsDataAvailable availableHDsAvailable:(BOOL)availableHDsAvailable stateAvailable:(BOOL)stateAvailable signalStrengthAvailable:(BOOL)signalStrengthAvailable signalChangeThresholdAvailable:(BOOL)signalChangeThresholdAvailable hdRadioEnableAvailable:(BOOL)hdRadioEnableAvailable siriusxmRadioAvailable:(BOOL)siriusxmRadioAvailable;
+/**
+ Constructs a newly allocated SDLRadioControlCapabilities object with given parameters.
+
+ @param moduleName The short friendly name of the radio control module.
+ @param radioEnableAvailable Availability of the control of enable/disable radio.
+ @param radioBandAvailable Availability of the control of radio band.
+ @param radioFrequencyAvailable Availability of the control of radio frequency.
+ @param hdChannelAvailable Availability of the control of HD radio channel.
+ @param rdsDataAvailable Availability of the getting Radio Data System (RDS) data.
+ @param availableHDsAvailable Availability of the getting the number of available HD channels.
+ @param stateAvailable Availability of the getting the Radio state.
+ @param signalStrengthAvailable Availability of the getting the signal strength.
+ @param signalChangeThresholdAvailable Availability of the getting the signal Change Threshold.
+ @return An instance of the SDLRadioControlCapabilities class.
+ */
+- (instancetype)initWithModuleName:(NSString *)moduleName radioEnableAvailable:(BOOL)radioEnableAvailable radioBandAvailable:(BOOL)radioBandAvailable radioFrequencyAvailable:(BOOL)radioFrequencyAvailable hdChannelAvailable:(BOOL)hdChannelAvailable rdsDataAvailable:(BOOL)rdsDataAvailable availableHDsAvailable:(BOOL)availableHDsAvailable stateAvailable:(BOOL)stateAvailable signalStrengthAvailable:(BOOL)signalStrengthAvailable signalChangeThresholdAvailable:(BOOL)signalChangeThresholdAvailable __deprecated_msg(("Use initWithModuleName:moduleName:radioEnableAvailable radioFrequencyAvailable:hdChannelAvailable:rdsDataAvailable:availableHDsAvailable:stateAvailable:signalStrengthAvailable:signalChangeThresholdAvailable:hdRadioEnableAvailable:siriusXMRadioAvailable: instead"));
+
+/**
+ Constructs a newly allocated SDLRadioControlCapabilities object with given parameters.
+
+ @param moduleName The short friendly name of the radio control module.
+ @param radioEnableAvailable Availability of the control of enable/disable radio.
+ @param radioBandAvailable Availability of the control of radio band.
+ @param radioFrequencyAvailable Availability of the control of radio frequency.
+ @param hdChannelAvailable Availability of the control of HD radio channel.
+ @param rdsDataAvailable Availability of the getting Radio Data System (RDS) data.
+ @param availableHDsAvailable Availability of the getting the number of available HD channels.
+ @param stateAvailable Availability of the getting the Radio state.
+ @param signalStrengthAvailable Availability of the getting the signal strength.
+ @param signalChangeThresholdAvailable Availability of the getting the signal Change Threshold.
+ @param hdRadioEnableAvailable Availability of the control of enable/disable HD radio.
+ @param siriusXMRadioAvailable Availability of sirius XM radio.
+ @return An instance of the SDLRadioControlCapabilities class
+ */
+- (instancetype)initWithModuleName:(NSString *)moduleName radioEnableAvailable:(BOOL)radioEnableAvailable radioBandAvailable:(BOOL)radioBandAvailable radioFrequencyAvailable:(BOOL)radioFrequencyAvailable hdChannelAvailable:(BOOL)hdChannelAvailable rdsDataAvailable:(BOOL)rdsDataAvailable availableHDsAvailable:(BOOL)availableHDsAvailable stateAvailable:(BOOL)stateAvailable signalStrengthAvailable:(BOOL)signalStrengthAvailable signalChangeThresholdAvailable:(BOOL)signalChangeThresholdAvailable hdRadioEnableAvailable:(BOOL)hdRadioEnableAvailable siriusXMRadioAvailable:(BOOL)siriusXMRadioAvailable;
 
 /**
- * The short friendly name of the climate control module.
+ * The short friendly name of the radio control module.
  
  * It should not be used to identify a module by mobile application.
  *
@@ -118,7 +151,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * Optional, Boolean
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *siriusxmRadioAvailable;
+@property (nullable, strong, nonatomic) NSNumber<SDLBool> *siriusXMRadioAvailable;
 
 @end
 
diff --git a/SmartDeviceLink/SDLRadioControlCapabilities.m b/SmartDeviceLink/SDLRadioControlCapabilities.m
index d7e450dda..f23b42cb5 100644
--- a/SmartDeviceLink/SDLRadioControlCapabilities.m
+++ b/SmartDeviceLink/SDLRadioControlCapabilities.m
@@ -11,26 +11,12 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLRadioControlCapabilities
 
 - (instancetype)initWithModuleName:(NSString *)moduleName radioEnableAvailable:(BOOL)radioEnableAvailable radioBandAvailable:(BOOL)radioBandAvailable radioFrequencyAvailable:(BOOL)radioFrequencyAvailable hdChannelAvailable:(BOOL)hdChannelAvailable rdsDataAvailable:(BOOL)rdsDataAvailable availableHDsAvailable:(BOOL)availableHDsAvailable stateAvailable:(BOOL)stateAvailable signalStrengthAvailable:(BOOL)signalStrengthAvailable signalChangeThresholdAvailable:(BOOL)signalChangeThresholdAvailable {
-    self = [self init];
-    if(!self){
-        return nil;
-    }
 
-    self.moduleName = moduleName;
-    self.radioEnableAvailable = @(radioEnableAvailable);
-    self.radioBandAvailable = @(radioBandAvailable);
-    self.radioFrequencyAvailable = @(radioFrequencyAvailable);
-    self.hdChannelAvailable = @(hdChannelAvailable);
-    self.rdsDataAvailable = @(rdsDataAvailable);
-    self.availableHDsAvailable = @(availableHDsAvailable);
-    self.stateAvailable = @(stateAvailable);
-    self.signalStrengthAvailable = @(signalStrengthAvailable);
-    self.signalChangeThresholdAvailable = @(signalChangeThresholdAvailable);
+    return [self initWithModuleName:moduleName radioEnableAvailable:radioEnableAvailable radioBandAvailable:radioBandAvailable radioFrequencyAvailable:radioFrequencyAvailable hdChannelAvailable:hdChannelAvailable rdsDataAvailable:rdsDataAvailable availableHDsAvailable:availableHDsAvailable stateAvailable:stateAvailable signalStrengthAvailable:signalStrengthAvailable signalChangeThresholdAvailable:signalChangeThresholdAvailable hdRadioEnableAvailable:NO siriusXMRadioAvailable:NO];
 
-    return self;
 }
 
-- (instancetype)initWithModuleName:(NSString *)moduleName radioEnableAvailable:(BOOL)radioEnableAvailable radioBandAvailable:(BOOL)radioBandAvailable radioFrequencyAvailable:(BOOL)radioFrequencyAvailable hdChannelAvailable:(BOOL)hdChannelAvailable rdsDataAvailable:(BOOL)rdsDataAvailable availableHDsAvailable:(BOOL)availableHDsAvailable stateAvailable:(BOOL)stateAvailable signalStrengthAvailable:(BOOL)signalStrengthAvailable signalChangeThresholdAvailable:(BOOL)signalChangeThresholdAvailable hdRadioEnableAvailable:(BOOL)hdRadioEnableAvailable siriusxmRadioAvailable:(BOOL)siriusxmRadioAvailable {
+- (instancetype)initWithModuleName:(NSString *)moduleName radioEnableAvailable:(BOOL)radioEnableAvailable radioBandAvailable:(BOOL)radioBandAvailable radioFrequencyAvailable:(BOOL)radioFrequencyAvailable hdChannelAvailable:(BOOL)hdChannelAvailable rdsDataAvailable:(BOOL)rdsDataAvailable availableHDsAvailable:(BOOL)availableHDsAvailable stateAvailable:(BOOL)stateAvailable signalStrengthAvailable:(BOOL)signalStrengthAvailable signalChangeThresholdAvailable:(BOOL)signalChangeThresholdAvailable hdRadioEnableAvailable:(BOOL)hdRadioEnableAvailable siriusXMRadioAvailable:(BOOL)siriusXMRadioAvailable {
     self = [self init];
     if(!self){
         return nil;
@@ -47,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
     self.signalStrengthAvailable = @(signalStrengthAvailable);
     self.signalChangeThresholdAvailable = @(signalChangeThresholdAvailable);
     self.hdRadioEnableAvailable = @(hdRadioEnableAvailable);
-    self.siriusxmRadioAvailable = @(siriusxmRadioAvailable);
+    self.siriusXMRadioAvailable = @(siriusXMRadioAvailable);
     
     return self;
 }
@@ -133,19 +119,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setHdRadioEnableAvailable:(nullable NSNumber<SDLBool> *)hdRadioEnableAvailable {
-    [store sdl_setObject:hdRadioEnableAvailable forName:SDLNameHdRadioEnableAvailable];
+    [store sdl_setObject:hdRadioEnableAvailable forName:SDLNameHDRadioEnableAvailable];
 }
 
 - (nullable NSNumber<SDLBool> *)hdRadioEnableAvailable {
-    return [store sdl_objectForName:SDLNameHdRadioEnableAvailable];
+    return [store sdl_objectForName:SDLNameHDRadioEnableAvailable];
 }
 
-- (void)setSiriusxmRadioAvailable:(nullable NSNumber<SDLBool> *)siriusxmRadioAvailable {
-    [store sdl_setObject:siriusxmRadioAvailable forName:SDLNameSiriusXmRadioAvailable];
+- (void)setSiriusXMRadioAvailable:(nullable NSNumber<SDLBool> *)siriusXMRadioAvailable {
+    [store sdl_setObject:siriusXMRadioAvailable forName:SDLNameSiriusXMRadioAvailable];
 }
 
-- (nullable NSNumber<SDLBool> *)siriusxmRadioAvailable {
-    return [store sdl_objectForName:SDLNameSiriusXmRadioAvailable];
+- (nullable NSNumber<SDLBool> *)siriusXMRadioAvailable {
+    return [store sdl_objectForName:SDLNameSiriusXMRadioAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLRadioControlData.m b/SmartDeviceLink/SDLRadioControlData.m
index 68f95dbb4..347d25aa6 100644
--- a/SmartDeviceLink/SDLRadioControlData.m
+++ b/SmartDeviceLink/SDLRadioControlData.m
@@ -107,11 +107,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setHdRadioEnable:(nullable NSNumber<SDLBool> *)hdRadioEnable {
-    [store sdl_setObject:hdRadioEnable forName:SDLNameHdRadioEnable];
+    [store sdl_setObject:hdRadioEnable forName:SDLNameHDRadioEnable];
 }
 
 - (nullable NSNumber<SDLBool> *)hdRadioEnable {
-    return [store sdl_objectForName:SDLNameHdRadioEnable];
+    return [store sdl_objectForName:SDLNameHDRadioEnable];
 }
 
 @end
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlCapabilitiesSpec.m
index af6be3f99..78a640dae 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlCapabilitiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlCapabilitiesSpec.m
@@ -29,7 +29,7 @@ describe(@"Initialization tests", ^{
         expect(testStruct.signalStrengthAvailable).to(beNil());
         expect(testStruct.signalChangeThresholdAvailable).to(beNil());
         expect(testStruct.hdRadioEnableAvailable).to(beNil());
-        expect(testStruct.siriusxmRadioAvailable).to(beNil());
+        expect(testStruct.siriusXMRadioAvailable).to(beNil());
     });
     
     it(@"should properly initialize initWithDictionary", ^{
@@ -44,8 +44,8 @@ describe(@"Initialization tests", ^{
                                        SDLNameStateAvailable : @YES,
                                        SDLNameSignalStrengthAvailable : @YES,
                                        SDLNameSignalChangeThresholdAvailable : @NO,
-                                       SDLNameHdRadioEnableAvailable : @YES,
-                                       SDLNameSiriusXmRadioAvailable : @NO
+                                       SDLNameHDRadioEnableAvailable : @YES,
+                                       SDLNameSiriusXMRadioAvailable : @NO
                                        } mutableCopy];
         SDLRadioControlCapabilities* testStruct = [[SDLRadioControlCapabilities alloc] initWithDictionary:dict];
         
@@ -60,7 +60,7 @@ describe(@"Initialization tests", ^{
         expect(testStruct.signalStrengthAvailable).to(equal(@YES));
         expect(testStruct.signalChangeThresholdAvailable).to(equal(@NO));
         expect(testStruct.hdRadioEnableAvailable).to(equal(@YES));
-        expect(testStruct.siriusxmRadioAvailable).to(equal(@NO));
+        expect(testStruct.siriusXMRadioAvailable).to(equal(@NO));
     });
     
     it(@"Should set and get correctly", ^{
@@ -77,7 +77,7 @@ describe(@"Initialization tests", ^{
         testStruct.signalStrengthAvailable = @YES;
         testStruct.signalChangeThresholdAvailable = @NO;
         testStruct.hdRadioEnableAvailable = @YES;
-        testStruct.siriusxmRadioAvailable = @YES;
+        testStruct.siriusXMRadioAvailable = @YES;
         
         expect(testStruct.moduleName).to(equal(@"someName"));
         expect(testStruct.radioEnableAvailable).to(equal(@YES));
@@ -90,11 +90,28 @@ describe(@"Initialization tests", ^{
         expect(testStruct.signalStrengthAvailable).to(equal(@YES));
         expect(testStruct.signalChangeThresholdAvailable).to(equal(@NO));
         expect(testStruct.hdRadioEnableAvailable).to(equal(@YES));
-        expect(testStruct.siriusxmRadioAvailable).to(equal(@YES));
+        expect(testStruct.siriusXMRadioAvailable).to(equal(@YES));
     });
-    
+
+    it(@"Should get correctly when initialized with Module Name and other radio control capabilite's parameters", ^ {
+        SDLRadioControlCapabilities* testStruct = [[SDLRadioControlCapabilities alloc] initWithModuleName:@"someName" radioEnableAvailable:YES radioBandAvailable:NO radioFrequencyAvailable:YES hdChannelAvailable:NO rdsDataAvailable:NO availableHDsAvailable:NO stateAvailable:YES signalStrengthAvailable:YES signalChangeThresholdAvailable:NO];
+
+        expect(testStruct.moduleName).to(equal(@"someName"));
+        expect(testStruct.radioEnableAvailable).to(equal(@YES));
+        expect(testStruct.radioBandAvailable).to(equal(@NO));
+        expect(testStruct.radioFrequencyAvailable).to(equal(@YES));
+        expect(testStruct.hdChannelAvailable).to(equal(@NO));
+        expect(testStruct.rdsDataAvailable).to(equal(@NO));
+        expect(testStruct.availableHDsAvailable).to(equal(@NO));
+        expect(testStruct.stateAvailable).to(equal(@YES));
+        expect(testStruct.signalStrengthAvailable).to(equal(@YES));
+        expect(testStruct.signalChangeThresholdAvailable).to(equal(@NO));
+        expect(testStruct.hdRadioEnableAvailable).to(equal(@NO));
+        expect(testStruct.siriusXMRadioAvailable).to(equal(@NO));
+    });
+
     it(@"Should get correctly when initialized with Module Name and other radio control capabilite's parameters", ^ {
-        SDLRadioControlCapabilities* testStruct = [[SDLRadioControlCapabilities alloc] initWithModuleName:@"someName" radioEnableAvailable:YES radioBandAvailable:NO radioFrequencyAvailable:YES hdChannelAvailable:NO rdsDataAvailable:NO availableHDsAvailable:NO stateAvailable:YES signalStrengthAvailable:YES signalChangeThresholdAvailable:NO hdRadioEnableAvailable:NO siriusxmRadioAvailable:YES];
+        SDLRadioControlCapabilities* testStruct = [[SDLRadioControlCapabilities alloc] initWithModuleName:@"someName" radioEnableAvailable:YES radioBandAvailable:NO radioFrequencyAvailable:YES hdChannelAvailable:NO rdsDataAvailable:NO availableHDsAvailable:NO stateAvailable:YES signalStrengthAvailable:YES signalChangeThresholdAvailable:NO hdRadioEnableAvailable:NO siriusXMRadioAvailable:YES];
 
         expect(testStruct.moduleName).to(equal(@"someName"));
         expect(testStruct.radioEnableAvailable).to(equal(@YES));
@@ -107,7 +124,7 @@ describe(@"Initialization tests", ^{
         expect(testStruct.signalStrengthAvailable).to(equal(@YES));
         expect(testStruct.signalChangeThresholdAvailable).to(equal(@NO));
         expect(testStruct.hdRadioEnableAvailable).to(equal(@NO));
-        expect(testStruct.siriusxmRadioAvailable).to(equal(@YES));
+        expect(testStruct.siriusXMRadioAvailable).to(equal(@YES));
     });
 });
 
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlDataSpec.m
index 16cb12fa1..11a16f83e 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlDataSpec.m
@@ -47,7 +47,7 @@ describe(@"Initialization tests", ^{
                                        SDLNameSignalChangeThreshold : @76,
                                        SDLNameRadioEnable : @YES,
                                        SDLNameState : SDLRadioStateNotFound,
-                                       SDLNameHdRadioEnable : @NO
+                                       SDLNameHDRadioEnable : @NO
                                        } mutableCopy];
         SDLRadioControlData* testStruct = [[SDLRadioControlData alloc] initWithDictionary:dict];