utest: fix protex issues

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

diff --git a/utests/ut_main.cpp b/utests/ut_main.cpp
index 718fa44..eaca3ba 100644 (file)
--- a/utests/ut_main.cpp
+++ b/utests/ut_main.cpp
@@ -2,7 +2,12 @@
 
 int main(int argc, char **argv)
 {
-       ::testing::InitGoogleTest(&argc, argv);
-       ::testing::FLAGS_gtest_death_test_style = "fast";
+       try {
+               ::testing::InitGoogleTest(&argc, argv);
+               ::testing::FLAGS_gtest_death_test_style = "fast";
+       } catch ( ... ) {
+               exit(EXIT_FAILURE);
+       }
+
        return RUN_ALL_TESTS();
 }

diff --git a/utests/ut_tbm_surface_queue.cpp b/utests/ut_tbm_surface_queue.cpp
index e64acfb..8673684 100644 (file)
--- a/utests/ut_tbm_surface_queue.cpp
+++ b/utests/ut_tbm_surface_queue.cpp
@@ -696,7 +696,7 @@ TEST_F(UtSurfaceQueue, ResetSequenceSuccess)
        /* create a sequence queue instead of a default one*/
        tbm_surface_queue_destroy(queue);
        queue = tbm_surface_queue_sequence_create(QUEUE_SIZE, width, height, format, TBM_BO_DEFAULT);
-       ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result);
+       ASSERT_TRUE(queue != NULL);
 
        result = tbm_surface_queue_dequeue(queue, &surface);
        ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result);
@@ -1261,7 +1261,7 @@ TEST_F(UtSurfaceQueue, AddCanDequeueCbSuccess)
        ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result);
 
        cb_data = 0;
-       tbm_surface_queue_can_dequeue(queue, 0);
+       ASSERT_TRUE(tbm_surface_queue_can_dequeue(queue, 0));
        ASSERT_TRUE(cb_data == 1);
 }
 
@@ -1290,7 +1290,7 @@ TEST_F(UtSurfaceQueue, RemoveCanDequeueCbSuccess)
        ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result);
 
        cb_data = 0;
-       tbm_surface_queue_can_dequeue(queue, 0);
+       ASSERT_TRUE(tbm_surface_queue_can_dequeue(queue, 0));
        ASSERT_TRUE(cb_data == 0);
 }