Skip to content

Commit 93031bf

Browse files
author
Julian Kast
committed
Fix TestValues names for RPCGenericTests
1 parent 98fc500 commit 93031bf

8 files changed

Lines changed: 39 additions & 37 deletions

File tree

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ public class TestValues {
277277
public static final List<LocationDetails> GENERAL_LOCATIONDETAILS_LIST = Arrays.asList(new LocationDetails[]{TestValues.GENERAL_LOCATIONDETAILS, TestValues.GENERAL_LOCATIONDETAILS});
278278
public static final AudioStreamingIndicator GENERAL_AUDIO_STREAMING_INDICATOR = AudioStreamingIndicator.PLAY;
279279
public static final SeekStreamingIndicator GENERAL_SEEK_STREAMING_INDICATOR = new SeekStreamingIndicator(SeekIndicatorType.TRACK);
280+
public static final SeekIndicatorType GENERAL_SEEKINDICATORTYPE = SeekIndicatorType.TRACK;
280281
public static final String GENERAL_APP_ID = "123e4567e8";
281282
public static final String GENERAL_FULL_APP_ID = "123e4567-e89b-12d3-a456-426655440000";
282283
public static final String GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME = "oemCustomVehicleDataName";
@@ -315,8 +316,8 @@ public class TestValues {
315316
public static final DistanceUnit GENERAL_DISTANCEUNIT = DistanceUnit.KILOMETERS;
316317
public static final LightStatus GENERAL_LIGHTSTATUS = LightStatus.OFF;
317318
public static final RadioBand GENERAL_RADIOBAND = RadioBand.AM;
318-
public static final AppCapabilityType GENERAL_APP_CAPABILITY_TYPE = AppCapabilityType.VIDEO_STREAMING;
319-
public static final AppCapability GENERAL_APP_CAPABILITY = new AppCapability();
319+
public static final AppCapabilityType GENERAL_APPCAPABILITYTYPE = AppCapabilityType.VIDEO_STREAMING;
320+
public static final AppCapability GENERAL_APPCAPABILITY = new AppCapability();
320321
public static final ClimateControlData GENERAL_CLIMATECONTROLDATA = new ClimateControlData();
321322
public static final ClimateData GENERAL_CLIMATEDATA = new ClimateData();
322323
public static final SeatControlData GENERAL_SEATCONTROLDATA = new SeatControlData();
@@ -346,8 +347,8 @@ public class TestValues {
346347
public static final List<SeatStatus> GENERAL_SEATS_OCCUPIED = new ArrayList<SeatStatus>(1);
347348
public static final List<SeatStatus> GENERAL_SEATS_BELTED = new ArrayList<SeatStatus>(1);
348349
public static final SeatStatus GENERAL_SEAT_STATUS = new SeatStatus();
349-
public static final SeatLocation GENERAL_SEAT_LOCATION = new SeatLocation();
350-
public static final DoorStatusType GENERAL_DOOR_STATUS_TYPE = DoorStatusType.REMOVED;
350+
public static final SeatLocation GENERAL_SEATLOCATION = new SeatLocation();
351+
public static final DoorStatusType GENERAL_DOORSTATUSTYPE = DoorStatusType.REMOVED;
351352

352353
public static final DoorStatus GENERAL_DOOR_STATUS = new DoorStatus();
353354
public static final GateStatus GENERAL_GATE_STATUS = new GateStatus();
@@ -709,7 +710,7 @@ public void onVoiceCommandSelected() {
709710

710711
GENERAL_MEDIACLOCKFORMAT_LIST.add(MediaClockFormat.CLOCK1);
711712
GENERAL_MEDIACLOCKFORMAT_LIST.add(MediaClockFormat.CLOCK2);
712-
GENERAL_SEAT_LIST.add(GENERAL_SEAT_LOCATION);
713+
GENERAL_SEAT_LIST.add(GENERAL_SEATLOCATION);
713714

714715
GENERAL_IMAGE.setValue(GENERAL_STRING);
715716
GENERAL_IMAGE.setImageType(GENERAL_IMAGETYPE);
@@ -1113,14 +1114,14 @@ public void onVoiceCommandSelected() {
11131114
GENERAL_KEYBOARD_CAPABILITIES.setMaskInputCharactersSupported(TestValues.GENERAL_BOOLEAN);
11141115
GENERAL_KEYBOARD_CAPABILITIES.setSupportedKeyboards(GENERAL_SUPPORTED_KEYBOARDS_LIST);
11151116

1116-
GENERAL_APP_CAPABILITY.setVideoStreamingCapability(GENERAL_VIDEOSTREAMINGCAPABILITY);
1117-
GENERAL_APP_CAPABILITY.setAppCapabilityType(GENERAL_APP_CAPABILITY_TYPE);
1117+
GENERAL_APPCAPABILITY.setVideoStreamingCapability(GENERAL_VIDEOSTREAMINGCAPABILITY);
1118+
GENERAL_APPCAPABILITY.setAppCapabilityType(GENERAL_APPCAPABILITYTYPE);
11181119

11191120
// SEAT_OCCUPANCY
1120-
GENERAL_SEAT_LOCATION.setGrid(GENERAL_LOCATION_GRID);
1121+
GENERAL_SEATLOCATION.setGrid(GENERAL_LOCATION_GRID);
11211122

11221123
GENERAL_SEAT_STATUS.setConditionActive(GENERAL_BOOLEAN);
1123-
GENERAL_SEAT_STATUS.setSeatLocation(GENERAL_SEAT_LOCATION);
1124+
GENERAL_SEAT_STATUS.setSeatLocation(GENERAL_SEATLOCATION);
11241125

11251126
GENERAL_SEATS_BELTED.add(GENERAL_SEAT_STATUS);
11261127
GENERAL_SEATS_OCCUPIED.add(GENERAL_SEAT_STATUS);
@@ -1130,15 +1131,15 @@ public void onVoiceCommandSelected() {
11301131

11311132
GENERAL_ROOF_STATUS.setLocation(GENERAL_GRID);
11321133
GENERAL_ROOF_STATUS.setState(GENERAL_WINDOW_STATE);
1133-
GENERAL_ROOF_STATUS.setStatus(GENERAL_DOOR_STATUS_TYPE);
1134+
GENERAL_ROOF_STATUS.setStatus(GENERAL_DOORSTATUSTYPE);
11341135
GENERAL_ROOF_STATUS_LIST.add(GENERAL_ROOF_STATUS);
11351136

11361137
GENERAL_GATE_STATUS.setLocation(GENERAL_GRID);
1137-
GENERAL_GATE_STATUS.setStatus(GENERAL_DOOR_STATUS_TYPE);
1138+
GENERAL_GATE_STATUS.setStatus(GENERAL_DOORSTATUSTYPE);
11381139
GENERAL_GATE_STATUS_LIST.add(GENERAL_GATE_STATUS);
11391140

11401141
GENERAL_DOOR_STATUS.setLocation(GENERAL_GRID);
1141-
GENERAL_DOOR_STATUS.setStatus(GENERAL_DOOR_STATUS_TYPE);
1142+
GENERAL_DOOR_STATUS.setStatus(GENERAL_DOORSTATUSTYPE);
11421143
GENERAL_DOOR_STATUS_LIST.add(GENERAL_DOOR_STATUS);
11431144

11441145
// Climate Data
@@ -1156,11 +1157,11 @@ public void onVoiceCommandSelected() {
11561157
JSON_KEYBOARD_CAPABILITY.put(KeyboardCapabilities.KEY_SUPPORTED_KEYBOARDS, JSON_SUPPORTED_KEYBOARDS_LIST);
11571158

11581159

1159-
JSON_OBJECT_GENERAL_SEATS_OCCUPIED.put(SeatStatus.KEY_SEAT_LOCATION, GENERAL_SEAT_LOCATION.serializeJSON());
1160+
JSON_OBJECT_GENERAL_SEATS_OCCUPIED.put(SeatStatus.KEY_SEAT_LOCATION, GENERAL_SEATLOCATION.serializeJSON());
11601161
JSON_OBJECT_GENERAL_SEATS_OCCUPIED.put(SeatStatus.KEY_CONDITION_ACTIVE, GENERAL_BOOLEAN);
11611162
JSON_GENERAL_SEATS_OCCUPIED.put(JSON_OBJECT_GENERAL_SEATS_OCCUPIED);
11621163

1163-
JSON_OBJECT_GENERAL_SEATS_BELTED.put(SeatStatus.KEY_SEAT_LOCATION, GENERAL_SEAT_LOCATION.serializeJSON());
1164+
JSON_OBJECT_GENERAL_SEATS_BELTED.put(SeatStatus.KEY_SEAT_LOCATION, GENERAL_SEATLOCATION.serializeJSON());
11641165
JSON_OBJECT_GENERAL_SEATS_BELTED.put(SeatStatus.KEY_CONDITION_ACTIVE,GENERAL_BOOLEAN);
11651166
JSON_GENERAL_SEATS_BELTED.put(JSON_OBJECT_GENERAL_SEATS_BELTED);
11661167

@@ -1401,14 +1402,14 @@ public void onVoiceCommandSelected() {
14011402
JSON_MODULE_INFO.put(ModuleInfo.KEY_MODULE_SERVICE_AREA, TestValues.JSON_GRID);
14021403
JSON_MODULE_INFO.put(ModuleInfo.KEY_MULTIPLE_ACCESS_ALLOWED, TestValues.GENERAL_BOOLEAN);
14031404

1404-
JSON_ROOF_STATUS.put(RoofStatus.KEY_STATUS, GENERAL_DOOR_STATUS_TYPE);
1405+
JSON_ROOF_STATUS.put(RoofStatus.KEY_STATUS, GENERAL_DOORSTATUSTYPE);
14051406
JSON_ROOF_STATUS.put(RoofStatus.KEY_LOCATION, JSON_GRID);
14061407
JSON_ROOF_STATUS.put(RoofStatus.KEY_STATE, GENERAL_WINDOW_STATE.serializeJSON());
14071408

1408-
JSON_DOOR_STATUS.put(DoorStatus.KEY_STATUS, GENERAL_DOOR_STATUS_TYPE);
1409+
JSON_DOOR_STATUS.put(DoorStatus.KEY_STATUS, GENERAL_DOORSTATUSTYPE);
14091410
JSON_DOOR_STATUS.put(DoorStatus.KEY_LOCATION, JSON_GRID);
14101411

1411-
JSON_GATE_STATUS.put(GateStatus.KEY_STATUS, GENERAL_DOOR_STATUS_TYPE);
1412+
JSON_GATE_STATUS.put(GateStatus.KEY_STATUS, GENERAL_DOORSTATUSTYPE);
14121413
JSON_GATE_STATUS.put(GateStatus.KEY_LOCATION, JSON_GRID);
14131414

14141415
JSON_ROOF_STATUSES.put(JSON_ROOF_STATUS);

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppCapabilityTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class AppCapabilityTests extends TestCase {
2626
public void setUp() {
2727

2828
msg = new AppCapability();
29-
msg.setAppCapabilityType(TestValues.GENERAL_APP_CAPABILITY_TYPE);
29+
msg.setAppCapabilityType(TestValues.GENERAL_APPCAPABILITYTYPE);
3030
msg.setVideoStreamingCapability(TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY);
3131
}
3232

@@ -40,7 +40,7 @@ public void testRpcValues () {
4040

4141
// Valid Tests
4242
assertEquals(TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY, videoStreamingCapability);
43-
assertEquals(TestValues.GENERAL_APP_CAPABILITY_TYPE, videoStreamingCapabilityType);
43+
assertEquals(TestValues.GENERAL_APPCAPABILITYTYPE, videoStreamingCapabilityType);
4444

4545
// Invalid/Null Tests
4646
AppCapability msg = new AppCapability();
@@ -54,7 +54,7 @@ public void testJson(){
5454
JSONObject reference = new JSONObject();
5555

5656
try{
57-
reference.put(KEY_APP_CAPABILITY_TYPE, TestValues.GENERAL_APP_CAPABILITY_TYPE);
57+
reference.put(KEY_APP_CAPABILITY_TYPE, TestValues.GENERAL_APPCAPABILITYTYPE);
5858
reference.put(KEY_VIDEO_STREAMING_CAPABILITY, TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY);
5959

6060
JSONObject underTest = msg.serializeJSON();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class DoorStatusTests extends TestCase {
2222

2323
@Override
2424
public void setUp() {
25-
msg = new DoorStatus(TestValues.GENERAL_GRID, TestValues.GENERAL_DOOR_STATUS_TYPE);
25+
msg = new DoorStatus(TestValues.GENERAL_GRID, TestValues.GENERAL_DOORSTATUSTYPE);
2626
}
2727

2828
public void testRpcValues() {
@@ -32,14 +32,14 @@ public void testRpcValues() {
3232

3333
// Valid Tests
3434
assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, location);
35-
assertEquals(TestValues.MATCH, TestValues.GENERAL_DOOR_STATUS_TYPE, status);
35+
assertEquals(TestValues.MATCH, TestValues.GENERAL_DOORSTATUSTYPE, status);
3636
}
3737

3838
public void testJson() {
3939
JSONObject reference = new JSONObject();
4040

4141
try {
42-
reference.put(RoofStatus.KEY_STATUS, TestValues.GENERAL_DOOR_STATUS_TYPE);
42+
reference.put(RoofStatus.KEY_STATUS, TestValues.GENERAL_DOORSTATUSTYPE);
4343
reference.put(RoofStatus.KEY_LOCATION, TestValues.JSON_GRID);
4444

4545
JSONObject underTest = msg.serializeJSON();

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GateStatusTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class GateStatusTests extends TestCase {
2222

2323
@Override
2424
public void setUp() {
25-
msg = new GateStatus(TestValues.GENERAL_GRID, TestValues.GENERAL_DOOR_STATUS_TYPE);
25+
msg = new GateStatus(TestValues.GENERAL_GRID, TestValues.GENERAL_DOORSTATUSTYPE);
2626
}
2727

2828
public void testRpcValues() {
@@ -32,14 +32,14 @@ public void testRpcValues() {
3232

3333
// Valid Tests
3434
assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, location);
35-
assertEquals(TestValues.MATCH, TestValues.GENERAL_DOOR_STATUS_TYPE, status);
35+
assertEquals(TestValues.MATCH, TestValues.GENERAL_DOORSTATUSTYPE, status);
3636
}
3737

3838
public void testJson() {
3939
JSONObject reference = new JSONObject();
4040

4141
try {
42-
reference.put(RoofStatus.KEY_STATUS, TestValues.GENERAL_DOOR_STATUS_TYPE);
42+
reference.put(RoofStatus.KEY_STATUS, TestValues.GENERAL_DOORSTATUSTYPE);
4343
reference.put(RoofStatus.KEY_LOCATION, TestValues.JSON_GRID);
4444

4545
JSONObject underTest = msg.serializeJSON();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class RoofStatusTests extends TestCase {
2323

2424
@Override
2525
public void setUp() {
26-
msg = new RoofStatus(TestValues.GENERAL_GRID, TestValues.GENERAL_DOOR_STATUS_TYPE);
26+
msg = new RoofStatus(TestValues.GENERAL_GRID, TestValues.GENERAL_DOORSTATUSTYPE);
2727
msg.setState(TestValues.GENERAL_WINDOW_STATE);
2828
}
2929

@@ -35,15 +35,15 @@ public void testRpcValues() {
3535

3636
// Valid Tests
3737
assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, location);
38-
assertEquals(TestValues.MATCH, TestValues.GENERAL_DOOR_STATUS_TYPE, status);
38+
assertEquals(TestValues.MATCH, TestValues.GENERAL_DOORSTATUSTYPE, status);
3939
assertEquals(TestValues.MATCH, TestValues.GENERAL_WINDOW_STATE, windowState);
4040
}
4141

4242
public void testJson() {
4343
JSONObject reference = new JSONObject();
4444

4545
try {
46-
reference.put(RoofStatus.KEY_STATUS, TestValues.GENERAL_DOOR_STATUS_TYPE);
46+
reference.put(RoofStatus.KEY_STATUS, TestValues.GENERAL_DOORSTATUSTYPE);
4747
reference.put(RoofStatus.KEY_STATE, TestValues.GENERAL_WINDOW_STATE.serializeJSON());
4848
reference.put(RoofStatus.KEY_LOCATION, TestValues.JSON_GRID);
4949

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatStatusTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class SeatStatusTests extends TestCase {
2323
public void setUp() {
2424
msg = new SeatStatus();
2525

26-
msg.setSeatLocation(TestValues.GENERAL_SEAT_LOCATION);
26+
msg.setSeatLocation(TestValues.GENERAL_SEATLOCATION);
2727
msg.setConditionActive(TestValues.GENERAL_BOOLEAN);
2828
}
2929

@@ -36,7 +36,7 @@ public void testRpcValues() {
3636
Boolean conditionActive = msg.getConditionActive();
3737

3838
// Valid Tests
39-
assertEquals(TestValues.MATCH, TestValues.GENERAL_SEAT_LOCATION, location);
39+
assertEquals(TestValues.MATCH, TestValues.GENERAL_SEATLOCATION, location);
4040
assertEquals(TestValues.GENERAL_BOOLEAN, (boolean) conditionActive);
4141

4242
// Invalid/Null Tests
@@ -52,7 +52,7 @@ public void testJson() {
5252

5353
try {
5454
reference.put(SeatStatus.KEY_CONDITION_ACTIVE, TestValues.GENERAL_BOOLEAN);
55-
reference.put(SeatStatus.KEY_SEAT_LOCATION, TestValues.GENERAL_SEAT_LOCATION.serializeJSON());
55+
reference.put(SeatStatus.KEY_SEAT_LOCATION, TestValues.GENERAL_SEATLOCATION.serializeJSON());
5656

5757
JSONObject underTest = msg.serializeJSON();
5858
assertEquals(TestValues.MATCH, reference.length(), underTest.length());

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppCapabilityUpdatedTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class OnAppCapabilityUpdatedTests extends BaseRpcTests {
2121
@Override
2222
protected RPCMessage createMessage(){
2323
OnAppCapabilityUpdated msg = new OnAppCapabilityUpdated();
24-
msg.setAppCapability(TestValues.GENERAL_APP_CAPABILITY);
24+
msg.setAppCapability(TestValues.GENERAL_APPCAPABILITY);
2525

2626
return msg;
2727
}
@@ -41,7 +41,7 @@ protected JSONObject getExpectedParameters(int sdlVersion){
4141
JSONObject result = new JSONObject();
4242

4343
try{
44-
result.put(OnAppCapabilityUpdated.KEY_APP_CAPABILITY, TestValues.GENERAL_APP_CAPABILITY.serializeJSON());
44+
result.put(OnAppCapabilityUpdated.KEY_APP_CAPABILITY, TestValues.GENERAL_APPCAPABILITY.serializeJSON());
4545
}catch(JSONException e){
4646
fail(TestValues.JSON_FAIL);
4747
}
@@ -58,7 +58,7 @@ public void testRpcValues () {
5858
AppCapability appCapability = ( (OnAppCapabilityUpdated) msg ).getAppCapability();
5959

6060
// Valid Tests
61-
assertEquals(TestValues.MATCH, TestValues.GENERAL_APP_CAPABILITY, appCapability);
61+
assertEquals(TestValues.MATCH, TestValues.GENERAL_APPCAPABILITY, appCapability);
6262

6363
// Invalid/Null Tests
6464
OnAppCapabilityUpdated msg = new OnAppCapabilityUpdated();
@@ -68,8 +68,8 @@ public void testRpcValues () {
6868
assertNull(TestValues.NULL, msg.getAppCapability());
6969

7070
// test constructor with param
71-
msg = new OnAppCapabilityUpdated(TestValues.GENERAL_APP_CAPABILITY);
71+
msg = new OnAppCapabilityUpdated(TestValues.GENERAL_APPCAPABILITY);
7272
AppCapability generalAppCapability = msg.getAppCapability();
73-
assertEquals(generalAppCapability, TestValues.GENERAL_APP_CAPABILITY);
73+
assertEquals(generalAppCapability, TestValues.GENERAL_APPCAPABILITY);
7474
}
7575
}

‎base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public enum VehicleDataType {
6969
* Notifies EXTERNTEMPData may be subscribed
7070
* @deprecated since SmartDeviceLink 7.1.0
7171
*/
72+
@Deprecated
7273
VEHICLEDATA_EXTERNTEMP,
7374
/**
7475
* Notifies VINData may be subscribed

0 commit comments

Comments
 (0)