summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus.fritzsch@xse.de>2014-08-01 09:12:42 +0200
committerNobuhiko Tanibata <NOBUHIKO_TANIBATA@denso.co.jp>2014-08-12 22:15:17 +0900
commit69594253dd66c22621315f071fd114bd3a17fd90 (patch)
tree5934e5c769b5b236cf84b93faa8e5e735af954b5
parent21eb7d89f0f036aa091f3da9ae8a34b7314e5561 (diff)
downloadwayland-ivi-extension-69594253dd66c22621315f071fd114bd3a17fd90.tar.gz
tests: free resources in DisplaySetRenderOrder_growing
Signed-off-by: Marcus Fritzsch <marcus.fritzsch@xse.de>
-rw-r--r--ivi-layermanagement-api/test/ilm_control_test.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/ivi-layermanagement-api/test/ilm_control_test.cpp b/ivi-layermanagement-api/test/ilm_control_test.cpp
index c382eb5..3bc4d9a 100644
--- a/ivi-layermanagement-api/test/ilm_control_test.cpp
+++ b/ivi-layermanagement-api/test/ilm_control_test.cpp
@@ -1130,18 +1130,21 @@ TEST_F(IlmCommandTest, DisplaySetRenderOrder_growing) {
for (unsigned int j = layerCount; j <= layerCount; --j) // note: using overflow here
{
//put them from end to beginning, so that in each loop iteration the order of layers change
- ASSERT_EQ(ILM_SUCCESS, ilm_displaySetRenderOrder(screen, renderOrder + j, layerCount - j));
- ASSERT_EQ(ILM_SUCCESS, ilm_commitChanges());
- ASSERT_EQ(ILM_SUCCESS, ilm_getPropertiesOfScreen(screen, &screenProps));
-
- ASSERT_EQ(layerCount - j, screenProps.layerCount);
- for(unsigned int k = 0; k < layerCount - j; ++k)
- {
- ASSERT_EQ(renderOrder[j + k], screenProps.layerIds[k]);
- }
+ EXPECT_EQ(ILM_SUCCESS, ilm_displaySetRenderOrder(screen, renderOrder + j, layerCount - j));
+ EXPECT_EQ(ILM_SUCCESS, ilm_commitChanges());
+ EXPECT_EQ(ILM_SUCCESS, ilm_getPropertiesOfScreen(screen, &screenProps));
+
+ EXPECT_EQ(layerCount - j, screenProps.layerCount);
+ if (layerCount - j == screenProps.layerCount)
+ for(unsigned int k = 0; k < layerCount - j; ++k)
+ {
+ EXPECT_EQ(renderOrder[j + k], screenProps.layerIds[k]);
+ }
+ free(screenProps.layerIds);
}
}
+ free(screenIDs);
}
TEST_F(IlmCommandTest, DisplaySetRenderOrder_shrinking) {