haltests: use EXPECT intead of ASSERT
[platform/core/uifw/libtdm.git] / haltests / src / tc_tdm_layer.cpp
index db08461..1e1aef6 100644 (file)
@@ -76,17 +76,17 @@ void TDMLayer::SetUp(void)
                if (tc_tdm_output_is_hwc_enable(outputs[o]))
                        continue;
 
-               ASSERT_EQ(tdm_output_get_layer_count(outputs[o], &count), TDM_ERROR_NONE);
-               ASSERT_GT(count, 0);
+               EXPECT_EQ(tdm_output_get_layer_count(outputs[o], &count), TDM_ERROR_NONE);
+               EXPECT_GT(count, 0);
 
                layer_count += count;
                layers = (tdm_layer**)realloc(layers, sizeof(tdm_layer*) * layer_count);
-               ASSERT_NE(layers, NULL);
+               EXPECT_NE(layers, NULL);
 
                for (int l = 0; l < count; l++) {
                        tdm_layer *layer = tdm_output_get_layer(outputs[o], l, &ret);
-                       ASSERT_NE(layer, NULL);
-                       ASSERT_EQ(ret, TDM_ERROR_NONE);
+                       EXPECT_NE(layer, NULL);
+                       EXPECT_EQ(ret, TDM_ERROR_NONE);
                        layers[old_layer_count + l] = layer;
                }
        }
@@ -98,7 +98,7 @@ void TDMLayer::SetUp(void)
 void TDMLayer::TearDown(void)
 {
        for (int l = 0; l < layer_count; l++) {
-               ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
        }
 
        free(layers);
@@ -463,8 +463,8 @@ TEST_P(TDMLayer, LayerGetOutput)
        for (int l = 0; l < layer_count; l++) {
                tdm_error ret;
                tdm_output *output = tdm_layer_get_output(layers[l], &ret);
-               ASSERT_EQ(ret, TDM_ERROR_NONE);
-               ASSERT_NE(output, NULL);
+               EXPECT_EQ(ret, TDM_ERROR_NONE);
+               EXPECT_NE(output, NULL);
        }
 }
 
@@ -474,8 +474,8 @@ TEST_P(TDMLayer, LayerGetOutputNullObject)
 
        tdm_error ret;
        tdm_output *output = tdm_layer_get_output(NULL, &ret);
-       ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER);
-       ASSERT_EQ(output, NULL);
+       EXPECT_EQ(ret, TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(output, NULL);
 }
 
 TEST_P(TDMLayer, LayerGetOutputNullParam)
@@ -484,7 +484,7 @@ TEST_P(TDMLayer, LayerGetOutputNullParam)
 
        for (int l = 0; l < layer_count; l++) {
                tdm_output *output = tdm_layer_get_output(layers[l], NULL);
-               ASSERT_NE(output, NULL);
+               EXPECT_NE(output, NULL);
        }
 }
 
@@ -494,8 +494,8 @@ TEST_P(TDMLayer, LayerGetCapabilities)
 
        for (int l = 0; l < layer_count; l++) {
                tdm_layer_capability capabilities = (tdm_layer_capability)TDM_UT_INVALID_VALUE;
-               ASSERT_EQ(tdm_layer_get_capabilities(layers[l], &capabilities), TDM_ERROR_NONE);
-               ASSERT_NE(capabilities, TDM_UT_INVALID_VALUE);
+               EXPECT_EQ(tdm_layer_get_capabilities(layers[l], &capabilities), TDM_ERROR_NONE);
+               EXPECT_NE(capabilities, TDM_UT_INVALID_VALUE);
        }
 }
 
@@ -504,14 +504,14 @@ TEST_P(TDMLayer, LayerGetCapabilitiesNullObject)
        TDM_UT_SKIP_FLAG(has_layers);
 
        tdm_layer_capability capabilities = (tdm_layer_capability)TDM_UT_INVALID_VALUE;
