utest: change some UtInit testcases into SurfaceTest testcases

Change-Id: I52ef9827fee1410795a40a128dfcaa8e549787e3

diff --git a/utests/ut_tbm_surface.cpp b/utests/ut_tbm_surface.cpp
index f7aa66a..b263a24 100644 (file)
--- a/utests/ut_tbm_surface.cpp
+++ b/utests/ut_tbm_surface.cpp
@@ -37,38 +37,31 @@ TEST_F(SurfaceQueryFormatsTest, SurfaceQueryFormatSuccess)
        free(formats);
 }
 
-TEST_F(UtInit, SurfaceCeateFailInvalidGeometry)
+TEST_F(SurfaceTest, SurfaceCeateFailInvalidGeometry)
 {
-       tbm_surface_h surface = NULL;
+       tbm_surface_h surf1 = NULL;
 
        ut_set_default_tbm_env();
 
-       surface = tbm_surface_create(-1, 1024, TBM_FORMAT_ARGB8888);
-       ASSERT_EQ(nullptr, surface); // Expected Value: NULL
+       surf1 = tbm_surface_create(-1, 1024, TBM_FORMAT_ARGB8888);
+       ASSERT_EQ(nullptr, surf1); // Expected Value: NULL
 
-       surface = tbm_surface_create(720, -1, TBM_FORMAT_ARGB8888);
-       ASSERT_EQ(nullptr, surface);
+       surf1 = tbm_surface_create(720, -1, TBM_FORMAT_ARGB8888);
+       ASSERT_EQ(nullptr, surf1);
 
-       surface = tbm_surface_create(720, 1024, 0);
-       ASSERT_EQ(nullptr, surface);
+       surf1 = tbm_surface_create(720, 1024, 0);
+       ASSERT_EQ(nullptr, surf1);
 }
 
-TEST_F(UtInit, SurfaceCeateSuccess)
+TEST_F(SurfaceTest, SurfaceCeateSuccess)
 {
-       tbm_surface_h surface = NULL;
-       uint32_t num = 0;
-       tbm_format *formats = NULL;
+       tbm_surface_h surf1 = NULL;
        tbm_surface_error_e result = TBM_SURFACE_ERROR_NONE;
 
-       ut_set_default_tbm_env();
-
-       result = (tbm_surface_error_e)tbm_surface_query_formats(&formats, &num);
-       ASSERT_EQ(TBM_SURFACE_ERROR_NONE, result);
-
-       for (uint32_t i = 0; i < num; i++) {
-               surface = tbm_surface_create(720, 1024, formats[i]);
-               ASSERT_NE((tbm_surface_h)NULL, surface);
-               result = (tbm_surface_error_e)tbm_surface_destroy(surface);
+       for (uint32_t i = 0; i < num_formats; i++) {
+               surf1 = tbm_surface_create(720, 1024, formats[i]);
+               ASSERT_NE((tbm_surface_h)NULL, surf1);
+               result = (tbm_surface_error_e)tbm_surface_destroy(surf1);
                ASSERT_EQ(TBM_SURFACE_ERROR_NONE, result);
        }
 }