diff options
author | kboskin <kboskin> | 2020-12-29 16:29:27 +0200 |
---|---|---|
committer | kboskin <kboskin> | 2020-12-29 16:29:27 +0200 |
commit | 33149b6da5f153e82ffbfb134c1e4bd4f5df66c4 (patch) | |
tree | 184d6b4ef7f30403c98a35fdbbd10a3a33bc8fcd | |
parent | 1bb1ae0f82d8f4490412da25371e660930ffa503 (diff) | |
download | sdl_android-33149b6da5f153e82ffbfb134c1e4bd4f5df66c4.tar.gz |
[0262]
- Fix PR comments
-rw-r--r-- | android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java | 6 | ||||
-rw-r--r-- | android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java index a7595956b..a43ef3fda 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java @@ -3918,13 +3918,13 @@ public class Validator { return (item1 == null); } - List<SeatStatus> seatStatuses1 = item1.getSeatsBelted(); + List<SeatStatus> seatsBelted1 = item1.getSeatsBelted(); List<SeatStatus> seatsOccupied1 = item1.getSeatsOccupied(); - List<SeatStatus> seatStatuses2 = item2.getSeatsBelted(); + List<SeatStatus> seatsBelted2 = item2.getSeatsBelted(); List<SeatStatus> seatsOccupied2 = item2.getSeatsOccupied(); - return validateSeatStatuses(seatStatuses1, seatStatuses2) && validateSeatStatuses(seatsOccupied1, seatsOccupied2); + return validateSeatStatuses(seatsBelted1, seatsBelted2) && validateSeatStatuses(seatsOccupied1, seatsOccupied2); } public static boolean validateStabilityControlStatus(StabilityControlsStatus status1, StabilityControlsStatus status2) { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java index aa96a8e86..4155a28c7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java @@ -95,10 +95,6 @@ public class VehicleDataHelper { // Seat Occupancy public static final SeatOccupancy SEAT_OCCUPANCY = new SeatOccupancy(); - public static final List<SeatStatus> SEATS_OCCUPIED = new ArrayList<SeatStatus>(1); - public static final List<SeatStatus> SEATS_BELTED = new ArrayList<SeatStatus>(1); - public static final SeatStatus SEAT_STATUS = new SeatStatus(); - public static final SeatLocation SEAT_LOCATION = new SeatLocation(); //other variables inside some of the above objects // tire status @@ -236,6 +232,11 @@ public class VehicleDataHelper { //GetVehicleDataResponse data which stores the same things public static final GetVehicleDataResponse VEHICLE_DATA_RESPONSE = new GetVehicleDataResponse(); + public static final List<SeatStatus> SEATS_OCCUPIED = new ArrayList<SeatStatus>(1); + public static final List<SeatStatus> SEATS_BELTED = new ArrayList<SeatStatus>(1); + public static final SeatStatus SEAT_STATUS = new SeatStatus(); + public static final SeatLocation SEAT_LOCATION = new SeatLocation(); + static { //TIRE_PRESSURE set up TIRE_PRESSURE.setPressureTellTale(TIRE_PRESSURE_TELL_TALE); |