diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-07-16 13:28:41 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-07-16 13:28:41 -0400 |
| commit | 7670e941015be7d09e8ae2860fa672aab86979ef (patch) | |
| tree | 1a5eee945dcd54b7edaa823c0d7655a55f3cc007 | |
| parent | 8a54c46935b10e8a7ffa91021586a86654295d55 (diff) | |
| download | sdl_android-feature/issue_795.tar.gz | |
Fix issue in code formattingfeature/issue_795
| -rw-r--r-- | android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java | 12 | ||||
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java index f1c2c036e..d4a7bd473 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java @@ -88,7 +88,7 @@ public class AlertTests extends BaseRpcTests{ boolean testProgressIndicator = ( (Alert) msg ).getProgressIndicator(); List<TTSChunk> testTtsChunks = ( (Alert) msg ).getTtsChunks(); List<SoftButton> testSoftButtons = ( (Alert) msg ).getSoftButtons(); - Image alertIcon = ( (Alert) msg ).getAlertIcon(); + Image alertIcon = ( (Alert) msg ).getAlertIcon(); // Valid Tests assertEquals(Test.MATCH, Test.GENERAL_INT, testDuration); @@ -98,8 +98,8 @@ public class AlertTests extends BaseRpcTests{ assertEquals(Test.MATCH, Test.GENERAL_BOOLEAN, testPlayTone); assertEquals(Test.MATCH, Test.GENERAL_BOOLEAN, testProgressIndicator); assertTrue(Test.TRUE, Validator.validateSoftButtons(Test.GENERAL_SOFTBUTTON_LIST, testSoftButtons)); - assertTrue(Test.TRUE, Validator.validateTtsChunks(Test.GENERAL_TTSCHUNK_LIST, testTtsChunks)); - assertTrue(Test.TRUE, Validator.validateImage(Test.GENERAL_IMAGE, alertIcon)); + assertTrue(Test.TRUE, Validator.validateTtsChunks(Test.GENERAL_TTSCHUNK_LIST, testTtsChunks)); + assertTrue(Test.TRUE, Validator.validateImage(Test.GENERAL_IMAGE, alertIcon)); // Invalid/Null Tests Alert msg = new Alert(); @@ -158,9 +158,9 @@ public class AlertTests extends BaseRpcTests{ } assertTrue(Test.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); - JSONObject alertIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, Alert.KEY_ALERT_ICON); - Image referenceAlertIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(alertIcon)); - assertTrue(Test.TRUE, Validator.validateImage(referenceAlertIcon, cmd.getAlertIcon())); + JSONObject alertIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, Alert.KEY_ALERT_ICON); + Image referenceAlertIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(alertIcon)); + assertTrue(Test.TRUE, Validator.validateImage(referenceAlertIcon, cmd.getAlertIcon())); } catch (JSONException e) { fail(Test.JSON_FAIL); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java index 2dfe59adf..d37e84fb3 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java @@ -399,7 +399,6 @@ public class Alert extends RPCRequest { /**
* <p>Gets the image to be shown along with the alert </p>
- *
* @return Image -an Image object
*/
public Image getAlertIcon() {
|