Update unit tests for menuIcon in AddSubMenufeature/issue_603

2 files changed, 20 insertions, 4 deletions

diff --git a/sdl_android/src/androidTest/assets/json/AddSubMenu.json b/sdl_android/src/androidTest/assets/json/AddSubMenu.json
index 5d86c2615..37cc46adb 100644
--- a/sdl_android/src/androidTest/assets/json/AddSubMenu.json
+++ b/sdl_android/src/androidTest/assets/json/AddSubMenu.json
@@ -5,7 +5,11 @@
     "parameters":{
     	"menuID":765,
     	"position":2,
-    	"menuName":"Menu Name"
+    	"menuName":"Menu Name",
+    	"menuIcon":{
+    		"value":"cmdImage1.png",
+    		"imageType":"DYNAMIC"
+    	}
     }
 	},
 	"response":{
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
index e44340216..1d28dcc14 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
@@ -9,14 +9,16 @@ import com.smartdevicelink.marshal.JsonRPCMarshaller;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.AddSubMenu;
+import com.smartdevicelink.proxy.rpc.Image;
 import com.smartdevicelink.test.BaseRpcTests;
 import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.Test;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.rpc.AddSubmenu}
+ * {@link com.smartdevicelink.proxy.rpc.AddSubMenu}
  */
 public class AddSubmenuTests extends BaseRpcTests{
 
@@ -27,6 +29,7 @@ public class AddSubmenuTests extends BaseRpcTests{
         msg.setMenuID(Test.GENERAL_INT);
         msg.setMenuName(Test.GENERAL_STRING);
         msg.setPosition(Test.GENERAL_INT);
+        msg.setMenuIcon(Test.GENERAL_IMAGE);
 
         return msg;
     }
@@ -49,6 +52,7 @@ public class AddSubmenuTests extends BaseRpcTests{
             result.put(AddSubMenu.KEY_MENU_ID, Test.GENERAL_INT);
             result.put(AddSubMenu.KEY_MENU_NAME, Test.GENERAL_STRING);
             result.put(AddSubMenu.KEY_POSITION, Test.GENERAL_INT);
+            result.put(AddSubMenu.KEY_MENU_ICON, Test.JSON_IMAGE);
         }catch(JSONException e){
         	fail(Test.JSON_FAIL);
         }
@@ -64,13 +68,16 @@ public class AddSubmenuTests extends BaseRpcTests{
         int testMenuId      = ( (AddSubMenu) msg ).getMenuID();
         int testPosition    = ( (AddSubMenu) msg ).getPosition();
         String testMenuName = ( (AddSubMenu) msg ).getMenuName();
+        Image testMenuIcon = ( (AddSubMenu) msg ).getMenuIcon();
         
         // Valid Tests
         assertEquals("Menu ID didn't match input menu ID.", Test.GENERAL_INT, testMenuId);
         assertEquals("Menu name didn't match input menu name.", Test.GENERAL_STRING, testMenuName);
         assertEquals("Position didn't match input position.", Test.GENERAL_INT, testPosition);
-    
-    	// Invalid/Null Tests
+        assertTrue("Menu icon didn't match input position.", Validator.validateImage(Test.GENERAL_IMAGE, testMenuIcon));
+
+
+        // Invalid/Null Tests
         AddSubMenu msg = new AddSubMenu();
         assertNotNull("Null object creation failed.", msg);
         testNullBase(msg);
@@ -78,6 +85,7 @@ public class AddSubmenuTests extends BaseRpcTests{
         assertNull(Test.NULL, msg.getMenuID());
         assertNull(Test.NULL, msg.getMenuName());
         assertNull(Test.NULL, msg.getPosition());
+        assertNull(Test.NULL, msg.getMenuIcon());
     }
     
     /**
@@ -103,6 +111,10 @@ public class AddSubmenuTests extends BaseRpcTests{
 			assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_MENU_ID), cmd.getMenuID());
 			assertEquals(Test.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_POSITION), cmd.getPosition());
 			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, AddSubMenu.KEY_MENU_NAME), cmd.getMenuName());
+
+            JSONObject menuIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, AddSubMenu.KEY_MENU_ICON);
+            Image referenceMenuIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(menuIcon));
+            assertTrue(Test.TRUE, Validator.validateImage(referenceMenuIcon, cmd.getMenuIcon()));
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
 		}