Review fixes

Author: vladmu

tests/Test.js

@@ -25,6 +25,7 @@ const WindowState = SDL.rpc.structs.WindowState;
 const Grid = SDL.rpc.structs.Grid;
 const WindowStatus = SDL.rpc.structs.WindowStatus;
 const Temperature = SDL.rpc.structs.Temperature;
+const ClimateData = SDL.rpc.structs.ClimateData;
 
 // enums
 const SpeechCapabilities = SDL.rpc.enums.SpeechCapabilities;
@@ -427,4 +428,15 @@ const GENERAL_TEMPERATURE = Test.GENERAL_TEMPERATURE = new Temperature()
 
 const JSON_TEMPERATURE = Test.JSON_TEMPERATURE = GENERAL_TEMPERATURE.getParameters();
 
+const GENERAL_CLIMATE_DATA = Test.GENERAL_CLIMATE_DATA = new ClimateData()
+    .setAtmosphericPressure(Test.GENERAL_NUMBER)
+    .setCabinTemperature(Test.GENERAL_TEMPERATURE)
+    .setExternalTemperature(Test.GENERAL_TEMPERATURE);
+
+const JSON_CLIMATE_DATA = Test.JSON_CLIMATE_DATA = {
+    [ClimateData.KEY_ATMOSPHERIC_PRESSURE]: Test.GENERAL_NUMBER,
+    [ClimateData.KEY_CABIN_TEMPERATURE]: Test.JSON_TEMPERATURE,
+    [ClimateData.KEY_EXTERNAL_TEMPERATURE]: Test.JSON_TEMPERATURE,
+};
+
 module.exports = Test;

tests/node/rpc/enums/VehicleDataTypeTests.js

