utest: check the tbm_error_e for the bufmgr tests

Change-Id: I5ceaae2cb25e6ed6a4bd25051121b905eadb471c

diff --git a/utests/ut_tbm_bufmgr.cpp b/utests/ut_tbm_bufmgr.cpp
index cfe28c1..c065415 100644 (file)
--- a/utests/ut_tbm_bufmgr.cpp
+++ b/utests/ut_tbm_bufmgr.cpp
@@ -63,6 +63,7 @@ TEST_F(TBMBufmgr, BufmgrGetCapability)
 
        capability = tbm_bufmgr_get_capability(bufmgr);
        EXPECT_NE(capability, TBM_BUFMGR_CAPABILITY_NONE);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_NONE));
 }
 
 TEST_F(TBMBufmgr, BufmgrGetCapabilityWithNullBufmgr)
@@ -71,6 +72,7 @@ TEST_F(TBMBufmgr, BufmgrGetCapabilityWithNullBufmgr)
 
        capability = tbm_bufmgr_get_capability(NULL);
        EXPECT_EQ(capability, TBM_BUFMGR_CAPABILITY_NONE);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_INVALID_PARAMETER));
 }
 
 TEST_F(TBMBufmgr, BufmgrGetCapabilityWithWrongBufmgr)
@@ -80,6 +82,7 @@ TEST_F(TBMBufmgr, BufmgrGetCapabilityWithWrongBufmgr)
 
        capability = tbm_bufmgr_get_capability(bufmgr);
        EXPECT_EQ(capability, TBM_BUFMGR_CAPABILITY_NONE);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_INVALID_PARAMETER));
 }
 
 /* tbm_bufmgr_bind_native_display() */
@@ -118,11 +121,14 @@ TEST_F(TBMBufmgr, BufmgrSetBoLockType)
        int ret;
 
        ret = tbm_bufmgr_set_bo_lock_type(bufmgr, TBM_BUFMGR_BO_LOCK_TYPE_NEVER);
-       ASSERT_TRUE(ret == 1);
+       EXPECT_EQ(ret, 1);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_NONE));
        ret = tbm_bufmgr_set_bo_lock_type(bufmgr, TBM_BUFMGR_BO_LOCK_TYPE_ONCE);
-       ASSERT_TRUE(ret == 1);
+       EXPECT_EQ(ret, 1);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_NONE));
        ret = tbm_bufmgr_set_bo_lock_type(bufmgr, TBM_BUFMGR_BO_LOCK_TYPE_ALWAYS);
-       ASSERT_TRUE(ret == 1);
+       EXPECT_EQ(ret, 1);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_NONE));
 }
 
 TEST_F(TBMBufmgr, BufmgrSetBoLockTypeWithBufmgrParamTest)
@@ -131,10 +137,11 @@ TEST_F(TBMBufmgr, BufmgrSetBoLockTypeWithBufmgrParamTest)
        int ret;
 
        ret = tbm_bufmgr_set_bo_lock_type(NULL, TBM_BUFMGR_BO_LOCK_TYPE_NEVER);
-       ASSERT_TRUE(ret == 0);
+       EXPECT_EQ(ret, 0);
        invalid_bufmgr = (tbm_bufmgr)UT_TBM_INVALID_VALUE;
        ret = tbm_bufmgr_set_bo_lock_type(invalid_bufmgr, TBM_BUFMGR_BO_LOCK_TYPE_NEVER);
-       ASSERT_TRUE(ret == 0);
+       EXPECT_EQ(ret, 0);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_INVALID_PARAMETER));
 }
 
 // TODO::::

diff --git a/utests/ut_tbm_env.cpp b/utests/ut_tbm_env.cpp
index a27563b..c9d7b53 100644 (file)
--- a/utests/ut_tbm_env.cpp
+++ b/utests/ut_tbm_env.cpp
@@ -62,7 +62,8 @@ TEST_F(TBMEnv, BufmgrInitDeinit)
        tbm_bufmgr bufmgr;
 
        bufmgr = tbm_bufmgr_init(-1);
-       ASSERT_TRUE(bufmgr != NULL);
+       EXPECT_NE(bufmgr, nullptr);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_NONE));
 
        tbm_bufmgr_deinit(bufmgr);
 
@@ -76,7 +77,7 @@ TEST_F(TBMEnv, BufmgrInitWithoutEnv)
        TBMEnv::TearDown();
 
        bufmgr = tbm_bufmgr_init(-1);
-       ASSERT_TRUE(bufmgr == NULL);
+       EXPECT_EQ(bufmgr, nullptr);
 
        ASSERT_TRUE(tbm_bufmgr_debug_get_ref_count() == 0);
 }
@@ -88,7 +89,8 @@ TEST_F(TBMEnv, BufmgrInitFewTimes)
 
        for (i = 0; i < 10; i++) {
                bufmgr[i] = tbm_bufmgr_init(-1);
-               ASSERT_TRUE(bufmgr[i] != NULL);
+               EXPECT_NE(bufmgr[i], nullptr);
+               EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_NONE));
        }
 
        for (i = 0; i < 10; i++)
@@ -110,7 +112,8 @@ TEST_F(TBMEnv, BufmgrServerInitDeinit)
        tbm_bufmgr bufmgr;
 
        bufmgr = tbm_bufmgr_server_init();
-       ASSERT_TRUE(bufmgr != NULL);
+       EXPECT_NE(bufmgr, nullptr);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_NONE));
 
        tbm_bufmgr_deinit(bufmgr);
 
@@ -124,7 +127,8 @@ TEST_F(TBMEnv, BufmgrServerInitWithoutEnv)
        TBMEnv::TearDown();
 
        bufmgr = tbm_bufmgr_server_init();
-       ASSERT_TRUE(bufmgr != NULL);
+       EXPECT_NE(bufmgr, nullptr);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_NONE));
 
        tbm_bufmgr_deinit(bufmgr);
 
@@ -138,7 +142,8 @@ TEST_F(TBMEnv, BufmgrServerInitFewTimes)
 
        for (i = 0; i < 10; i++) {
                bufmgr[i] = tbm_bufmgr_server_init();
-               ASSERT_TRUE(bufmgr[i] != NULL);
+               EXPECT_NE(bufmgr[i], nullptr);
+               EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_NONE));
        }
 
        for (i = 0; i < 10; i++)
@@ -155,7 +160,7 @@ TEST_F(TBMEnv, SurfaceInternalQueryFormats)
        tbm_format *formats = NULL;
 
        bufmgr = tbm_bufmgr_server_init();
-       ASSERT_TRUE(bufmgr != NULL);
+       EXPECT_NE(bufmgr, nullptr);
 
        ASSERT_TRUE(tbm_surface_internal_query_supported_formats(&formats, &num));
        ASSERT_TRUE(num > 0);
@@ -176,7 +181,7 @@ TEST_F(TBMEnv, SurfaceInternalQueryFormatsFailNull)
        tbm_format *formats = NULL;
 
        bufmgr = tbm_bufmgr_server_init();
-       ASSERT_TRUE(bufmgr != NULL);
+       EXPECT_NE(bufmgr, nullptr);
 
        ASSERT_FALSE(tbm_surface_internal_query_supported_formats(&formats, NULL));
        ASSERT_FALSE(tbm_surface_internal_query_supported_formats(NULL, &num));