diff options
| author | JackLivio <jack@livio.io> | 2018-06-07 16:30:54 -0400 |
|---|---|---|
| committer | JackLivio <jack@livio.io> | 2018-06-07 16:30:54 -0400 |
| commit | 6800260da4fbb65f652b5128d8a0d19e71f5ff31 (patch) | |
| tree | d633afe8c6b4fd79c477e0da207891b2a1a64b70 /src/components/application_manager/test | |
| parent | d38697a1f064f69cd591b3d9833215707efd54a0 (diff) | |
| download | sdl_core-6800260da4fbb65f652b5128d8a0d19e71f5ff31.tar.gz | |
Check if display capabilities struct is valid before setting value
Diffstat (limited to 'src/components/application_manager/test')
| -rw-r--r-- | src/components/application_manager/test/hmi_capabilities.json | 8 | ||||
| -rw-r--r-- | src/components/application_manager/test/hmi_capabilities_test.cc | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/components/application_manager/test/hmi_capabilities.json b/src/components/application_manager/test/hmi_capabilities.json index 0efcc688bc..43539bfc43 100644 --- a/src/components/application_manager/test/hmi_capabilities.json +++ b/src/components/application_manager/test/hmi_capabilities.json @@ -215,7 +215,6 @@ "imageFields": [ { "name": "softButtonImage", - "imageTypeSupported": [], "imageResolution": { "resolutionWidth": 35, "resolutionHeight": 35 @@ -223,7 +222,6 @@ }, { "name": "choiceImage", - "imageTypeSupported": [], "imageResolution": { "resolutionWidth": 35, "resolutionHeight": 35 @@ -231,7 +229,6 @@ }, { "name": "choiceSecondaryImage", - "imageTypeSupported": [], "imageResolution": { "resolutionWidth": 35, "resolutionHeight": 35 @@ -239,7 +236,6 @@ }, { "name": "menuIcon", - "imageTypeSupported": [], "imageResolution": { "resolutionWidth": 35, "resolutionHeight": 35 @@ -247,7 +243,6 @@ }, { "name": "cmdIcon", - "imageTypeSupported": [], "imageResolution": { "resolutionWidth": 35, "resolutionHeight": 35 @@ -255,7 +250,6 @@ }, { "name": "appIcon", - "imageTypeSupported": [], "imageResolution": { "resolutionWidth": 35, "resolutionHeight": 35 @@ -263,7 +257,6 @@ }, { "name": "graphic", - "imageTypeSupported": [], "imageResolution": { "resolutionWidth": 35, "resolutionHeight": 35 @@ -271,7 +264,6 @@ }, { "name": "secondaryGraphic", - "imageTypeSupported": [], "imageResolution": { "resolutionWidth": 35, "resolutionHeight": 35 diff --git a/src/components/application_manager/test/hmi_capabilities_test.cc b/src/components/application_manager/test/hmi_capabilities_test.cc index b8369528aa..9d582d2ba0 100644 --- a/src/components/application_manager/test/hmi_capabilities_test.cc +++ b/src/components/application_manager/test/hmi_capabilities_test.cc @@ -186,6 +186,8 @@ TEST_F(HMICapabilitiesTest, LoadCapabilitiesFromFile) { if (file_system::FileExists("./app_info_data")) { EXPECT_TRUE(::file_system::DeleteFile("./app_info_data")); } + EXPECT_CALL(app_mngr_, IsSOStructValid(_, _)).WillOnce(Return(true)); + EXPECT_TRUE(hmi_capabilities_test->LoadCapabilitiesFromFile()); // Check active languages @@ -562,6 +564,7 @@ TEST_F(HMICapabilitiesTest, TEST_F(HMICapabilitiesTest, VerifyImageType) { const int32_t image_type = 1; smart_objects::SmartObject sm_obj; + EXPECT_CALL(app_mngr_, IsSOStructValid(_, _)).WillOnce(Return(true)); sm_obj[hmi_response::image_capabilities][0] = image_type; hmi_capabilities_test->set_display_capabilities(sm_obj); |