-       ASSERT_EQ(tdm_layer_get_capabilities(NULL, &capabilities), TDM_ERROR_INVALID_PARAMETER);
-       ASSERT_EQ(capabilities, TDM_UT_INVALID_VALUE);
+       EXPECT_EQ(tdm_layer_get_capabilities(NULL, &capabilities), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(capabilities, TDM_UT_INVALID_VALUE);
 }
 
 TEST_P(TDMLayer, LayerGetCapabilitiesNullOther)
 {
        TDM_UT_SKIP_FLAG(has_layers);
-       ASSERT_EQ(tdm_layer_get_capabilities(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_get_capabilities(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerGetAvailableFormats)
@@ -523,9 +523,9 @@ TEST_P(TDMLayer, LayerGetAvailableFormats)
                        continue;
                const tbm_format *formats = (const tbm_format *)TDM_UT_INVALID_VALUE;
                int count = TDM_UT_INVALID_VALUE;
-               ASSERT_EQ(tdm_layer_get_available_formats(layers[l], &formats, &count), TDM_ERROR_NONE);
-               ASSERT_NE(formats, NULL);
-               ASSERT_GT(count, 0);
+               EXPECT_EQ(tdm_layer_get_available_formats(layers[l], &formats, &count), TDM_ERROR_NONE);
+               EXPECT_NE(formats, NULL);
+               EXPECT_GT(count, 0);
        }
 }
 
@@ -535,9 +535,9 @@ TEST_P(TDMLayer, LayerGetAvailableFormatsNullObject)
 
        const tbm_format *formats = (const tbm_format *)TDM_UT_INVALID_VALUE;
        int count = TDM_UT_INVALID_VALUE;
-       ASSERT_EQ(tdm_layer_get_available_formats(NULL, &formats, &count), TDM_ERROR_INVALID_PARAMETER);
-       ASSERT_EQ(formats, (const tbm_format *)TDM_UT_INVALID_VALUE);
-       ASSERT_EQ(count, TDM_UT_INVALID_VALUE);
+       EXPECT_EQ(tdm_layer_get_available_formats(NULL, &formats, &count), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(formats, (const tbm_format *)TDM_UT_INVALID_VALUE);
+       EXPECT_EQ(count, TDM_UT_INVALID_VALUE);
 }
 
 TEST_P(TDMLayer, LayerGetAvailableFormatsNullOther)
@@ -545,7 +545,7 @@ TEST_P(TDMLayer, LayerGetAvailableFormatsNullOther)
        TDM_UT_SKIP_FLAG(has_layers);
        if (!tc_tdm_layer_is_avaiable(layers[0]))
                return;
-       ASSERT_EQ(tdm_layer_get_available_formats(layers[0], NULL, NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_get_available_formats(layers[0], NULL, NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerGetAvailableProperties)
@@ -557,10 +557,10 @@ TEST_P(TDMLayer, LayerGetAvailableProperties)
                        continue;
                const tdm_prop *props = (const tdm_prop *)TDM_UT_INVALID_VALUE;
                int count = TDM_UT_INVALID_VALUE;
-               ASSERT_EQ(tdm_layer_get_available_properties(layers[l], &props, &count), TDM_ERROR_NONE);
-               ASSERT_GE(count, 0);
+               EXPECT_EQ(tdm_layer_get_available_properties(layers[l], &props, &count), TDM_ERROR_NONE);
+               EXPECT_GE(count, 0);
                if (count > 0)
-                       ASSERT_TRUE(props != NULL && props != (const tdm_prop *)TDM_UT_INVALID_VALUE);
+                       EXPECT_TRUE(props != NULL && props != (const tdm_prop *)TDM_UT_INVALID_VALUE);
        }
 }
 
@@ -570,16 +570,16 @@ TEST_P(TDMLayer, LayerGetAvailablePropertiesNullObject)
 
        const tdm_prop *props = (const tdm_prop *)TDM_UT_INVALID_VALUE;
        int count = TDM_UT_INVALID_VALUE;
-       ASSERT_EQ(tdm_layer_get_available_properties(NULL, &props, &count), TDM_ERROR_INVALID_PARAMETER);
-       ASSERT_EQ(props, (const tdm_prop *)TDM_UT_INVALID_VALUE);
-       ASSERT_EQ(count, TDM_UT_INVALID_VALUE);
+       EXPECT_EQ(tdm_layer_get_available_properties(NULL, &props, &count), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(props, (const tdm_prop *)TDM_UT_INVALID_VALUE);
+       EXPECT_EQ(count, TDM_UT_INVALID_VALUE);
 }
 
 TEST_P(TDMLayer, LayerGetAvailablePropertiesNullOther)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_get_available_properties(layers[0], NULL, NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_get_available_properties(layers[0], NULL, NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerGetZpos)
@@ -587,7 +587,7 @@ TEST_P(TDMLayer, LayerGetZpos)
        TDM_UT_SKIP_FLAG(has_layers);
 
        bool *check_table = (bool*)calloc(layer_count, output_count);
-       ASSERT_NE(check_table, NULL);
+       EXPECT_NE(check_table, NULL);
 
        for (int l = 0; l < layer_count; l++) {
                if (!tc_tdm_layer_is_avaiable(layers[l]))
@@ -612,15 +612,15 @@ TEST_P(TDMLayer, LayerGetZposNullObject)
        TDM_UT_SKIP_FLAG(has_layers);
 
        int zpos = TDM_UT_INVALID_VALUE;
-       ASSERT_EQ(tdm_layer_get_zpos(NULL, &zpos), TDM_ERROR_INVALID_PARAMETER);
-       ASSERT_EQ(zpos, TDM_UT_INVALID_VALUE);
+       EXPECT_EQ(tdm_layer_get_zpos(NULL, &zpos), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(zpos, TDM_UT_INVALID_VALUE);
 }
 
 TEST_P(TDMLayer, LayerGetZposNullParam)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_get_zpos(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_get_zpos(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, DISABLED_LayerSetProperty)
@@ -631,7 +631,7 @@ TEST_P(TDMLayer, LayerSetPropertyNullObject)
 {
        tdm_value value = {.s32 = 0};
 
-       ASSERT_EQ(tdm_layer_set_property(NULL, 0, value), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_set_property(NULL, 0, value), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerGetProperty)
@@ -644,15 +644,15 @@ TEST_P(TDMLayer, LayerGetProperty)
 
                const tdm_prop *props = (const tdm_prop *)TDM_UT_INVALID_VALUE;
                int count = TDM_UT_INVALID_VALUE;
-               ASSERT_EQ(tdm_layer_get_available_properties(layers[l], &props, &count), TDM_ERROR_NONE);
-               ASSERT_GE(count, 0);
+               EXPECT_EQ(tdm_layer_get_available_properties(layers[l], &props, &count), TDM_ERROR_NONE);
+               EXPECT_GE(count, 0);
                if (count > 0) {
-                       ASSERT_TRUE(props != NULL && props != (const tdm_prop *)TDM_UT_INVALID_VALUE);
+                       EXPECT_TRUE(props != NULL && props != (const tdm_prop *)TDM_UT_INVALID_VALUE);
 
                        for (int i = 0; i < count; i++) {
                                tdm_value value = {.s32 = TDM_UT_INVALID_VALUE};
-                               ASSERT_EQ(tdm_layer_get_property(layers[l], props[i].id, &value), TDM_ERROR_NONE);
-                               ASSERT_NE(value.s32, TDM_UT_INVALID_VALUE);
+                               EXPECT_EQ(tdm_layer_get_property(layers[l], props[i].id, &value), TDM_ERROR_NONE);
+                               EXPECT_NE(value.s32, TDM_UT_INVALID_VALUE);
                        }
                }
        }
@@ -663,15 +663,15 @@ TEST_P(TDMLayer, LayerGetPropertyNullObject)
        TDM_UT_SKIP_FLAG(has_layers);
 
        tdm_value value = {.s32 = TDM_UT_INVALID_VALUE};
-       ASSERT_EQ(tdm_layer_get_property(NULL, 0, &value), TDM_ERROR_INVALID_PARAMETER);
-       ASSERT_EQ(value.s32, TDM_UT_INVALID_VALUE);
+       EXPECT_EQ(tdm_layer_get_property(NULL, 0, &value), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(value.s32, TDM_UT_INVALID_VALUE);
 }
 
 TEST_P(TDMLayer, LayerGetPropertyNullOther)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_get_property(layers[0], 0, NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_get_property(layers[0], 0, NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerSetInfo)
@@ -685,8 +685,8 @@ TEST_P(TDMLayer, LayerSetInfo)
                        continue;
 
                tdm_info_layer info;
-               ASSERT_EQ(tc_tdm_layer_fill_info(layers[l], NULL, NULL, &info), true);
-               ASSERT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE);
+               EXPECT_EQ(tc_tdm_layer_fill_info(layers[l], NULL, NULL, &info), true);
+               EXPECT_EQ(tdm_layer_set_info(layers[l], &info), TDM_ERROR_NONE);
        }
 }
 
@@ -696,14 +696,14 @@ TEST_P(TDMLayer, LayerSetInfoNullObject)
 
        tdm_info_layer info;
        memset(&info, 0, sizeof info);
-       ASSERT_EQ(tdm_layer_set_info(NULL, &info), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_set_info(NULL, &info), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerSetInfoNullOther)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_set_info(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_set_info(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, DISABLED_LayerGetInfo)
@@ -716,14 +716,14 @@ TEST_P(TDMLayer, LayerGetInfoNullObject)
 
        tdm_info_layer temp;
 
-       ASSERT_EQ(tdm_layer_get_info(NULL, &temp), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_get_info(NULL, &temp), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerGetInfoNullParam)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_get_info(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_get_info(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerGetBufferFlags)
@@ -735,8 +735,8 @@ TEST_P(TDMLayer, LayerGetBufferFlags)
                        continue;
 
                unsigned int flags = (unsigned int)TDM_UT_INVALID_VALUE;
-               ASSERT_EQ(tdm_layer_get_buffer_flags(layers[l], &flags), TDM_ERROR_NONE);
-               ASSERT_NE(flags, (unsigned int)TDM_UT_INVALID_VALUE);
+               EXPECT_EQ(tdm_layer_get_buffer_flags(layers[l], &flags), TDM_ERROR_NONE);
+               EXPECT_NE(flags, (unsigned int)TDM_UT_INVALID_VALUE);
        }
 }
 
@@ -745,15 +745,15 @@ TEST_P(TDMLayer, LayerGetBufferFlagsNullObject)
        TDM_UT_SKIP_FLAG(has_layers);
 
        unsigned int flags = (unsigned int)TDM_UT_INVALID_VALUE;
-       ASSERT_EQ(tdm_layer_get_buffer_flags(NULL, &flags), TDM_ERROR_INVALID_PARAMETER);
-       ASSERT_EQ(flags, (unsigned int)TDM_UT_INVALID_VALUE);
+       EXPECT_EQ(tdm_layer_get_buffer_flags(NULL, &flags), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(flags, (unsigned int)TDM_UT_INVALID_VALUE);
 }
 
 TEST_P(TDMLayer, LayerGetBufferFlagsNullOther)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_get_buffer_flags(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_get_buffer_flags(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 static void
@@ -785,17 +785,17 @@ TEST_P(TDMLayer, LayerSetBuffer)
                if (tc_tdm_layer_is_video_layer(layers[l]))
                        continue;
 
-               ASSERT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
+               EXPECT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
 
                /* set buffer & commit for 100 times */
                for (int t = 0; t < 10; t++) {
                        tbm_surface_h displaying_buffer = NULL;
-                       ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer]), true);
-                       ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
+                       EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer]), true);
+                       EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
                        while (displaying_buffer != buffers[next_buffer]) {
-                               ASSERT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
+                               EXPECT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
                                displaying_buffer = tdm_layer_get_displaying_buffer(layers[l], &ret);
-                               ASSERT_EQ(ret, TDM_ERROR_NONE);
+                               EXPECT_EQ(ret, TDM_ERROR_NONE);
                        }
                        next_buffer++;
                        if (next_buffer == 3)
