diff options
author | Julian Kast <julian@livio.com> | 2020-07-30 13:09:14 -0400 |
---|---|---|
committer | Julian Kast <julian@livio.com> | 2020-07-30 13:09:14 -0400 |
commit | 77b087a98ade85fda0f9eed4f4d7f13bb2ab46de (patch) | |
tree | ea62b1dc0d665c23b7fffc58eaf5dd49642cd36f | |
parent | 931815d78057861ab34c55858ba334062fb5bfc0 (diff) | |
download | sdl_android-77b087a98ade85fda0f9eed4f4d7f13bb2ab46de.tar.gz |
Fixed formatting
3 files changed, 10 insertions, 9 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java index 5146baa2f..37cae48f4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java @@ -340,7 +340,7 @@ public class TestValues { public static final AppInterfaceUnregisteredReason GENERAL_APPINTERFACEUNREGISTEREDREASON = AppInterfaceUnregisteredReason.BLUETOOTH_OFF; public static final SystemCapabilityType GENERAL_SYSTEMCAPABILITYTYPE = SystemCapabilityType.NAVIGATION; public static final NavigationCapability GENERAL_NAVIGATIONCAPABILITY = new NavigationCapability(); - public static final DriverDistractionCapability GENERAL_DRIVERDISTRACTIONCAPABILITY = new DriverDistractionCapability(); + public static final DriverDistractionCapability GENERAL_DRIVERDISTRACTIONCAPABILITY = new DriverDistractionCapability(); public static final PhoneCapability GENERAL_PHONECAPABILITY = new PhoneCapability(); public static final RemoteControlCapabilities GENERAL_REMOTECONTROLCAPABILITIES = new RemoteControlCapabilities(); public static final SystemCapability GENERAL_SYSTEMCAPABILITY = new SystemCapability(); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java index 27f510b32..e60fa646c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java @@ -23,8 +23,8 @@ public class HMICapabilitiesTests extends TestCase { msg.setNavigationAvilable(TestValues.GENERAL_BOOLEAN); msg.setPhoneCallAvilable(TestValues.GENERAL_BOOLEAN); - msg.setVideoStreamingAvailable(TestValues.GENERAL_BOOLEAN); - msg.setDriverDistraction(TestValues.GENERAL_BOOLEAN); + msg.setVideoStreamingAvailable(TestValues.GENERAL_BOOLEAN); + msg.setDriverDistraction(TestValues.GENERAL_BOOLEAN); } /** @@ -34,8 +34,8 @@ public class HMICapabilitiesTests extends TestCase { // Test Values Boolean navAvail = msg.isNavigationAvailable(); Boolean phoneAvail = msg.isPhoneCallAvailable(); - Boolean vidStreamAvail = msg.isVideoStreamingAvailable(); - Boolean driverDistractionAvail = msg.isDriverDistractionAvailable(); + Boolean vidStreamAvail = msg.isVideoStreamingAvailable(); + Boolean driverDistractionAvail = msg.isDriverDistractionAvailable(); // Valid Tests assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, navAvail); @@ -60,8 +60,8 @@ public class HMICapabilitiesTests extends TestCase { try{ reference.put(KEY_NAVIGATION, TestValues.GENERAL_BOOLEAN); reference.put(HMICapabilities.KEY_PHONE_CALL, TestValues.GENERAL_BOOLEAN); - reference.put(HMICapabilities.KEY_VIDEO_STREAMING, TestValues.GENERAL_BOOLEAN); - reference.put(KEY_DRIVER_DISTRACTION, TestValues.GENERAL_BOOLEAN); + reference.put(HMICapabilities.KEY_VIDEO_STREAMING, TestValues.GENERAL_BOOLEAN); + reference.put(KEY_DRIVER_DISTRACTION, TestValues.GENERAL_BOOLEAN); JSONObject underTest = msg.serializeJSON(); assertEquals(TestValues.MATCH, reference.length(), underTest.length()); @@ -72,9 +72,9 @@ public class HMICapabilitiesTests extends TestCase { assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(reference, KEY_PHONE_CALL), JsonUtils.readStringListFromJsonObject(underTest, KEY_PHONE_CALL)); - assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(reference, KEY_VIDEO_STREAMING), + assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(reference, KEY_VIDEO_STREAMING), JsonUtils.readStringListFromJsonObject(underTest, KEY_VIDEO_STREAMING)); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(reference, KEY_DRIVER_DISTRACTION), + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(reference, KEY_DRIVER_DISTRACTION), JsonUtils.readStringFromJsonObject(underTest, KEY_DRIVER_DISTRACTION)); } catch(JSONException e){ diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java index 73c81c924..f1b3c4821 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java @@ -134,6 +134,7 @@ public class HMICapabilities extends RPCStruct{ public void setSeatLocationAvailable(Boolean available){ setValue(KEY_SEAT_LOCATION, available); } + /** * Sets the driverDistraction. * |