From 6aba73800fb529f053183a297a0f68bad8ca50f8 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Wed, 14 Mar 2018 18:45:09 +0900 Subject: [PATCH] utest: change the ASSERT to the EXPECT Change-Id: I2425f1a587091a79e13821a786cdedd17aeb151d --- utests/ut_tbm_backend.cpp | 12 ++++++------ utests/ut_tbm_bufmgr.cpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/utests/ut_tbm_backend.cpp b/utests/ut_tbm_backend.cpp index db5cc88..a8c6eb8 100644 --- a/utests/ut_tbm_backend.cpp +++ b/utests/ut_tbm_backend.cpp @@ -301,15 +301,15 @@ TEST_F(TBMBackend, SurfaceSupportedFormat) int ret = 0; ret = tbm_surface_internal_query_supported_formats(&formats, &num_formats); - ASSERT_TRUE(ret == 1); - ASSERT_TRUE(formats != NULL); + EXPECT_TRUE(ret == 1); + EXPECT_TRUE(formats != NULL); for (uint32_t i = 0; i < num_formats; i++) if (formats[i] == TBM_FORMAT_ARGB8888) format = TBM_FORMAT_ARGB8888; /* fail if there is no TBM_FORMAT_ARGB8888 format */ - ASSERT_TRUE(format == TBM_FORMAT_ARGB8888); + EXPECT_TRUE(format == TBM_FORMAT_ARGB8888); free(formats); @@ -325,12 +325,12 @@ TEST_F(TBMBackend, SurfaceBoAlloc) tbm_surface_h surface; ret = tbm_surface_internal_query_supported_formats(&formats, &num_formats); - ASSERT_TRUE(ret == 1); - ASSERT_TRUE(formats != NULL); + EXPECT_TRUE(ret == 1); + EXPECT_TRUE(formats != NULL); for (uint32_t i = 0; i < num_formats; i++) { surface = tbm_surface_internal_create_with_flags(720, 1024, formats[i], TBM_BO_DEFAULT); - ASSERT_TRUE(surface != NULL); + EXPECT_TRUE(surface != NULL); tbm_surface_internal_destroy(surface); } diff --git a/utests/ut_tbm_bufmgr.cpp b/utests/ut_tbm_bufmgr.cpp index eb9e593..1c92d24 100644 --- a/utests/ut_tbm_bufmgr.cpp +++ b/utests/ut_tbm_bufmgr.cpp @@ -62,7 +62,7 @@ TEST_P(TBMBufmgr, BufmgrGetCapability) unsigned int capability; capability = tbm_bufmgr_get_capability(bufmgr); - ASSERT_NE(capability, TBM_BUFMGR_CAPABILITY_NONE); + EXPECT_NE(capability, TBM_BUFMGR_CAPABILITY_NONE); } TEST_P(TBMBufmgr, BufmgrGetCapabilityWithNullBufmgr) @@ -70,7 +70,7 @@ TEST_P(TBMBufmgr, BufmgrGetCapabilityWithNullBufmgr) unsigned int capability; capability = tbm_bufmgr_get_capability(NULL); - ASSERT_EQ(capability, TBM_BUFMGR_CAPABILITY_NONE); + EXPECT_EQ(capability, TBM_BUFMGR_CAPABILITY_NONE); } TEST_P(TBMBufmgr, BufmgrGetCapabilityWithWrongBufmgr) @@ -79,7 +79,7 @@ TEST_P(TBMBufmgr, BufmgrGetCapabilityWithWrongBufmgr) unsigned int capability; capability = tbm_bufmgr_get_capability(bufmgr); - ASSERT_EQ(capability, TBM_BUFMGR_CAPABILITY_NONE); + EXPECT_EQ(capability, TBM_BUFMGR_CAPABILITY_NONE); } /* tbm_bufmgr_bind_native_display() */ -- 2.7.4