@@ -825,20 +825,20 @@ TEST_P(TDMLayer, LayerSetBufferFewTimeInOneCommit)
                if (tc_tdm_layer_is_video_layer(layers[l]))
                        continue;
 
-               ASSERT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
+               EXPECT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
 
                /* set buffer & commit for 10 times */
                for (int t = 0; t < 10; t++) {
                        tbm_surface_h displaying_buffer = NULL;
-                       ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+                       EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
                        if (next_buffer == 3)
                                next_buffer = 0;
-                       ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer]), true);
-                       ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
+                       EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer]), true);
+                       EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
                        while (displaying_buffer != buffers[next_buffer]) {
-                               ASSERT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
+                               EXPECT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
                                displaying_buffer = tdm_layer_get_displaying_buffer(layers[l], &ret);
-                               ASSERT_EQ(ret, TDM_ERROR_NONE);
+                               EXPECT_EQ(ret, TDM_ERROR_NONE);
                        }
                        next_buffer++;
                        if (next_buffer == 3)
@@ -854,14 +854,14 @@ TEST_P(TDMLayer, LayerSetBufferNullObject)
        TDM_UT_SKIP_FLAG(has_layers);
 
        tbm_surface_h buffer = (tbm_surface_h)TDM_UT_INVALID_VALUE;
