1 files changed, 18 insertions, 2 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
index 4365ceafa..71f7d3ecf 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
@@ -1,15 +1,19 @@
 package com.smartdevicelink.test.rpc.datatypes;
 
+import com.smartdevicelink.marshal.JsonRPCMarshaller;
 import com.smartdevicelink.proxy.rpc.ButtonCapabilities;
+import com.smartdevicelink.proxy.rpc.ModuleInfo;
 import com.smartdevicelink.proxy.rpc.enums.ButtonName;
 import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.Test;
+import com.smartdevicelink.test.Validator;
 
 import junit.framework.TestCase;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Hashtable;
 import java.util.Iterator;
 
 /**
@@ -28,6 +32,7 @@ public class ButtonCapabilitiesTests extends TestCase{
         msg.setName(Test.GENERAL_BUTTONNAME);
         msg.setShortPressAvailable(Test.GENERAL_BOOLEAN);
         msg.setUpDownAvailable(Test.GENERAL_BOOLEAN);
+        msg.setModuleInfo(Test.GENERAL_MODULE_INFO);
     }
 
 
@@ -40,12 +45,14 @@ public class ButtonCapabilitiesTests extends TestCase{
         boolean longPress = msg.getLongPressAvailable();
         boolean upDown = msg.getUpDownAvailable();
         ButtonName buttonName = msg.getName();
+        ModuleInfo info = msg.getModuleInfo();
         
         // Valid Tests
         assertEquals(Test.MATCH, Test.GENERAL_BOOLEAN, shortPress);
         assertEquals(Test.MATCH, Test.GENERAL_BOOLEAN, longPress);
         assertEquals(Test.MATCH, Test.GENERAL_BOOLEAN, upDown);
         assertEquals(Test.MATCH, Test.GENERAL_BUTTONNAME, buttonName);
+        assertEquals(Test.MATCH, Test.GENERAL_MODULE_INFO, info);
         
         // Invalid/Null Tests
         ButtonCapabilities msg = new ButtonCapabilities();
@@ -65,15 +72,24 @@ public class ButtonCapabilitiesTests extends TestCase{
             reference.put(ButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, Test.GENERAL_BOOLEAN);
             reference.put(ButtonCapabilities.KEY_UP_DOWN_AVAILABLE, Test.GENERAL_BOOLEAN);
             reference.put(ButtonCapabilities.KEY_NAME, Test.GENERAL_BUTTONNAME);
+            reference.put(ButtonCapabilities.KEY_MODULE_INFO, Test.JSON_MODULE_INFO);
 
             JSONObject underTest = msg.serializeJSON();
 
             assertEquals(Test.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
-                assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                if (key.equals(ButtonCapabilities.KEY_MODULE_INFO)) {
+                    JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1);
+                    Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2);
+                    assertTrue(Test.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2)));
+                } else {
+                    assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
             }
         } catch(JSONException e){
         	fail(Test.JSON_FAIL);