@@ -87,8 +87,8 @@ describe('VehicleDataTypeTests', function () {
         Validator.assertNotNullUndefined(enumVehicledataFuellevel, 'VEHICLEDATA_FUELLEVEL returned null.');
         Validator.assertNotNullUndefined(enumVehicledataFuellevelState, 'VEHICLEDATA_FUELLEVEL_STATE returned null.');
         Validator.assertNotNullUndefined(enumVehicledataFuelconsumption, 'VEHICLEDATA_FUELCONSUMPTION returned null.');
-        Validator.assertNotNullUndefined(enumVehicledataClimatedata, 'VEHICLEDATA_FUELCONSUMPTION returned null.');
-        Validator.assertNotNullUndefined(enumVehicledataExterntemp, 'VEHICLEDATA_CLIMATEDATA returned null.');
+        Validator.assertNotNullUndefined(enumVehicledataClimatedata, 'VEHICLEDATA_CLIMATEDATA returned null.');
+        Validator.assertNotNullUndefined(enumVehicledataExterntemp, 'VEHICLEDATA_EXTERNTEMP returned null.');
         Validator.assertNotNullUndefined(enumVehicledataVin, 'VEHICLEDATA_VIN returned null.');
         Validator.assertNotNullUndefined(enumVehicledataPrndl, 'VEHICLEDATA_PRNDL returned null.');
         Validator.assertNotNullUndefined(enumVehicledataTirepressure, 'VEHICLEDATA_TIREPRESSURE returned null.');

tests/node/rpc/messages/GetVehicleDataResponseTests.js

@@ -13,7 +13,6 @@ const TransmissionType = SDL.rpc.enums.TransmissionType;
 
 // structs
 const GearStatus = SDL.rpc.structs.GearStatus;
-const ClimateData = SDL.rpc.structs.ClimateData;
 
 const BaseRpcTests = require('./BaseRpcTests');
 const Test = require('./../../../Test.js');
@@ -39,23 +38,13 @@ describe('GetVehicleDataResponseTests', function () {
             [GearStatus.KEY_TRANSMISSION_TYPE]: TransmissionType.MANUAL,
         };
 
-        this.climateData = new ClimateData()
-            .setAtmosphericPressure(Test.GENERAL_NUMBER)
-            .setCabinTemperature(Test.GENERAL_TEMPERATURE)
-            .setExternalTemperature(Test.GENERAL_TEMPERATURE);
-        const JSON_CLIMATE_DATA = {
-            [ClimateData.KEY_ATMOSPHERIC_PRESSURE]: Test.GENERAL_NUMBER,
-            [ClimateData.KEY_CABIN_TEMPERATURE]: Test.JSON_TEMPERATURE,
-            [ClimateData.KEY_EXTERNAL_TEMPERATURE]: Test.JSON_TEMPERATURE,
-        };
-
         this.createMessage = function () {
             return new GetVehicleDataResponse()
                 .setStabilityControlsStatus(this.stabilityControlsStatus)
                 .setHandsOffSteering(Test.GENERAL_BOOLEAN)
                 .setWindowStatus([Test.GENERAL_WINDOW_STATUS])
                 .setGearStatus(this.gearStatus)
-                .setClimateData(this.climateData);
+                .setClimateData(Test.GENERAL_CLIMATE_DATA);
         };
 
         this.getExpectedParameters = function (sdlVersion) {
@@ -64,7 +53,7 @@ describe('GetVehicleDataResponseTests', function () {
                 [GetVehicleDataResponse.KEY_HANDS_OFF_STEERING]: Test.GENERAL_BOOLEAN,
                 [GetVehicleDataResponse.KEY_WINDOW_STATUS]: [Test.JSON_WINDOWSTATUS],
                 [GetVehicleDataResponse.KEY_GEAR_STATUS]: JSON_GEARSTATUS,
-                [GetVehicleDataResponse.KEY_CLIMATE_DATA]: JSON_CLIMATE_DATA,
+                [GetVehicleDataResponse.KEY_CLIMATE_DATA]: Test.JSON_CLIMATE_DATA,
             };
         };
 

tests/node/rpc/messages/OnVehicleDataTests.js

@@ -13,7 +13,6 @@ const TransmissionType = SDL.rpc.enums.TransmissionType;
 
 // structs
 const GearStatus = SDL.rpc.structs.GearStatus;
-const ClimateData = SDL.rpc.structs.ClimateData;
 
 const BaseRpcTests = require('./BaseRpcTests');
 const Test = require('./../../../Test.js');
@@ -39,23 +38,13 @@ describe('OnVehicleDataTests', function () {
             [GearStatus.KEY_TRANSMISSION_TYPE]: TransmissionType.MANUAL,
         };
 
-        this.climateData = new ClimateData()
-            .setAtmosphericPressure(Test.GENERAL_NUMBER)
-            .setCabinTemperature(Test.GENERAL_TEMPERATURE)
-            .setExternalTemperature(Test.GENERAL_TEMPERATURE);
-        const JSON_CLIMATE_DATA = {
-            [ClimateData.KEY_ATMOSPHERIC_PRESSURE]: Test.GENERAL_NUMBER,
-            [ClimateData.KEY_CABIN_TEMPERATURE]: Test.JSON_TEMPERATURE,
-            [ClimateData.KEY_EXTERNAL_TEMPERATURE]: Test.JSON_TEMPERATURE,
-        };
-
         this.createMessage = function () {
             return new OnVehicleData()
                 .setStabilityControlsStatus(this.stabilityControlsStatus)
                 .setHandsOffSteering(Test.GENERAL_BOOLEAN)
                 .setWindowStatus([Test.GENERAL_WINDOW_STATUS])
                 .setGearStatus(this.gearStatus)
-                .setClimateData(this.climateData);
+                .setClimateData(Test.GENERAL_CLIMATE_DATA);
         };
 
         this.getExpectedParameters = function (sdlVersion) {
@@ -64,7 +53,7 @@ describe('OnVehicleDataTests', function () {
                 [OnVehicleData.KEY_HANDS_OFF_STEERING]: Test.GENERAL_BOOLEAN,
                 [OnVehicleData.KEY_WINDOW_STATUS]: [Test.JSON_WINDOWSTATUS],
                 [OnVehicleData.KEY_GEAR_STATUS]: JSON_GEARSTATUS,
-                [OnVehicleData.KEY_CLIMATE_DATA]: JSON_CLIMATE_DATA,
+                [OnVehicleData.KEY_CLIMATE_DATA]: Test.JSON_CLIMATE_DATA,
             };
         };