summaryrefslogtreecommitdiff
path: root/src/components/application_manager/test
diff options
context:
space:
mode:
authorJacob Keeler <jacob.keeler@livioradio.com>2016-11-01 14:34:58 -0400
committerGitHub <noreply@github.com>2016-11-01 14:34:58 -0400
commit3b8ce0f1028523f5db0b2771a37f8e37b3901ce5 (patch)
tree8a40f2878c2f54e2c72db50d5244e819665b7fc4 /src/components/application_manager/test
parentc187dc97fcf391ef385a56dd8edc119cddacc56f (diff)
parent9b9b7ab2d31b98bfef6a76fafbd5de9707b0750a (diff)
downloadsdl_core-3b8ce0f1028523f5db0b2771a37f8e37b3901ce5.tar.gz
Merge pull request #766 from smartdevicelink/feature/PLAY_PAUSE_implementation
Inclusion of PLAY_PAUSE as a subscribable button
Diffstat (limited to 'src/components/application_manager/test')
-rw-r--r--src/components/application_manager/test/hmi_capabilities.json6
-rw-r--r--src/components/application_manager/test/hmi_capabilities_test.cc2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/components/application_manager/test/hmi_capabilities.json b/src/components/application_manager/test/hmi_capabilities.json
index c174dfcba4..89524971fe 100644
--- a/src/components/application_manager/test/hmi_capabilities.json
+++ b/src/components/application_manager/test/hmi_capabilities.json
@@ -422,6 +422,12 @@
"upDownAvailable" :true
},
{
+ "name":"PLAY_PAUSE",
+ "shortPressAvailable":true,
+ "longPressAvailable" :true,
+ "upDownAvailable" :true
+ },
+ {
"name":"SEEKLEFT",
"shortPressAvailable":true,
"longPressAvailable" :true,
diff --git a/src/components/application_manager/test/hmi_capabilities_test.cc b/src/components/application_manager/test/hmi_capabilities_test.cc
index 738797b122..945578f586 100644
--- a/src/components/application_manager/test/hmi_capabilities_test.cc
+++ b/src/components/application_manager/test/hmi_capabilities_test.cc
@@ -236,7 +236,7 @@ TEST_F(HMICapabilitiesTest, LoadCapabilitiesFromFile) {
// Count of buttons in json file
const uint32_t btn_length = buttons_capabilities_so.length();
- EXPECT_EQ(15u, btn_length);
+ EXPECT_EQ(16u, btn_length);
for (uint32_t i = 0; i < btn_length; ++i) {
EXPECT_TRUE((buttons_capabilities_so[i]).keyExists(strings::name));
EXPECT_TRUE((buttons_capabilities_so[i]).keyExists("shortPressAvailable"));