diff options
author | Brett <3911458+BrettyWhite@users.noreply.github.com> | 2019-03-15 13:23:29 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-15 13:23:29 -0400 |
commit | 7529355b13c14368272a1254bed8a9cdd5931cb0 (patch) | |
tree | 1ac07c9f1411224750bd513648ba7aeb3a120cd3 | |
parent | e1e6c0af71cd2e107debc4465991cdc896ee7424 (diff) | |
parent | ab061310c8a73951c9ff6f76bdff3b0eae917f9d (diff) | |
download | sdl_android-7529355b13c14368272a1254bed8a9cdd5931cb0.tar.gz |
Merge pull request #1001 from smartdevicelink/feature/update_app_services
update app services
6 files changed, 21 insertions, 22 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java index 0ce007113..289bc5771 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java @@ -960,7 +960,7 @@ public class Test { GENERAL_WEATHERDATA.setPrecipProbability(GENERAL_FLOAT); GENERAL_WEATHERDATA.setPrecipType(GENERAL_STRING); GENERAL_WEATHERDATA.setVisibility(GENERAL_FLOAT); - GENERAL_WEATHERDATA.setWeatherIconImageName(GENERAL_STRING); + GENERAL_WEATHERDATA.setWeatherIcon(GENERAL_IMAGE); GENERAL_WEATHERALERT.setTitle(GENERAL_STRING); GENERAL_WEATHERALERT.setSummary(GENERAL_STRING); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java index 595793049..e1619e086 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java @@ -1627,7 +1627,7 @@ public class Validator{ return false; } - if (!item1.getWeatherIconImageName().equals(item2.getWeatherIconImageName())) { + if (!validateImage(item1.getWeatherIcon(), item2.getWeatherIcon())) { return false; } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java index 70454f5c3..04522acfb 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java @@ -2,6 +2,7 @@ package com.smartdevicelink.test.rpc.datatypes; import com.smartdevicelink.marshal.JsonRPCMarshaller; import com.smartdevicelink.proxy.rpc.DateTime; +import com.smartdevicelink.proxy.rpc.Image; import com.smartdevicelink.proxy.rpc.Temperature; import com.smartdevicelink.proxy.rpc.WeatherData; import com.smartdevicelink.test.JsonUtils; @@ -49,7 +50,7 @@ public class WeatherDataTests extends TestCase { msg.setPrecipProbability(Test.GENERAL_FLOAT); msg.setPrecipType(Test.GENERAL_STRING); msg.setVisibility(Test.GENERAL_FLOAT); - msg.setWeatherIconImageName(Test.GENERAL_STRING); + msg.setWeatherIcon(Test.GENERAL_IMAGE); } /** @@ -77,7 +78,7 @@ public class WeatherDataTests extends TestCase { Float precipProbability = msg.getPrecipProbability(); String precipType = msg.getPrecipType(); Float visibility = msg.getVisibility(); - String weatherIconImageName = msg.getWeatherIconImageName(); + Image weatherIcon = msg.getWeatherIcon(); // Valid Tests assertEquals(Test.MATCH, currentTemperature, Test.GENERAL_TEMPERATURE); @@ -100,7 +101,7 @@ public class WeatherDataTests extends TestCase { assertEquals(Test.MATCH, precipProbability, Test.GENERAL_FLOAT); assertEquals(Test.MATCH, precipType, Test.GENERAL_STRING); assertEquals(Test.MATCH, visibility, Test.GENERAL_FLOAT); - assertEquals(Test.MATCH, weatherIconImageName, Test.GENERAL_STRING); + assertEquals(Test.MATCH, weatherIcon, Test.GENERAL_IMAGE); // Invalid/Null Tests WeatherData msg = new WeatherData(); @@ -127,7 +128,7 @@ public class WeatherDataTests extends TestCase { assertNull(Test.NULL, msg.getPrecipProbability()); assertNull(Test.NULL, msg.getPrecipType()); assertNull(Test.NULL, msg.getVisibility()); - assertNull(Test.NULL, msg.getWeatherIconImageName()); + assertNull(Test.NULL, msg.getWeatherIcon()); } public void testJson(){ @@ -155,7 +156,7 @@ public class WeatherDataTests extends TestCase { reference.put(WeatherData.KEY_PRECIP_PROBABILITY, Test.GENERAL_FLOAT); reference.put(WeatherData.KEY_PRECIP_TYPE, Test.GENERAL_STRING); reference.put(WeatherData.KEY_VISIBILITY, Test.GENERAL_FLOAT); - reference.put(WeatherData.KEY_WEATHER_ICON_IMAGE_NAME, Test.GENERAL_STRING); + reference.put(WeatherData.KEY_WEATHER_ICON, Test.GENERAL_STRING); JSONObject underTest = msg.serializeJSON(); assertEquals(Test.MATCH, reference.length(), underTest.length()); @@ -173,6 +174,10 @@ public class WeatherDataTests extends TestCase { JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); assertTrue(Test.TRUE, Validator.validateDateTime(Test.GENERAL_DATETIME, new DateTime(hashTest))); + } else if (key.equals(WeatherData.KEY_WEATHER_ICON)){ + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(Test.TRUE, Validator.validateImage(Test.GENERAL_IMAGE, new Image(hashTest))); } else { assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java index 08a8f6536..9ffff3d61 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java @@ -55,11 +55,6 @@ public class GetAppServiceDataResponseTests extends BaseRpcTests { // test getter AppServiceData serviceData = msg.getServiceData(); assertEquals(Test.GENERAL_APPSERVICE_DATA, serviceData); - - // test constructor - msg = new GetAppServiceDataResponse(true, Result.SUCCESS, Test.GENERAL_APPSERVICE_DATA); - serviceData = msg.getServiceData(); - assertEquals(Test.GENERAL_APPSERVICE_DATA, serviceData); } /** diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java index db2dea526..570f7a91b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java @@ -25,9 +25,8 @@ public class GetAppServiceDataResponse extends RPCResponse { super(hash); } - public GetAppServiceDataResponse(@NonNull Boolean success, @NonNull Result resultCode, @NonNull AppServiceData serviceData){ + public GetAppServiceDataResponse(@NonNull Boolean success, @NonNull Result resultCode){ this(); - setServiceData(serviceData); setSuccess(success); setResultCode(resultCode); } @@ -37,7 +36,7 @@ public class GetAppServiceDataResponse extends RPCResponse { /** * @param serviceData - */ - public void setServiceData(@NonNull AppServiceData serviceData){ + public void setServiceData(AppServiceData serviceData){ setParameters(KEY_SERVICE_DATA, serviceData); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java index a71261902..0e781ca51 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java @@ -27,7 +27,7 @@ public class WeatherData extends RPCStruct { public static final String KEY_PRECIP_PROBABILITY = "precipProbability"; public static final String KEY_PRECIP_TYPE = "precipType"; public static final String KEY_VISIBILITY = "visibility"; - public static final String KEY_WEATHER_ICON_IMAGE_NAME = "weatherIconImageName"; + public static final String KEY_WEATHER_ICON = "weatherIcon"; // Constructors @@ -320,17 +320,17 @@ public class WeatherData extends RPCStruct { } /** - * @param weatherIconImageName - + * @param weatherIcon - */ - public void setWeatherIconImageName(String weatherIconImageName) { - setValue(KEY_WEATHER_ICON_IMAGE_NAME, weatherIconImageName); + public void setWeatherIcon(Image weatherIcon) { + setValue(KEY_WEATHER_ICON, weatherIcon); } /** - * @return weatherIconImageName + * @return weatherIcon */ - public String getWeatherIconImageName() { - return getString(KEY_WEATHER_ICON_IMAGE_NAME); + public Image getWeatherIcon() { + return (Image) getObject(Image.class, KEY_WEATHER_ICON); } /** |