Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[0285] ShowConstantTBT Description Update #1581

Merged
merged 4 commits into from
Jan 12, 2021
Merged

[0285] ShowConstantTBT Description Update #1581

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab048ce
[0285]
Dec 9, 2020
a0b0380
[0285]
Jan 6, 2021
cd2c28c
[0285]
Jan 11, 2021
c1dd605
[0285]
Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions ...roid/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.smartdevicelink.protocol.enums.FunctionID;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KostyaBoss I would revert these changes in ShowConstantTbtTests.java. They are valid changes, but are out of scope of the PR.

import com.smartdevicelink.proxy.RPCMessage;
import com.smartdevicelink.proxy.rpc.Image;
import com.smartdevicelink.proxy.rpc.ShowConstantTbt;
import com.smartdevicelink.proxy.rpc.ShowConstantTBT;
import com.smartdevicelink.proxy.rpc.SoftButton;
import com.smartdevicelink.test.BaseRpcTests;
import com.smartdevicelink.test.JsonUtils;
Expand All @@ -30,13 +30,13 @@

/**
* This is a unit test class for the SmartDeviceLink library project class :
* {@link com.smartdevicelink.proxy.rpc.ShowConstantTbt}
* {@link com.smartdevicelink.proxy.rpc.ShowConstantTBT}
*/
public class ShowConstantTbtTests extends BaseRpcTests {

@Override
protected RPCMessage createMessage() {
ShowConstantTbt msg = new ShowConstantTbt();
ShowConstantTBT msg = new ShowConstantTBT();

msg.setDistanceToManeuver(TestValues.GENERAL_DOUBLE);
msg.setDistanceToManeuverScale(TestValues.GENERAL_DOUBLE);
Expand Down Expand Up @@ -68,17 +68,17 @@ protected JSONObject getExpectedParameters(int sdlVersion) {
JSONObject result = new JSONObject();

try {
result.put(ShowConstantTbt.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
result.put(ShowConstantTbt.KEY_ETA, TestValues.GENERAL_STRING);
result.put(ShowConstantTbt.KEY_MANEUVER_COMPLETE, true);
result.put(ShowConstantTbt.KEY_MANEUVER_DISTANCE, TestValues.GENERAL_DOUBLE);
result.put(ShowConstantTbt.KEY_MANEUVER_DISTANCE_SCALE, TestValues.GENERAL_DOUBLE);
result.put(ShowConstantTbt.KEY_TEXT1, TestValues.GENERAL_STRING);
result.put(ShowConstantTbt.KEY_TEXT2, TestValues.GENERAL_STRING);
result.put(ShowConstantTbt.KEY_TIME_TO_DESTINATION, TestValues.GENERAL_STRING);
result.put(ShowConstantTbt.KEY_TOTAL_DISTANCE, TestValues.GENERAL_STRING);
result.put(ShowConstantTbt.KEY_MANEUVER_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON());
result.put(ShowConstantTbt.KEY_NEXT_MANEUVER_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON());
result.put(ShowConstantTBT.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
result.put(ShowConstantTBT.KEY_ETA, TestValues.GENERAL_STRING);
result.put(ShowConstantTBT.KEY_MANEUVER_COMPLETE, true);
result.put(ShowConstantTBT.KEY_DISTANCE_TO_MANEUVER, TestValues.GENERAL_DOUBLE);
result.put(ShowConstantTBT.KEY_DISTANCE_TO_MANEUVER_SCALE, TestValues.GENERAL_DOUBLE);
result.put(ShowConstantTBT.KEY_TEXT1, TestValues.GENERAL_STRING);
result.put(ShowConstantTBT.KEY_TEXT2, TestValues.GENERAL_STRING);
result.put(ShowConstantTBT.KEY_TIME_TO_DESTINATION, TestValues.GENERAL_STRING);
result.put(ShowConstantTBT.KEY_TOTAL_DISTANCE, TestValues.GENERAL_STRING);
result.put(ShowConstantTBT.KEY_MANEUVER_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON());
result.put(ShowConstantTBT.KEY_NEXT_MANEUVER_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON());
} catch (JSONException e) {
fail(TestValues.JSON_FAIL);
}
Expand All @@ -92,17 +92,17 @@ protected JSONObject getExpectedParameters(int sdlVersion) {
@Test
public void testRpcValues() {
// Test Values
Double testScale = ((ShowConstantTbt) msg).getDistanceToManeuverScale();
Double testDistance = ((ShowConstantTbt) msg).getDistanceToManeuver();
String testEta = ((ShowConstantTbt) msg).getEta();
String testTimeToDestination = ((ShowConstantTbt) msg).getTimeToDestination();
String testTotalDistance = ((ShowConstantTbt) msg).getTotalDistance();
String testNavText2 = ((ShowConstantTbt) msg).getNavigationText2();
String testNavText1 = ((ShowConstantTbt) msg).getNavigationText1();
Boolean testManeuverComplete = ((ShowConstantTbt) msg).getManeuverComplete();
Image testTurnIcon = ((ShowConstantTbt) msg).getTurnIcon();
Image testNextTurnIcon = ((ShowConstantTbt) msg).getNextTurnIcon();
List<SoftButton> testSoftButtons = ((ShowConstantTbt) msg).getSoftButtons();
Double testScale = ((ShowConstantTBT) msg).getDistanceToManeuverScale();
Double testDistance = ((ShowConstantTBT) msg).getDistanceToManeuver();
String testEta = ((ShowConstantTBT) msg).getEta();
String testTimeToDestination = ((ShowConstantTBT) msg).getTimeToDestination();
String testTotalDistance = ((ShowConstantTBT) msg).getTotalDistance();
String testNavText2 = ((ShowConstantTBT) msg).getNavigationText2();
String testNavText1 = ((ShowConstantTBT) msg).getNavigationText1();
Boolean testManeuverComplete = ((ShowConstantTBT) msg).getManeuverComplete();
Image testTurnIcon = ((ShowConstantTBT) msg).getTurnIcon();
Image testNextTurnIcon = ((ShowConstantTBT) msg).getNextTurnIcon();
List<SoftButton> testSoftButtons = ((ShowConstantTBT) msg).getSoftButtons();

// Valid Test
assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTimeToDestination);
Expand All @@ -118,7 +118,7 @@ public void testRpcValues() {
assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testNextTurnIcon));

// Invalid/Null Tests
ShowConstantTbt msg = new ShowConstantTbt();
ShowConstantTBT msg = new ShowConstantTBT();
assertNotNull(TestValues.NOT_NULL, msg);
testNullBase(msg);

Expand All @@ -145,7 +145,7 @@ public void testJsonConstructor() {

try {
Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
ShowConstantTbt cmd = new ShowConstantTbt(hash);
ShowConstantTBT cmd = new ShowConstantTBT(hash);
JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
assertNotNull(TestValues.NOT_NULL, body);

Expand All @@ -154,24 +154,24 @@ public void testJsonConstructor() {
assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());

JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_ETA), cmd.getEta());
assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_COMPLETE), cmd.getManeuverComplete());
assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_DISTANCE), cmd.getDistanceToManeuver());
assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_DISTANCE_SCALE), cmd.getDistanceToManeuverScale());
assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TEXT1), cmd.getNavigationText1());
assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TEXT2), cmd.getNavigationText2());
assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TIME_TO_DESTINATION), cmd.getTimeToDestination());
assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TOTAL_DISTANCE), cmd.getTotalDistance());

