utest: check the tbm_error_e for the query formats tests

Change-Id: Ied2ec573d1fb07b023dc0f8bb361598750c26dcc

diff --git a/utests/ut_tbm_env.cpp b/utests/ut_tbm_env.cpp
index c9d7b53..4d41cb8 100644 (file)
--- a/utests/ut_tbm_env.cpp
+++ b/utests/ut_tbm_env.cpp
@@ -162,11 +162,12 @@ TEST_F(TBMEnv, SurfaceInternalQueryFormats)
        bufmgr = tbm_bufmgr_server_init();
        EXPECT_NE(bufmgr, nullptr);
 
-       ASSERT_TRUE(tbm_surface_internal_query_supported_formats(&formats, &num));
-       ASSERT_TRUE(num > 0);
-       ASSERT_TRUE(formats != NULL);
+       EXPECT_EQ(tbm_surface_internal_query_supported_formats(&formats, &num), 1);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_NONE));
+       EXPECT_GT(num, 0);
+       EXPECT_NE(formats, nullptr);
        for (uint32_t i = 0; i < num; i++)
-               ASSERT_TRUE(formats[i] != 0);
+               EXPECT_NE(formats[i], 0);
 
        if (formats)
                free(formats);
@@ -182,9 +183,12 @@ TEST_F(TBMEnv, SurfaceInternalQueryFormatsFailNull)
 
        bufmgr = tbm_bufmgr_server_init();
        EXPECT_NE(bufmgr, nullptr);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_NONE));
 
-       ASSERT_FALSE(tbm_surface_internal_query_supported_formats(&formats, NULL));
-       ASSERT_FALSE(tbm_surface_internal_query_supported_formats(NULL, &num));
+       EXPECT_EQ(tbm_surface_internal_query_supported_formats(&formats, NULL), 0);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_INVALID_PARAMETER));
+       EXPECT_EQ(tbm_surface_internal_query_supported_formats(NULL, &num), 0);
+       EXPECT_STREQ(tbm_error_str(tbm_get_last_error()), tbm_error_str(TBM_ERROR_INVALID_PARAMETER));
 
        tbm_bufmgr_deinit(bufmgr);
 }
@@ -196,10 +200,10 @@ TEST_F(TBMEnv, SurfaceQueryFormatsFailNull)
        tbm_surface_error_e result = TBM_SURFACE_ERROR_NONE;
 
        result = (tbm_surface_error_e)tbm_surface_query_formats(&formats, NULL);
-       ASSERT_NE(TBM_SURFACE_ERROR_NONE, result);
+       EXPECT_STREQ(tbm_error_str(result), tbm_error_str(TBM_ERROR_INVALID_PARAMETER));
 
        result = (tbm_surface_error_e)tbm_surface_query_formats(NULL, &num);
-       ASSERT_NE(TBM_SURFACE_ERROR_NONE, result);
+       EXPECT_STREQ(tbm_error_str(result), tbm_error_str(TBM_ERROR_INVALID_PARAMETER));
 }
 
 TEST_F(TBMEnv, SurfaceQueryFormatSuccess)
@@ -209,11 +213,11 @@ TEST_F(TBMEnv, SurfaceQueryFormatSuccess)
        tbm_surface_error_e result = TBM_SURFACE_ERROR_NONE;
 
        result = (tbm_surface_error_e)tbm_surface_query_formats(&formats, &num);
-       ASSERT_EQ(TBM_SURFACE_ERROR_NONE, result);
-       ASSERT_NE(0, num);
-       ASSERT_NE((tbm_format *)NULL, formats);
+       EXPECT_EQ(TBM_SURFACE_ERROR_NONE, result);
+       EXPECT_GT(num, 0);
+       EXPECT_NE((tbm_format *)NULL, formats);
        for (uint32_t i = 0; i < num; i++)
-               ASSERT_NE(0, formats[i]);
+               EXPECT_NE(0, formats[i]);
        free(formats);
 }