[0255] Enchance body information #1583

kboskin · 2020-12-09T20:07:08Z

Fixes #1234

This PR is [ready] for review.

Related PR's

Core
HMI

Risk

This PR makes [minor] API changes.

Testing Plan

I have verified that I have not introduced new warnings in this PR (or explain why below)
I have run the unit tests with this PR
I have tested this PR against Core and verified behavior (if applicable, if not applicable, explain why below).
I have tested Android, Java SE, and Java EE

Unit Tests

Added unit tests for the new structures

Summary

Changes according to #1234

CLA

I have signed the CLA

- Implement changes according to the latest specification

kboskin · 2020-12-09T20:07:20Z

@santanamk ready for the Ford review

- Rollback of the imports

santhanamk

@KostyaBoss I have reviewed this PR. Code looks good. I have suggested a few changes. Please review, and make the changes as needed.

santhanamk · 2020-12-11T20:20:08Z

android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java

@@ -31,7 +31,7 @@ public boolean onCreateOptionsMenu(Menu menu) {

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
+        // Handle action bar item clicksere. The action bar will


@KostyaBoss you can revert this change. No changes are needed in MainActivity.java.

santhanamk · 2020-12-11T20:22:14Z

...sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DoorStatusTests.java

+
+import com.smartdevicelink.marshal.JsonRPCMarshaller;
+import com.smartdevicelink.proxy.rpc.DoorStatus;
+import com.smartdevicelink.proxy.rpc.GateStatus;


@KostyaBoss You can remove the unused import GateStatus on line 5.

santhanamk · 2020-12-11T20:36:49Z

...sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DoorStatusTests.java

+    @Override
+    public void setUp() {
+        msg = new DoorStatus(TestValues.GENERAL_GRID, TestValues.GENERAL_DOOR_STATUS_TYPE);
+        msg.setStatus(TestValues.GENERAL_DOOR_STATUS_TYPE);


@KostyaBoss You can remove line 27 msg.setStatus(...) since you are already setting the status using the DoorStatus constructor.

santhanamk · 2020-12-14T06:59:11Z

...sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DoorStatusTests.java

+        DoorStatusType status = msg.getStatus();
+
+        // Valid Tests
+        assertTrue(Validator.validateGrid(msg.getLocation(), location));


@KostyaBoss I would delete line 36 and replace it with

assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, location);

santhanamk · 2020-12-14T07:02:45Z

.../sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GateStatusTest.java

@@ -0,0 +1,66 @@
+package com.smartdevicelink.test.rpc.datatypes;


@KostyaBoss I would rename this file to GateStatusTests.java.

santhanamk · 2020-12-14T07:12:26Z

...sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RoofStatusTests.java

+        // Valid Tests
+        assertTrue(Validator.validateGrid(msg.getLocation(), location));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_DOOR_STATUS_TYPE, status);
+    }


@KostyaBoss Below line 37 I would add this line assertEquals(TestValues.MATCH, TestValues.GENERAL_WINDOW_STATE, windowState);

santhanamk · 2020-12-14T07:25:51Z

base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java

@@ -1,215 +1,423 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.


@KostyaBoss It looks like you used the code generator tool to re-generate the entire file. Can you just merge in the changes that are specific to this PR (in the HTML these would be the parameters from driverDoorAjar to roofStatuses)?

santhanamk · 2020-12-14T07:27:42Z

...src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java

@@ -202,6 +202,9 @@ public void testJson() {
            bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS);


@KostyaBoss I think you can revert these changes, as vehicle data does not need to be changed for this PR. The corresponding PR for the JavaScript suite (https://github.com/smartdevicelink/sdl_javascript_suite/pull/354/files) did not make changes to the vehicle data.

santhanamk · 2020-12-14T07:28:16Z

...roid/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java

@@ -320,6 +320,9 @@ public void testJson() {
            bodyInformationObj.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE);
            bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS);
            bodyInformationObj.put(BodyInformation.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS);
