diff options
| -rw-r--r-- | ivi-layermanagement-api/test/ilm_control_test.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/ivi-layermanagement-api/test/ilm_control_test.cpp b/ivi-layermanagement-api/test/ilm_control_test.cpp index b77610c..b5677b8 100644 --- a/ivi-layermanagement-api/test/ilm_control_test.cpp +++ b/ivi-layermanagement-api/test/ilm_control_test.cpp @@ -1223,22 +1223,25 @@ TEST_F(IlmCommandTest, LayerSetRenderOrder_growing) { for (unsigned int j = surfaceCount; j <= surfaceCount; --j) // note: using overflow here { //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)); + 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)); - ASSERT_EQ(surfaceCount - j, layerSurfaceCount); - for(unsigned int k = 0; k < surfaceCount - j; ++k) - { - ASSERT_EQ(renderOrder[j + k], layerSurfaceIDs[k]); - } + EXPECT_EQ(surfaceCount - j, layerSurfaceCount); + if (surfaceCount - j == (unsigned int) layerSurfaceCount) + for(unsigned int k = 0; k < surfaceCount - j; ++k) + { + ASSERT_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_shrinking) { |