-       ASSERT_EQ(tdm_layer_set_buffer(NULL, buffer), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_set_buffer(NULL, buffer), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerSetBufferNullOther)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_set_buffer(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_set_buffer(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerUnsetBuffer)
@@ -874,7 +874,7 @@ TEST_P(TDMLayer, LayerUnsetBuffer)
                if (!tc_tdm_layer_is_avaiable(layers[l]))
                        continue;
 
-               ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
        }
 }
 
@@ -882,7 +882,7 @@ TEST_P(TDMLayer, LayerUnsetBufferNullObject)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_unset_buffer(NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_unset_buffer(NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerUnsetBufferBeforeCommit)
@@ -904,19 +904,19 @@ TEST_P(TDMLayer, LayerUnsetBufferBeforeCommit)
                if (tc_tdm_layer_is_primary_layer(layers[l]))
                        continue;
 
-               ASSERT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
+               EXPECT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
 
                /* set buffer & commit for 10 times */
                for (int t = 0; t < 10; t++) {
-                       ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+                       EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
                        if (next_buffer == 3)
                                next_buffer = 0;
-                       ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+                       EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
                        if (next_buffer == 3)
                                next_buffer = 0;
                }
 
-               ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
 
                DestroyBuffers();
        }
@@ -941,13 +941,13 @@ TEST_P(TDMLayer, LayerUnsetBufferAfterOneCommit)
                if (tc_tdm_layer_is_primary_layer(layers[l]))
                        continue;
 
