utest: fix wrong tests for add_dequeue_cb() and remove_dequeue_cb()

Change-Id: I6bf5df91b0c688b13052d71dfacb82595c20b00a
Signed-off-by: Roman Marchenko <r.marchenko@samsung.com>

diff --git a/utests/ut_tbm_surface_queue.cpp b/utests/ut_tbm_surface_queue.cpp
index 5ee8763..a1b2b2b 100644 (file)
--- a/utests/ut_tbm_surface_queue.cpp
+++ b/utests/ut_tbm_surface_queue.cpp
@@ -1190,16 +1190,12 @@ TEST_F(UtSurfaceQueue, AddDequeueCbFailInvalidInput)
 
 TEST_F(UtSurfaceQueue, AddDequeueCbSuccess)
 {
-       tbm_surface_queue_dequeue(queue, &surface);
-       tbm_surface_queue_enqueue(queue, surface);
-       tbm_surface_queue_acquire(queue, &surface);
-
        /* test */
-       result = tbm_surface_queue_add_dequeuable_cb(queue, tbm_surface_queue_event_handler, &cb_data);
+       result = tbm_surface_queue_add_dequeue_cb(queue, tbm_surface_queue_event_handler, &cb_data);
        ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result);
 
        cb_data = 0;
-       result = tbm_surface_queue_release(queue, surface);
+       result = tbm_surface_queue_dequeue(queue, &surface);
        ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result);
        ASSERT_TRUE(cb_data == 1);
 }
@@ -1221,19 +1217,20 @@ TEST_F(UtSurfaceQueue, RemoveDequeueCbFailInvalidInput)
 
 TEST_F(UtSurfaceQueue, RemoveDequeueCbSuccess)
 {
-       tbm_surface_queue_dequeue(queue, &surface);
-       tbm_surface_queue_enqueue(queue, surface);
-       tbm_surface_queue_acquire(queue, &surface);
-
        /* test */
-       result = tbm_surface_queue_add_dequeuable_cb(queue, tbm_surface_queue_event_handler, &cb_data);
+       result = tbm_surface_queue_add_dequeue_cb(queue, tbm_surface_queue_event_handler, &cb_data);
        ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result);
 
+       cb_data = 0;
+       result = tbm_surface_queue_dequeue(queue, &surface);
+       ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result);
+       ASSERT_TRUE(cb_data == 1);
+
        result = tbm_surface_queue_remove_dequeue_cb(queue, tbm_surface_queue_event_handler, &cb_data);
        ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result);
 
        cb_data = 0;
-       result = tbm_surface_queue_release(queue, surface);
+       result = tbm_surface_queue_dequeue(queue, &surface);
        ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result);
        ASSERT_TRUE(cb_data == 0);
 }