tests: free resources in LayerSetRenderOrder_growing
authorMarcus Fritzsch <marcus.fritzsch@xse.de>
Fri, 1 Aug 2014 07:13:23 +0000 (09:13 +0200)
committerNobuhiko Tanibata <NOBUHIKO_TANIBATA@denso.co.jp>
Tue, 12 Aug 2014 13:15:17 +0000 (22:15 +0900)
Signed-off-by: Marcus Fritzsch <marcus.fritzsch@xse.de>
ivi-layermanagement-api/test/ilm_control_test.cpp

index b77610c..b5677b8 100644 (file)
@@ -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) {