summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus.fritzsch@xse.de>2014-08-01 09:11:39 +0200
committerNobuhiko Tanibata <NOBUHIKO_TANIBATA@denso.co.jp>2014-08-12 22:15:17 +0900
commitcae3c26048694ffe038b4ac84e351686e7b5b1a9 (patch)
treeb37f0a05abaa7689cefd57dcc102fe6d4580341d
parent59077aad9aedb8382f46ca006b66ec381d3064cd (diff)
downloadwayland-ivi-extension-cae3c26048694ffe038b4ac84e351686e7b5b1a9.tar.gz
tests: free resources in ilm_getNumberOfHardwareLayers
Signed-off-by: Marcus Fritzsch <marcus.fritzsch@xse.de>
-rw-r--r--ivi-layermanagement-api/test/ilm_control_test.cpp21
1 files changed, 13 insertions, 8 deletions
diff --git a/ivi-layermanagement-api/test/ilm_control_test.cpp b/ivi-layermanagement-api/test/ilm_control_test.cpp
index 6dcf320..a4a4974 100644
--- a/ivi-layermanagement-api/test/ilm_control_test.cpp
+++ b/ivi-layermanagement-api/test/ilm_control_test.cpp
@@ -1045,16 +1045,21 @@ TEST_F(IlmCommandTest, ilm_getNumberOfHardwareLayers) {
t_ilm_uint numberOfScreens = 0;
t_ilm_uint* screenIDs = NULL;
ASSERT_EQ(ILM_SUCCESS, ilm_getScreenIDs(&numberOfScreens, &screenIDs));
- ASSERT_TRUE(numberOfScreens>0);
+ EXPECT_TRUE(numberOfScreens>0);
- t_ilm_display screen = screenIDs[0];
- t_ilm_uint numberOfHardwareLayers;
+ if (numberOfScreens > 0)
+ {
+ t_ilm_display screen = screenIDs[0];
+ t_ilm_uint numberOfHardwareLayers;
+
+ // Depends on the platform the test is executed on - just check if the
+ // function doesn't fail. The ilm_getPropertiesOfScreen test does a more
+ // comprehensive verification.
+ EXPECT_EQ(ILM_SUCCESS, ilm_getNumberOfHardwareLayers(screen, &numberOfHardwareLayers));
+ EXPECT_GT(numberOfHardwareLayers, 0u);
+ }
- // Depends on the platform the test is executed on - just check if the
- // function doesn't fail. The ilm_getPropertiesOfScreen test does a more
- // comprehensive verification.
- ASSERT_EQ(ILM_SUCCESS, ilm_getNumberOfHardwareLayers(screen, &numberOfHardwareLayers));
- ASSERT_GT(numberOfHardwareLayers, 0u);
+ free(screenIDs);
}
TEST_F(IlmCommandTest, ilm_getPropertiesOfScreen) {