diff options
author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2018-10-12 17:24:17 -0400 |
---|---|---|
committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2018-10-12 17:24:17 -0400 |
commit | 4d26854337509b2941f4329ff513332155b91c43 (patch) | |
tree | c7da81f0258f433cfcc931e5f711f1a7ebebb075 | |
parent | 2eae60962aaecbab570eec9cdf6655002acd64de (diff) | |
download | sdl_android-4d26854337509b2941f4329ff513332155b91c43.tar.gz |
Ignore history tags in MOBILE_API.xmlupdate_rpc_specs_file
3 files changed, 4 insertions, 3 deletions
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java index fccd8fd2e..eaa7bf4c9 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java @@ -164,6 +164,7 @@ import org.json.JSONObject; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Vector; @@ -381,6 +382,7 @@ public class Test { public static final List<LightCapabilities> GENERAL_LIGHTCAPABILITIES_LIST = new ArrayList<LightCapabilities>(1); public static final List<LightState> GENERAL_LIGHTSTATE_LIST = new ArrayList<LightState>(1); public static final List<AudioControlCapabilities> GENERAL_AUDIOCONTROLCAPABILITIES_LIST = new ArrayList<AudioControlCapabilities>(1); + public static final List<ModuleData> GENERAL_MODULEDATA_LIST = Collections.singletonList(GENERAL_MODULEDATA); public static final JSONArray JSON_TURNS = new JSONArray(); public static final JSONArray JSON_CHOICES = new JSONArray(); diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java index 8e14c47e8..7b497310e 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java @@ -98,7 +98,7 @@ public class RPCConstructorsTests extends AndroidTestCase2 { } } // Store the mandatory params for the current RPC in the map - if(name.equals("param") && !ignoreRPC){ + if(name.equals("param") && myParser.getAttributeValue(null, "until") == null && !ignoreRPC){ boolean mandatory = Boolean.valueOf(myParser.getAttributeValue(null,"mandatory")); if (mandatory) { String paramName = myParser.getAttributeValue(null, "name"); diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java index 5fbd48b91..a6d4d63fd 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java @@ -20,8 +20,7 @@ public class OnRCStatusTests extends BaseRpcTests { protected RPCMessage createMessage() { OnRCStatus msg = new OnRCStatus(); - List<ModuleData> listAllocatedModules = new ArrayList<>(); - listAllocatedModules.add(Test.GENERAL_MODULEDATA); + List<ModuleData> listAllocatedModules = Test.GENERAL_MODULEDATA_LIST; msg.setAllocatedModules(listAllocatedModules); |