-               ASSERT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
+               EXPECT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
 
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
-               ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+               EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
 
-               ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
 
                DestroyBuffers();
        }
@@ -973,15 +973,15 @@ TEST_P(TDMLayer, DISABLED_LayerUnsetBufferAfterTwoCommit)
                if (tc_tdm_layer_is_primary_layer(layers[l]))
                        continue;
 
-               ASSERT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
+               EXPECT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
 
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
-               ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+               EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
 
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
-               ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+               EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
 
-               ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
 
                DestroyBuffers();
        }
@@ -1007,17 +1007,17 @@ TEST_P(TDMLayer, DISABLED_LayerUnsetBufferAfterTwoCommitOneSetBuffer)
                if (tc_tdm_layer_is_primary_layer(layers[l]))
                        continue;
 
-               ASSERT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
+               EXPECT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
 
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
-               ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+               EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
 
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
-               ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+               EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
 
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer]), true);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer]), true);
 
-               ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
 
                DestroyBuffers();
        }
@@ -1043,19 +1043,19 @@ TEST_P(TDMLayer, LayerUnsetBufferAfterOneCommitOneDone)
                if (tc_tdm_layer_is_primary_layer(layers[l]))
                        continue;
 
-               ASSERT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
+               EXPECT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
 
                /* set buffer & commit for 10 times */
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
 
                done = false;
-               ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done), TDM_ERROR_NONE);
                while (!done) {
-                       ASSERT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
+                       EXPECT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
                }
 
-               ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
 
                DestroyBuffers();
        }
@@ -1081,23 +1081,23 @@ TEST_P(TDMLayer, LayerUnsetBufferAfterOneCommitOneDoneOneCommit)
                if (tc_tdm_layer_is_primary_layer(layers[l]))
                        continue;
 
-               ASSERT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
+               EXPECT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 3, true), true);
 
                /* set buffer & commit for 10 times */
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
 
                done = false;
-               ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done), TDM_ERROR_NONE);
                while (!done) {
-                       ASSERT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
+                       EXPECT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
                }
 
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[next_buffer++]), true);
                next_buffer = 0;
-               ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done), TDM_ERROR_NONE);
 
-               ASSERT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_unset_buffer(layers[l]), TDM_ERROR_NONE);
 
                DestroyBuffers();
        }
@@ -1109,8 +1109,8 @@ TEST_P(TDMLayer, LayerCommitDPMSOff)
 
        tdm_error ret;
        tdm_output *output = tdm_layer_get_output(layers[0], &ret);
-       ASSERT_EQ(ret, TDM_ERROR_NONE);
-       ASSERT_NE(output, NULL);
+       EXPECT_EQ(ret, TDM_ERROR_NONE);
+       EXPECT_NE(output, NULL);
 
        if (!tc_tdm_output_is_connected(output))
                return;
@@ -1128,7 +1128,7 @@ TEST_P(TDMLayer, LayerCommitNullObject)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_commit(NULL, _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_commit(NULL, _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerCommitNullOther)
@@ -1137,7 +1137,7 @@ TEST_P(TDMLayer, LayerCommitNullOther)
 
        tc_tdm_output_prepare_all_output(dpy, outputs, output_count, true);
 
-       ASSERT_EQ(tdm_layer_commit(layers[0], NULL, NULL), TDM_ERROR_NONE);
+       EXPECT_EQ(tdm_layer_commit(layers[0], NULL, NULL), TDM_ERROR_NONE);
 }
 
 TEST_P(TDMLayer, LayerIsCommittingNullObject)
@@ -1145,15 +1145,15 @@ TEST_P(TDMLayer, LayerIsCommittingNullObject)
        TDM_UT_SKIP_FLAG(has_layers);
 
        unsigned int committing = (unsigned int)TDM_UT_INVALID_VALUE;