JSONObject icon1 = JsonUtils.readJsonObjectFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_IMAGE);
assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTBT.KEY_ETA), cmd.getEta());
assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, ShowConstantTBT.KEY_MANEUVER_COMPLETE), cmd.getManeuverComplete());
assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTBT.KEY_DISTANCE_TO_MANEUVER), cmd.getDistanceToManeuver());
assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTBT.KEY_DISTANCE_TO_MANEUVER_SCALE), cmd.getDistanceToManeuverScale());
assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTBT.KEY_TEXT1), cmd.getNavigationText1());
assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTBT.KEY_TEXT2), cmd.getNavigationText2());
assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTBT.KEY_TIME_TO_DESTINATION), cmd.getTimeToDestination());
assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTBT.KEY_TOTAL_DISTANCE), cmd.getTotalDistance());

JSONObject icon1 = JsonUtils.readJsonObjectFromJsonObject(parameters, ShowConstantTBT.KEY_MANEUVER_IMAGE);
Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(icon1));
assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, cmd.getTurnIcon()));

JSONObject icon2 = JsonUtils.readJsonObjectFromJsonObject(parameters, ShowConstantTbt.KEY_NEXT_MANEUVER_IMAGE);
JSONObject icon2 = JsonUtils.readJsonObjectFromJsonObject(parameters, ShowConstantTBT.KEY_NEXT_MANEUVER_IMAGE);
Image refIcon2 = new Image(JsonRPCMarshaller.deserializeJSONObject(icon2));
assertTrue(TestValues.TRUE, Validator.validateImage(refIcon2, cmd.getNextTurnIcon()));

JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ShowConstantTbt.KEY_SOFT_BUTTONS);
JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ShowConstantTBT.KEY_SOFT_BUTTONS);
List<SoftButton> softButtonList = new ArrayList<SoftButton>();
for (int index = 0; index < softButtonArray.length(); index++) {
SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index)));
Expand Down
10 changes: 5 additions & 5 deletions ...androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.smartdevicelink.marshal.JsonRPCMarshaller;
import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCMessage;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KostyaBoss I would revert these changes in ShowConstantTbtResponseTests.java. This PR only deals with the ShowConstantTbtRequest so these changes are out of scope of the PR.

import com.smartdevicelink.proxy.rpc.ShowConstantTbtResponse;
import com.smartdevicelink.proxy.rpc.ShowConstantTBTResponse;
import com.smartdevicelink.test.BaseRpcTests;
import com.smartdevicelink.test.JsonUtils;
import com.smartdevicelink.test.TestValues;
Expand All @@ -21,13 +21,13 @@

/**
* This is a unit test class for the SmartDeviceLink library project class :
* {@link com.smartdevicelink.proxy.rpc.ShowConstantTbtResponse}
* {@link com.smartdevicelink.proxy.rpc.ShowConstantTBTResponse}
*/
public class ShowConstantTbtResponseTests extends BaseRpcTests {

@Override
protected RPCMessage createMessage() {
ShowConstantTbtResponse msg = new ShowConstantTbtResponse();
ShowConstantTBTResponse msg = new ShowConstantTBTResponse();
return msg;
}

Expand All @@ -52,7 +52,7 @@ protected JSONObject getExpectedParameters(int sdlVersion) {
@Test
public void testRpcValues() {
// Invalid/Null Tests
ShowConstantTbtResponse msg = new ShowConstantTbtResponse();
ShowConstantTBTResponse msg = new ShowConstantTBTResponse();
assertNotNull(TestValues.NOT_NULL, msg);
testNullBase(msg);
}
Expand All @@ -67,7 +67,7 @@ public void testJsonConstructor() {

try {
Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
ShowConstantTbtResponse cmd = new ShowConstantTbtResponse(hash);
ShowConstantTBTResponse cmd = new ShowConstantTBTResponse(hash);
JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
assertNotNull(TestValues.NOT_NULL, body);

Expand Down
Loading