+            bodyInformationObj.put(BodyInformation.KEY_ROOF_STATUSES, VehicleDataHelper.ROOF_STATUES);


@KostyaBoss I think you can revert these changes, as vehicle data does not need to be changed for this PR. The corresponding PR for the JavaScript suite (https://github.com/smartdevicelink/sdl_javascript_suite/pull/354/files) did not make changes to the vehicle data.

santhanamk · 2020-12-14T07:28:57Z

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java

@@ -5,16 +5,19 @@
 import com.smartdevicelink.proxy.rpc.BodyInformation;


@KostyaBoss I think you can revert these changes, as vehicle data does not need to be changed for this PR. The corresponding PR for the JavaScript suite (https://github.com/smartdevicelink/sdl_javascript_suite/pull/354/files) did not make changes to the vehicle data.

- Fix tests

kboskin · 2020-12-20T08:51:58Z

@santhanamk I've processed the changes, please re-review the PR

santhanamk

@KostyaBoss I have gone through the changes. Code looks good. I have given a few more suggestions. Please review whenever you get the chance.

santhanamk · 2020-12-21T17:44:34Z

...sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DoorStatusTests.java

@@ -34,7 +32,7 @@ public void testRpcValues() {

        // Valid Tests
        assertTrue(Validator.validateGrid(msg.getLocation(), location));


@KostyaBoss You can delete line 34: assertTrue(Validator.validateGrid(msg.getLocation(), location));.

santhanamk · 2020-12-21T17:45:12Z

...sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DoorStatusTests.java

@@ -34,7 +32,7 @@ public void testRpcValues() {

        // Valid Tests
        assertTrue(Validator.validateGrid(msg.getLocation(), location));
-        assertEquals(TestValues.MATCH, TestValues.GENERAL_DOOR_STATUS_TYPE, status);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, location);


@KostyaBoss Below line 35 you can bring back the line:

assertEquals(TestValues.MATCH, TestValues.GENERAL_DOOR_STATUS_TYPE, status);

santhanamk · 2020-12-21T17:50:09Z

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java

@@ -5,16 +5,19 @@
 import com.smartdevicelink.proxy.rpc.BodyInformation;
 import com.smartdevicelink.proxy.rpc.ClusterModeStatus;
 import com.smartdevicelink.proxy.rpc.DeviceStatus;
+import com.smartdevicelink.proxy.rpc.DoorStatus;


@KostyaBoss You can revert the changes in VehicleDataHelper.java.

You can delete the unused import on line 8.

santhanamk · 2020-12-21T17:51:21Z

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java

 import com.smartdevicelink.proxy.rpc.ECallInfo;
 import com.smartdevicelink.proxy.rpc.EmergencyEvent;
 import com.smartdevicelink.proxy.rpc.FuelRange;
 import com.smartdevicelink.proxy.rpc.GPSData;
+import com.smartdevicelink.proxy.rpc.GateStatus;


@KostyaBoss You can delete the unused import on line 13.

santhanamk · 2020-12-21T17:51:36Z

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java

 import com.smartdevicelink.proxy.rpc.GearStatus;
 import com.smartdevicelink.proxy.rpc.GetVehicleDataResponse;
 import com.smartdevicelink.proxy.rpc.Grid;
 import com.smartdevicelink.proxy.rpc.HeadLampStatus;
 import com.smartdevicelink.proxy.rpc.MyKey;
 import com.smartdevicelink.proxy.rpc.OnVehicleData;
+import com.smartdevicelink.proxy.rpc.RoofStatus;


@KostyaBoss You can delete the unused import on line 20.

santhanamk · 2020-12-21T17:51:53Z

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java

@@ -48,6 +51,7 @@

 import org.json.JSONArray;
 import org.json.JSONException;
+import org.junit.Test;


@KostyaBoss You can delete the unused import on line 54.

santhanamk · 2020-12-21T17:52:07Z

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java

@@ -147,6 +151,10 @@
    public static final Boolean BODY_INFORMATION_REAR_LEFT_AJAR = false;
    public static final Boolean BODY_INFORMATION_REAR_RIGHT_AJAR = true;

+    public static final JSONArray ROOF_STATUES = TestValues.JSON_ROOF_STATUSES;


@KostyaBoss You can delete lines 154-156.

- Fix pr comments

kboskin · 2020-12-29T14:02:35Z

@santhanamk I've updated the RP, please re-review

santhanamk

@KostyaBoss Code looks good. I have suggested one more change. Please take a look whenever you get the chance.

santhanamk · 2021-01-04T09:12:41Z

...sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DoorStatusTests.java

+        DoorStatusType status = msg.getStatus();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, location);


@KostyaBoss You can add this line below line 34:

assertEquals(TestValues.MATCH, TestValues.GENERAL_DOOR_STATUS_TYPE, status);

- Fix Pr comments

kboskin · 2021-01-06T10:35:18Z

@santhanamk I've processed the changes, please, re-review

santhanamk

@KostyaBoss Code looks good. I have approved the PR.

Once you have tested against Core and HMI (if applicable), please put the links for those PRs. Please mark the PR as ready for review, and you can tag Livio once the testing is done on your end.

kboskin · 2021-01-06T21:05:23Z

@bilal-alsharifi , @jordynmackool the PR is ready for the review

base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java

- Rollback of the JavaDoc

kboskin · 2021-01-15T09:38:52Z

@bilal-alsharifi I've processed the comments, please, re-review the PR

codecov · 2021-01-15T09:46:42Z

Codecov Report

Merging #1583 (3ea6c35) into develop (6831235) will increase coverage by 0.11%.
The diff coverage is 100.00%.

@@              Coverage Diff              @@
##             develop    #1583      +/-   ##
=============================================
+ Coverage      53.81%   53.92%   +0.11%     
- Complexity      4942     4973      +31     
=============================================
  Files            522      526       +4     
  Lines          22631    22690      +59     
  Branches        2823     2823              
=============================================
+ Hits           12178    12236      +58     
- Misses          9461     9462       +1     
  Partials         992      992

Impacted Files	Coverage Δ	Complexity Δ
...com/smartdevicelink/proxy/rpc/BodyInformation.java	`87.17% <100.00%> (+3.84%)`	`22.00 <6.00> (+6.00)`
...java/com/smartdevicelink/proxy/rpc/DoorStatus.java	`100.00% <100.00%> (ø)`	`7.00 <7.00> (?)`
...java/com/smartdevicelink/proxy/rpc/GateStatus.java	`100.00% <100.00%> (ø)`	`7.00 <7.00> (?)`
...java/com/smartdevicelink/proxy/rpc/RoofStatus.java	`100.00% <100.00%> (ø)`	`9.00 <9.00> (?)`
...martdevicelink/proxy/rpc/enums/DoorStatusType.java	`100.00% <100.00%> (ø)`	`2.00 <2.00> (?)`
...rtdevicelink/streaming/video/SdlRemoteDisplay.java	`60.86% <0.00%> (-1.45%)`	`5.00% <0.00%> (ø%)`
.../main/java/com/smartdevicelink/proxy/rpc/Show.java	`94.23% <0.00%> (ø)`	`32.00% <0.00%> (ø%)`
...in/java/com/smartdevicelink/proxy/rpc/AppInfo.java	`76.19% <0.00%> (ø)`	`10.00% <0.00%> (ø%)`
...smartdevicelink/proxy/rpc/enums/TextFieldName.java	`100.00% <0.00%> (ø)`	`2.00% <0.00%> (ø%)`
...martdevicelink/proxy/rpc/RegisterAppInterface.java	`81.33% <0.00%> (ø)`	`36.00% <0.00%> (ø%)`
... and 4 more

bilal-alsharifi

@KostyaBoss finished reviewing and added one more comment.

base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java

- Fix javadoc

[0255]

9ab30be

- Implement changes according to the latest specification

[0255]

2bb4349

- Rollback of the imports

santhanamk reviewed Dec 14, 2020

View reviewed changes

[0255]

f75c83d

- Fix tests

santhanamk reviewed Dec 21, 2020

View reviewed changes

[0255]

6bd783c

- Fix pr comments

santhanamk reviewed Jan 4, 2021

View reviewed changes

[0255]

5f8a2e7

- Fix Pr comments

santhanamk approved these changes Jan 6, 2021

View reviewed changes

bilal-alsharifi mentioned this pull request Jan 11, 2021

Tests fail because current code state doesn't match MOBILE_API #1597

Closed

bilal-alsharifi suggested changes Jan 12, 2021

View reviewed changes

kboskin added 2 commits January 15, 2021 11:27

Merge branch 'develop' into feature/0255_enchance_body_information

4070eac

[0255]

57730e5

- Rollback of the JavaDoc

bilal-alsharifi reviewed Jan 19, 2021

View reviewed changes

base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java Show resolved Hide resolved

[0255]

3ea6c35

- Fix javadoc

bilal-alsharifi approved these changes Jan 25, 2021

View reviewed changes

bilal-alsharifi merged commit c2ad479 into smartdevicelink:develop Jan 26, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[0255] Enchance body information #1583

[0255] Enchance body information #1583

kboskin commented Dec 9, 2020 •

edited

Loading

kboskin commented Dec 9, 2020

santhanamk left a comment

santhanamk Dec 11, 2020

santhanamk Dec 11, 2020

santhanamk Dec 11, 2020

santhanamk Dec 14, 2020

santhanamk Dec 14, 2020

santhanamk Dec 14, 2020

santhanamk Dec 14, 2020

santhanamk Dec 14, 2020

santhanamk Dec 14, 2020

santhanamk Dec 14, 2020

kboskin commented Dec 20, 2020

santhanamk left a comment

santhanamk Dec 21, 2020

santhanamk Dec 21, 2020

santhanamk Dec 21, 2020

santhanamk Dec 21, 2020

santhanamk Dec 21, 2020

santhanamk Dec 21, 2020

santhanamk Dec 21, 2020

kboskin commented Dec 29, 2020

santhanamk left a comment

santhanamk Jan 4, 2021

kboskin commented Jan 6, 2021

santhanamk left a comment

kboskin commented Jan 6, 2021

kboskin commented Jan 15, 2021

codecov bot commented Jan 15, 2021 •

edited

Loading

bilal-alsharifi left a comment

		@@ -0,0 +1,66 @@
		package com.smartdevicelink.test.rpc.datatypes;

		@@ -1,215 +1,423 @@
		/*
		* Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

		@@ -202,6 +202,9 @@ public void testJson() {
		bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS);

		@@ -5,16 +5,19 @@
		import com.smartdevicelink.proxy.rpc.BodyInformation;

		@@ -34,7 +32,7 @@ public void testRpcValues() {

		// Valid Tests
		assertTrue(Validator.validateGrid(msg.getLocation(), location));

[0255] Enchance body information #1583

[0255] Enchance body information #1583

Conversation

kboskin commented Dec 9, 2020 • edited Loading

Related PR's

Risk

Testing Plan

Unit Tests

Summary

CLA

kboskin commented Dec 9, 2020

santhanamk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kboskin commented Dec 20, 2020

santhanamk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kboskin commented Dec 29, 2020

santhanamk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kboskin commented Jan 6, 2021

santhanamk left a comment

Choose a reason for hiding this comment

kboskin commented Jan 6, 2021

kboskin commented Jan 15, 2021

codecov bot commented Jan 15, 2021 • edited Loading

Codecov Report

bilal-alsharifi left a comment

Choose a reason for hiding this comment

kboskin commented Dec 9, 2020 •

edited

Loading

codecov bot commented Jan 15, 2021 •

edited

Loading