From 3c5681bf932da305b8fbe52a4cbccf666550304a Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Fri, 1 Aug 2014 09:13:42 +0200 Subject: tests: free resources in LayerSetRenderOrder_shrinking Signed-off-by: Marcus Fritzsch --- ivi-layermanagement-api/test/ilm_control_test.cpp | 25 +++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/ivi-layermanagement-api/test/ilm_control_test.cpp b/ivi-layermanagement-api/test/ilm_control_test.cpp index b5677b8..324c003 100644 --- a/ivi-layermanagement-api/test/ilm_control_test.cpp +++ b/ivi-layermanagement-api/test/ilm_control_test.cpp @@ -1279,22 +1279,25 @@ TEST_F(IlmCommandTest, LayerSetRenderOrder_shrinking) { for (unsigned int j = 0; j < layerCount; ++j) { //put them from end to beginning, so that in each loop iteration the order of surafces change - ASSERT_EQ(ILM_SUCCESS, ilm_layerSetRenderOrder(layer, renderOrder + j, surfaceCount - j)); - ASSERT_EQ(ILM_SUCCESS, ilm_commitChanges()); - ASSERT_EQ(ILM_SUCCESS, ilm_getSurfaceIDsOnLayer(layer, &layerSurfaceCount, &layerSurfaceIDs)); - - ASSERT_EQ(surfaceCount - j, layerSurfaceCount); - for(unsigned int k = 0; k < surfaceCount - j; ++k) - { - ASSERT_EQ(renderOrder[j + k], layerSurfaceIDs[k]); - } + EXPECT_EQ(ILM_SUCCESS, ilm_layerSetRenderOrder(layer, renderOrder + j, surfaceCount - j)); + EXPECT_EQ(ILM_SUCCESS, ilm_commitChanges()); + EXPECT_EQ(ILM_SUCCESS, ilm_getSurfaceIDsOnLayer(layer, &layerSurfaceCount, &layerSurfaceIDs)); + + EXPECT_EQ(surfaceCount - j, layerSurfaceCount); + if (surfaceCount - j == (unsigned int)layerSurfaceCount) + for(unsigned int k = 0; k < surfaceCount - j; ++k) + { + EXPECT_EQ(renderOrder[j + k], layerSurfaceIDs[k]); + } + free(layerSurfaceIDs); } //set empty render order again - ASSERT_EQ(ILM_SUCCESS, ilm_layerSetRenderOrder(layer, renderOrder, 0)); - ASSERT_EQ(ILM_SUCCESS, ilm_commitChanges()); + EXPECT_EQ(ILM_SUCCESS, ilm_layerSetRenderOrder(layer, renderOrder, 0)); + EXPECT_EQ(ILM_SUCCESS, ilm_commitChanges()); } + free(screenIDs); } TEST_F(IlmCommandTest, LayerSetRenderOrder_duplicates) { -- cgit v1.2.1