-       ASSERT_EQ(tdm_layer_is_committing(NULL, &committing), TDM_ERROR_INVALID_PARAMETER);
-       ASSERT_EQ(committing, (unsigned int)TDM_UT_INVALID_VALUE);
+       EXPECT_EQ(tdm_layer_is_committing(NULL, &committing), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(committing, (unsigned int)TDM_UT_INVALID_VALUE);
 }
 
 TEST_P(TDMLayer, LayerIsCommittingNullOther)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_is_committing(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_is_committing(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerRemoveCommitHandler)
@@ -1168,8 +1168,8 @@ TEST_P(TDMLayer, LayerRemoveCommitHandler)
 
                tdm_error ret;
                tdm_output *output = tdm_layer_get_output(layers[l], &ret);
-               ASSERT_EQ(ret, TDM_ERROR_NONE);
-               ASSERT_NE(output, NULL);
+               EXPECT_EQ(ret, TDM_ERROR_NONE);
+               EXPECT_NE(output, NULL);
 
                if (tc_tdm_layer_is_cursor_layer(layers[l]))
                        continue;
@@ -1178,18 +1178,18 @@ TEST_P(TDMLayer, LayerRemoveCommitHandler)
                if (tc_tdm_layer_is_primary_layer(layers[l]))
                        continue;
 
-               ASSERT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 1, true), true);
+               EXPECT_EQ(tc_tdm_layer_prepare_buffer(layers[l], buffers, 1, true), true);
 
-               ASSERT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[0]), true);
+               EXPECT_EQ(tc_tdm_layer_set_buffer(layers[l], buffers[0]), true);
 
                for (int t = 0; t < 10; t++) {
                        bool done1 = false, done2 = false, done3 = false;
-                       ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done1), TDM_ERROR_NONE);
-                       ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done2), TDM_ERROR_NONE);
-                       ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done3), TDM_ERROR_NONE);
-                       ASSERT_EQ(tdm_layer_remove_commit_handler(layers[l], _tc_tdm_layer_commit_cb, &done2), TDM_ERROR_NONE);
+                       EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done1), TDM_ERROR_NONE);
+                       EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done2), TDM_ERROR_NONE);
+                       EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done3), TDM_ERROR_NONE);
+                       EXPECT_EQ(tdm_layer_remove_commit_handler(layers[l], _tc_tdm_layer_commit_cb, &done2), TDM_ERROR_NONE);
                        while (!done1 || done2 || !done3) {
-                               ASSERT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
+                               EXPECT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
                        }
                }
 
@@ -1209,8 +1209,8 @@ TEST_P(TDMLayer, LayerRemoveCommitHandlerDifferentData)
 
                tdm_error ret;
                tdm_output *output = tdm_layer_get_output(layers[l], &ret);
-               ASSERT_EQ(ret, TDM_ERROR_NONE);
-               ASSERT_NE(output, NULL);
+               EXPECT_EQ(ret, TDM_ERROR_NONE);
+               EXPECT_NE(output, NULL);
 
                if (tc_tdm_layer_is_cursor_layer(layers[l]))
                        continue;
@@ -1221,12 +1221,12 @@ TEST_P(TDMLayer, LayerRemoveCommitHandlerDifferentData)
 
                for (int t = 0; t < 10; t++) {
                        bool done1 = false, done2 = false, done3 = false;
-                       ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done1), TDM_ERROR_NONE);
-                       ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done2), TDM_ERROR_NONE);
-                       ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done3), TDM_ERROR_NONE);
-                       ASSERT_EQ(tdm_layer_remove_commit_handler(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
+                       EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done1), TDM_ERROR_NONE);
+                       EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done2), TDM_ERROR_NONE);
+                       EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb, &done3), TDM_ERROR_NONE);
+                       EXPECT_EQ(tdm_layer_remove_commit_handler(layers[l], _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_NONE);
                        while (!done1 || !done2 || !done3) {
-                               ASSERT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
+                               EXPECT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
                        }
                }
        }
@@ -1239,7 +1239,7 @@ _tc_tdm_layer_commit_cb2(tdm_layer *layer, unsigned int sequence,
        bool *done = (bool*)user_data;
        if (done)
                *done = true;
-       ASSERT_EQ(tdm_layer_remove_commit_handler(layer, _tc_tdm_layer_commit_cb2, user_data), TDM_ERROR_NONE);
+       EXPECT_EQ(tdm_layer_remove_commit_handler(layer, _tc_tdm_layer_commit_cb2, user_data), TDM_ERROR_NONE);
 }
 
 TEST_P(TDMLayer, LayerRemoveCommitHandlerInHandler)
@@ -1254,8 +1254,8 @@ TEST_P(TDMLayer, LayerRemoveCommitHandlerInHandler)
 
                tdm_error ret;
                tdm_output *output = tdm_layer_get_output(layers[l], &ret);
