sdl-0266 "New vehicle data GearStatus": code review, update Gear Status & Vehicle Data Type

4 files changed, 18 insertions, 11 deletions

diff --git a/SmartDeviceLink/SDLGearStatus.m b/SmartDeviceLink/SDLGearStatus.m
index f2d11c4f4..a183def8f 100644
--- a/SmartDeviceLink/SDLGearStatus.m
+++ b/SmartDeviceLink/SDLGearStatus.m
@@ -56,7 +56,8 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (nullable SDLPRNDL)userSelectedGear {
-    return [self.store sdl_enumForName:SDLRPCParameterNameUserSelectedGear error:nil];
+    NSError *error = nil;
+    return [self.store sdl_enumForName:SDLRPCParameterNameUserSelectedGear error:&error];
 }
 
 - (void)setActualGear:(nullable SDLPRNDL)actualGear {
@@ -64,7 +65,8 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (nullable SDLPRNDL)actualGear {
-    return [self.store sdl_enumForName:SDLRPCParameterNameActualGear error:nil];
+    NSError *error = nil;
+    return [self.store sdl_enumForName:SDLRPCParameterNameActualGear error:&error];
 }
 
 - (void)setTransmissionType:(nullable SDLTransmissionType)transmissionType {
@@ -72,7 +74,8 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (nullable SDLTransmissionType)transmissionType {
-    return [self.store sdl_enumForName:SDLRPCParameterNameTransmissionType error:nil];
+    NSError *error = nil;
+    return [self.store sdl_enumForName:SDLRPCParameterNameTransmissionType error:&error];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLVehicleDataType.h b/SmartDeviceLink/SDLVehicleDataType.h
index 2c5b0a027..257baf23a 100644
--- a/SmartDeviceLink/SDLVehicleDataType.h
+++ b/SmartDeviceLink/SDLVehicleDataType.h
@@ -171,7 +171,7 @@ extern SDLVehicleDataType const SDLVehicleDataTypeOdometer;
  * Vehicle PRNDL data
  * @deprecated since 7.0.0
  */
-extern SDLVehicleDataType const SDLVehicleDataTypePrndl;
+extern SDLVehicleDataType const SDLVehicleDataTypePrndl __deprecated_msg("deprecated since 7.0.0");
 
 /**
  Vehicle RPM data
diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m
index 021ac5a31..06c4d605b 100644
--- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m
@@ -36,7 +36,6 @@ describe(@"Individual Enum Value Tests", ^ {
         expect(SDLVehicleDataTypeHeadlampStatus).to(equal(@"VEHICLEDATA_HEADLAMPSTATUS"));
         expect(SDLVehicleDataTypeMyKey).to(equal(@"VEHICLEDATA_MYKEY"));
         expect(SDLVehicleDataTypeOdometer).to(equal(@"VEHICLEDATA_ODOMETER"));
-        expect(SDLVehicleDataTypePrndl).to(equal(@"VEHICLEDATA_PRNDL"));
         expect(SDLVehicleDataTypeRPM).to(equal(@"VEHICLEDATA_RPM"));
         expect(SDLVehicleDataTypeSpeed).to(equal(@"VEHICLEDATA_SPEED"));
         expect(SDLVehicleDataTypeSteeringWheel).to(equal(@"VEHICLEDATA_STEERINGWHEEL"));
@@ -44,6 +43,10 @@ describe(@"Individual Enum Value Tests", ^ {
         expect(SDLVehicleDataTypeTurnSignal).to(equal(@"VEHICLEDATA_TURNSIGNAL"));
         expect(SDLVehicleDataTypeVIN).to(equal(@"VEHICLEDATA_VIN"));
         expect(SDLVehicleDataTypeWiperStatus).to(equal(@"VEHICLEDATA_WIPERSTATUS"));
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+        expect(SDLVehicleDataTypePrndl).to(equal(@"VEHICLEDATA_PRNDL"));
+#pragma clang diagnostic pop
     });
 });
 
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGearStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGearStatusSpec.m
index b0af609ce..6a49b3853 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGearStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGearStatusSpec.m
@@ -11,12 +11,13 @@
 QuickSpecBegin(SDLGearStatusSpec)
 
 describe(@"Getter/Setter Tests", ^ {
-    it(@"Should set and get correctly", ^ {
-    SDLGearStatus* testStruct = [[SDLGearStatus alloc] initWithUserSelectedGear:SDLPRNDLNinth actualGear:SDLPRNDLTenth transmissionType:SDLTransmissionTypeAutomatic];
-
-        expect(testStruct.userSelectedGear).to(equal(SDLPRNDLNinth));
-        expect(testStruct.actualGear).to(equal(SDLPRNDLTenth));
-        expect(testStruct.transmissionType).to(equal(SDLTransmissionTypeAutomatic));
+    context(@"initWithUserSelectedGear:actualGear:transmissionType:", ^{
+        SDLGearStatus* testStruct = [[SDLGearStatus alloc] initWithUserSelectedGear:SDLPRNDLNinth actualGear:SDLPRNDLTenth transmissionType:SDLTransmissionTypeAutomatic];
+        it(@"Expect all properties to be set properly", ^ {
+            expect(testStruct.userSelectedGear).to(equal(SDLPRNDLNinth));
+            expect(testStruct.actualGear).to(equal(SDLPRNDLTenth));
+            expect(testStruct.transmissionType).to(equal(SDLTransmissionTypeAutomatic));
+        });
     });
 
     it(@"Should get correctly when initialized", ^ {