-               ASSERT_EQ(ret, TDM_ERROR_NONE);
-               ASSERT_NE(output, NULL);
+               EXPECT_EQ(ret, TDM_ERROR_NONE);
+               EXPECT_NE(output, NULL);
 
                if (tc_tdm_layer_is_cursor_layer(layers[l]))
                        continue;
@@ -1266,11 +1266,11 @@ TEST_P(TDMLayer, LayerRemoveCommitHandlerInHandler)
 
                for (int t = 0; t < 10; t++) {
                        bool done1 = false, done2 = false, done3 = false;
-                       ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb2, &done1), TDM_ERROR_NONE);
-                       ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb2, &done2), TDM_ERROR_NONE);
-                       ASSERT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb2, &done3), TDM_ERROR_NONE);
+                       EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb2, &done1), TDM_ERROR_NONE);
+                       EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb2, &done2), TDM_ERROR_NONE);
+                       EXPECT_EQ(tdm_layer_commit(layers[l], _tc_tdm_layer_commit_cb2, &done3), TDM_ERROR_NONE);
                        while (!done1 || !done2 || !done3) {
-                               ASSERT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
+                               EXPECT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
                        }
                }
        }
@@ -1280,14 +1280,14 @@ TEST_P(TDMLayer, LayerRemoveCommitHandlerNullObject)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_remove_commit_handler(NULL, _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_remove_commit_handler(NULL, _tc_tdm_layer_commit_cb, NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerRemoveCommitHandlerNullOther)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_remove_commit_handler(layers[0], NULL, NULL), TDM_ERROR_NONE);
+       EXPECT_EQ(tdm_layer_remove_commit_handler(layers[0], NULL, NULL), TDM_ERROR_NONE);
 }
 
 TEST_P(TDMLayer, LayerGetDisplayingBufferNullObject)
@@ -1297,8 +1297,8 @@ TEST_P(TDMLayer, LayerGetDisplayingBufferNullObject)
        tbm_surface_h displaying_buffer;
        tdm_error ret;
        displaying_buffer = tdm_layer_get_displaying_buffer(NULL, &ret);
-       ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER);
-       ASSERT_EQ(displaying_buffer, NULL);
+       EXPECT_EQ(ret, TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(displaying_buffer, NULL);
 }
 
 TEST_P(TDMLayer, LayerGetDisplayingBufferNullOther)
@@ -1307,7 +1307,7 @@ TEST_P(TDMLayer, LayerGetDisplayingBufferNullOther)
 
        tbm_surface_h displaying_buffer;
        displaying_buffer = tdm_layer_get_displaying_buffer(layers[0], NULL);
-       ASSERT_EQ(displaying_buffer, NULL);
+       EXPECT_EQ(displaying_buffer, NULL);
 }
 
 TEST_P(TDMLayer, LayerIsUsableNullObject)
@@ -1315,8 +1315,8 @@ TEST_P(TDMLayer, LayerIsUsableNullObject)
        TDM_UT_SKIP_FLAG(has_layers);
 
        unsigned int usable = (unsigned int)TDM_UT_INVALID_VALUE;
-       ASSERT_EQ(tdm_layer_is_usable(NULL, &usable), TDM_ERROR_INVALID_PARAMETER);
-       ASSERT_EQ(usable, (unsigned int)TDM_UT_INVALID_VALUE);
+       EXPECT_EQ(tdm_layer_is_usable(NULL, &usable), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(usable, (unsigned int)TDM_UT_INVALID_VALUE);
 }
 
 TEST_P(TDMLayer, LayerSetBufferQueue)
@@ -1341,28 +1341,28 @@ TEST_P(TDMLayer, LayerSetBufferQueue)
                if (tc_tdm_layer_is_primary_layer(layers[l]))
                        continue;
 
-               ASSERT_EQ(tc_tdm_layer_prepare_buffer_queue(layers[l], &buffer_queue), true);
-               ASSERT_NE(buffer_queue, NULL);
+               EXPECT_EQ(tc_tdm_layer_prepare_buffer_queue(layers[l], &buffer_queue), true);
+               EXPECT_NE(buffer_queue, NULL);
 
-               ASSERT_EQ(tc_tdm_layer_set_buffer_queue(layers[l], buffer_queue), true);
+               EXPECT_EQ(tc_tdm_layer_set_buffer_queue(layers[l], buffer_queue), true);
 
-               ASSERT_EQ(tdm_layer_commit(layers[l], NULL, NULL), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_commit(layers[l], NULL, NULL), TDM_ERROR_NONE);
 
                for (int t = 0; t < 10; t++) {
-                       ASSERT_EQ(tbm_surface_queue_dequeue(buffer_queue, &buffer), TBM_SURFACE_QUEUE_ERROR_NONE);
-                       ASSERT_NE(buffer, NULL);
+                       EXPECT_EQ(tbm_surface_queue_dequeue(buffer_queue, &buffer), TBM_SURFACE_QUEUE_ERROR_NONE);
+                       EXPECT_NE(buffer, NULL);
                        tdm_test_buffer_fill(buffer, PATTERN_SMPTE);
-                       ASSERT_EQ(tbm_surface_queue_enqueue(buffer_queue, buffer), TBM_SURFACE_QUEUE_ERROR_NONE);
+                       EXPECT_EQ(tbm_surface_queue_enqueue(buffer_queue, buffer), TBM_SURFACE_QUEUE_ERROR_NONE);
 
                        displaying_buffer = NULL;
                        while (displaying_buffer != buffer) {
-                               ASSERT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
+                               EXPECT_EQ(tc_tdm_display_handle_events(dpy), TDM_ERROR_NONE);
                                displaying_buffer = tdm_layer_get_displaying_buffer(layers[l], &ret);
-                               ASSERT_EQ(ret, TDM_ERROR_NONE);
+                               EXPECT_EQ(ret, TDM_ERROR_NONE);
                        }
                }
 
-               ASSERT_EQ(tdm_layer_unset_buffer_queue(layers[l]), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_unset_buffer_queue(layers[l]), TDM_ERROR_NONE);
 
                DestroyBuffers();
        }
@@ -1406,28 +1406,28 @@ TEST_P(TDMLayer, LayerSetBufferQueueNullObject)
 
        tbm_surface_queue_h buffer_queue = (tbm_surface_queue_h)TDM_UT_INVALID_VALUE;
 
-       ASSERT_EQ(tdm_layer_set_buffer_queue(NULL, buffer_queue), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_set_buffer_queue(NULL, buffer_queue), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerSetBufferQueueNullOther)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_set_buffer_queue(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_set_buffer_queue(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerUnsetBufferQueueNullObject)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_unset_buffer_queue(NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_unset_buffer_queue(NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerIsUsableNullOther)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_is_usable(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_is_usable(layers[0], NULL), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerSetVideoPos)
@@ -1440,7 +1440,7 @@ TEST_P(TDMLayer, LayerSetVideoPos)
 
                if (!tc_tdm_layer_is_video_layer(layers[l]))
                        continue;
-               ASSERT_EQ(tdm_layer_set_video_pos(layers[l], -1), TDM_ERROR_NONE);
+               EXPECT_EQ(tdm_layer_set_video_pos(layers[l], -1), TDM_ERROR_NONE);
        }
 }
 
@@ -1448,7 +1448,7 @@ TEST_P(TDMLayer, LayerSetVideoPosNullObject)
 {
        TDM_UT_SKIP_FLAG(has_layers);
 
-       ASSERT_EQ(tdm_layer_set_video_pos(NULL, -1), TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(tdm_layer_set_video_pos(NULL, -1), TDM_ERROR_INVALID_PARAMETER);
 }
 
 TEST_P(TDMLayer, LayerSetVideoPosNoVideoLayer)
@@ -1462,7 +1462,7 @@ TEST_P(TDMLayer, LayerSetVideoPosNoVideoLayer)
                if (tc_tdm_layer_is_video_layer(layers[l]))
                        continue;
 
-               ASSERT_EQ(tdm_layer_set_video_pos(layers[l], -1), TDM_ERROR_BAD_REQUEST);
+               EXPECT_EQ(tdm_layer_set_video_pos(layers[l], -1), TDM_ERROR_BAD_REQUEST);
        }
 }
 
@@ -1479,7 +1479,7 @@ TEST_P(TDMLayer, LayerCreateCapture)
 
                capture = tdm_layer_create_capture(layers[l], &ret);
                if (ret == TDM_ERROR_NONE)
-                       ASSERT_NE(capture, NULL);
+                       EXPECT_NE(capture, NULL);
        }
 }
 
@@ -1489,8 +1489,8 @@ TEST_P(TDMLayer, LayerCreateCaptureNullObject)
 
        tdm_error ret;
        tdm_capture *capture = tdm_layer_create_capture(NULL, &ret);
-       ASSERT_EQ(ret, TDM_ERROR_INVALID_PARAMETER);
-       ASSERT_EQ(capture, NULL);
+       EXPECT_EQ(ret, TDM_ERROR_INVALID_PARAMETER);
+       EXPECT_EQ(capture, NULL);
 }
 
 #ifdef TDM_UT_TEST_WITH_PARAMS