From: SooChan Lim Date: Tue, 27 Mar 2018 04:11:35 +0000 (+0900) Subject: utest: change TEST_P to TEST_F X-Git-Tag: accepted/tizen/unified/20180330.060633~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F29%2F173929%2F1;p=platform%2Fcore%2Fuifw%2Flibtbm.git utest: change TEST_P to TEST_F Change-Id: Id96dc9e2f0218bba58d8466dfcf17dcf8d9d39c1 --- diff --git a/utests/ut_tbm_bo.cpp b/utests/ut_tbm_bo.cpp index fd8aa4f..e01ef08 100644 --- a/utests/ut_tbm_bo.cpp +++ b/utests/ut_tbm_bo.cpp @@ -61,7 +61,7 @@ void TBMBo::TearDown() /* tbm_bo_alloc() */ -TEST_P(TBMBo, BoAllocUnref) +TEST_F(TBMBo, BoAllocUnref) { tbm_bo bo; @@ -70,7 +70,7 @@ TEST_P(TBMBo, BoAllocUnref) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoAllocWithBufmgrParamTest) +TEST_F(TBMBo, BoAllocWithBufmgrParamTest) { tbm_bo bo; tbm_bufmgr invalid_bufmgr; @@ -84,7 +84,7 @@ TEST_P(TBMBo, BoAllocWithBufmgrParamTest) ASSERT_TRUE(bo == NULL); } -TEST_P(TBMBo, BoAllocWithSizeParamTest) +TEST_F(TBMBo, BoAllocWithSizeParamTest) { tbm_bo bo; @@ -92,7 +92,7 @@ TEST_P(TBMBo, BoAllocWithSizeParamTest) ASSERT_TRUE(bo == NULL); } -TEST_P(TBMBo, BoAllocWithFlagsParamTest) +TEST_F(TBMBo, BoAllocWithFlagsParamTest) { tbm_bo bo; @@ -115,7 +115,7 @@ TEST_P(TBMBo, BoAllocWithFlagsParamTest) /* tbm_bo_ref() */ -TEST_P(TBMBo, BoRef) +TEST_F(TBMBo, BoRef) { tbm_bo bo; @@ -129,7 +129,7 @@ TEST_P(TBMBo, BoRef) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoRefWithBoParamTest) +TEST_F(TBMBo, BoRefWithBoParamTest) { tbm_bo bo, invalid_bo; @@ -143,7 +143,7 @@ TEST_P(TBMBo, BoRefWithBoParamTest) /* tbm_bo_unref() */ -TEST_P(TBMBo, BoUnrefWithBoParamTest) +TEST_F(TBMBo, BoUnrefWithBoParamTest) { tbm_bo invalid_bo; @@ -157,7 +157,7 @@ TEST_P(TBMBo, BoUnrefWithBoParamTest) /* tbm_bo_map() */ -TEST_P(TBMBo, BoMapUnmap) +TEST_F(TBMBo, BoMapUnmap) { tbm_bo bo; tbm_bo_handle bo_handle; @@ -180,7 +180,7 @@ TEST_P(TBMBo, BoMapUnmap) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoMapWithBoParamTest) +TEST_F(TBMBo, BoMapWithBoParamTest) { tbm_bo invalid_bo; tbm_bo_handle bo_handle; @@ -194,7 +194,7 @@ TEST_P(TBMBo, BoMapWithBoParamTest) } // TODO:: Use Value-Parameterized?? -TEST_P(TBMBo, BoMapWithDeviceParamTest) +TEST_F(TBMBo, BoMapWithDeviceParamTest) { tbm_bo bo; tbm_bo_handle bo_handle; @@ -235,7 +235,7 @@ TEST_P(TBMBo, BoMapWithDeviceParamTest) } // TODO:: Use Value-Parameterized?? -TEST_P(TBMBo, BoMapWithOptParamTest) +TEST_F(TBMBo, BoMapWithOptParamTest) { tbm_bo bo; tbm_bo_handle bo_handle; @@ -264,7 +264,7 @@ TEST_P(TBMBo, BoMapWithOptParamTest) /* tbm_bo_unmap() */ -TEST_P(TBMBo, BoUnmapWithBoParamTest) +TEST_F(TBMBo, BoUnmapWithBoParamTest) { tbm_bo bo; tbm_bo invalid_bo; @@ -287,7 +287,7 @@ TEST_P(TBMBo, BoUnmapWithBoParamTest) /* tbm_bo_get_handle() */ -TEST_P(TBMBo, BoGetHandle) +TEST_F(TBMBo, BoGetHandle) { tbm_bo bo; tbm_bo_handle bo_handle; @@ -299,7 +299,7 @@ TEST_P(TBMBo, BoGetHandle) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoGetHandleWithBoParamTest) +TEST_F(TBMBo, BoGetHandleWithBoParamTest) { tbm_bo_handle bo_handle; tbm_bo invalid_bo; @@ -312,7 +312,7 @@ TEST_P(TBMBo, BoGetHandleWithBoParamTest) ASSERT_TRUE(bo_handle.ptr == NULL); } -TEST_P(TBMBo, BoGetHandleWithDeviceParamTest) +TEST_F(TBMBo, BoGetHandleWithDeviceParamTest) { tbm_bo bo; tbm_bo_handle bo_handle; @@ -342,7 +342,7 @@ TEST_P(TBMBo, BoGetHandleWithDeviceParamTest) /* tbm_bo_export() */ -TEST_P(TBMBo, BoExport) +TEST_F(TBMBo, BoExport) { tbm_bo bo; tbm_key bo_key; @@ -359,7 +359,7 @@ TEST_P(TBMBo, BoExport) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoExportWithBoParamTest) +TEST_F(TBMBo, BoExportWithBoParamTest) { tbm_bo invalid_bo; tbm_key bo_key; @@ -377,7 +377,7 @@ TEST_P(TBMBo, BoExportWithBoParamTest) /* tbm_bo_export_fd() */ -TEST_P(TBMBo, BoExportFd) +TEST_F(TBMBo, BoExportFd) { tbm_bo bo; tbm_fd bo_fd; @@ -394,7 +394,7 @@ TEST_P(TBMBo, BoExportFd) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoExportFdWithBoParamTest) +TEST_F(TBMBo, BoExportFdWithBoParamTest) { tbm_bo invalid_bo; tbm_fd bo_fd; @@ -412,7 +412,7 @@ TEST_P(TBMBo, BoExportFdWithBoParamTest) /* tbm_bo_import() */ -TEST_P(TBMBo, BoImport) +TEST_F(TBMBo, BoImport) { tbm_bo bo1, bo2; tbm_key bo_key; @@ -433,7 +433,7 @@ TEST_P(TBMBo, BoImport) tbm_bo_unref(bo1); } -TEST_P(TBMBo, BoImportWithBufmgrParamTest) +TEST_F(TBMBo, BoImportWithBufmgrParamTest) { tbm_bufmgr invalid_bufmgr; tbm_bo bo; @@ -450,7 +450,7 @@ TEST_P(TBMBo, BoImportWithBufmgrParamTest) ASSERT_TRUE(bo == NULL); } -TEST_P(TBMBo, BoImportWithKeyParamTest) +TEST_F(TBMBo, BoImportWithKeyParamTest) { tbm_bo bo; tbm_key bo_key_invalid; @@ -463,7 +463,7 @@ TEST_P(TBMBo, BoImportWithKeyParamTest) ASSERT_TRUE(bo == NULL); } -TEST_P(TBMBo, BoImportTwice) +TEST_F(TBMBo, BoImportTwice) { tbm_bo bo1, bo2, bo3; tbm_key bo_key; @@ -490,7 +490,7 @@ TEST_P(TBMBo, BoImportTwice) /* tbm_bo_import_fd() */ -TEST_P(TBMBo, BoImportFd) +TEST_F(TBMBo, BoImportFd) { tbm_bo bo1, bo2; tbm_fd bo_fd; @@ -511,7 +511,7 @@ TEST_P(TBMBo, BoImportFd) tbm_bo_unref(bo1); } -TEST_P(TBMBo, BoImportFdWithBufmgrParamTest) +TEST_F(TBMBo, BoImportFdWithBufmgrParamTest) { tbm_bufmgr invalid_bufmgr; tbm_bo bo; @@ -528,7 +528,7 @@ TEST_P(TBMBo, BoImportFdWithBufmgrParamTest) ASSERT_TRUE(bo == NULL); } -TEST_P(TBMBo, BoImportFdWithFdParamTest) +TEST_F(TBMBo, BoImportFdWithFdParamTest) { tbm_bo bo; tbm_fd bo_fd_invalid; @@ -541,7 +541,7 @@ TEST_P(TBMBo, BoImportFdWithFdParamTest) ASSERT_TRUE(bo == NULL); } -TEST_P(TBMBo, BoImportFdTwice) +TEST_F(TBMBo, BoImportFdTwice) { tbm_bo bo1, bo2, bo3; tbm_fd bo_fd; @@ -568,7 +568,7 @@ TEST_P(TBMBo, BoImportFdTwice) /* tbm_bo_size() */ -TEST_P(TBMBo, BoSize) +TEST_F(TBMBo, BoSize) { tbm_bo bo; int size = 0; @@ -582,7 +582,7 @@ TEST_P(TBMBo, BoSize) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoSizeWithBoParamTest) +TEST_F(TBMBo, BoSizeWithBoParamTest) { tbm_bo invalid_bo; int size = 0; @@ -597,7 +597,7 @@ TEST_P(TBMBo, BoSizeWithBoParamTest) /* tbm_bo_locked() */ -TEST_P(TBMBo, BoLocked) +TEST_F(TBMBo, BoLocked) { tbm_bo bo; tbm_bo_handle bo_handle; @@ -627,7 +627,7 @@ TEST_P(TBMBo, BoLocked) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoLockedWithBoParamTest) +TEST_F(TBMBo, BoLockedWithBoParamTest) { tbm_bo invalid_bo; int ret; @@ -641,7 +641,7 @@ TEST_P(TBMBo, BoLockedWithBoParamTest) } #if 0 -TEST_P(TBMBo, BoLockedOnce) +TEST_F(TBMBo, BoLockedOnce) { // TODO: need to be fixed. use tbm_bufmgr_set_bo_lock_type instead of BUFMGR_LOCK_TYPE tbm_bo_handle bo_handle1, bo_handle2; @@ -667,7 +667,7 @@ TEST_P(TBMBo, BoLockedOnce) ASSERT_EQ(ret_locked, 0); } -TEST_P(TBMBo, BoLockedAlways) +TEST_F(TBMBo, BoLockedAlways) { // TODO: need to be fixed. use tbm_bufmgr_set_bo_lock_type instead of BUFMGR_LOCK_TYPE tbm_bo_handle bo_handle1, bo_handle2; @@ -693,7 +693,7 @@ TEST_P(TBMBo, BoLockedAlways) ASSERT_EQ(ret_locked, 1); } -TEST_P(TBMBo, BoLockedNone) +TEST_F(TBMBo, BoLockedNone) { // TODO: need to be fixed. use tbm_bufmgr_set_bo_lock_type instead of BUFMGR_LOCK_TYPE tbm_bo_handle bo_handle1; @@ -718,7 +718,7 @@ TEST_P(TBMBo, BoLockedNone) /* tbm_bo_swap() */ -TEST_P(TBMBo, BoSwap) +TEST_F(TBMBo, BoSwap) { tbm_bo bo1, bo2; int ret; @@ -736,7 +736,7 @@ TEST_P(TBMBo, BoSwap) tbm_bo_unref(bo2); } -TEST_P(TBMBo, BoSwapWithBo1Bo2ParamTest) +TEST_F(TBMBo, BoSwapWithBo1Bo2ParamTest) { tbm_bo bo, invalid_bo1, invalid_bo2; int ret; @@ -768,7 +768,7 @@ TEST_P(TBMBo, BoSwapWithBo1Bo2ParamTest) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoSwapWithDifferentSizedBos) +TEST_F(TBMBo, BoSwapWithDifferentSizedBos) { tbm_bo bo1, bo2; int ret; @@ -792,7 +792,7 @@ TEST_P(TBMBo, BoSwapWithDifferentSizedBos) /* tbm_bo_add_user_data() */ -TEST_P(TBMBo, BoAddUserData) +TEST_F(TBMBo, BoAddUserData) { tbm_bo bo; int ret; @@ -806,7 +806,7 @@ TEST_P(TBMBo, BoAddUserData) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoAddUserDataWithBoParamTest) +TEST_F(TBMBo, BoAddUserDataWithBoParamTest) { tbm_bo invalid_bo; int ret; @@ -819,7 +819,7 @@ TEST_P(TBMBo, BoAddUserDataWithBoParamTest) ASSERT_TRUE(ret == 0); } -TEST_P(TBMBo, BoAddUserDataSameKeyTwiceTest) +TEST_F(TBMBo, BoAddUserDataSameKeyTwiceTest) { tbm_bo bo; int ret; @@ -838,7 +838,7 @@ TEST_P(TBMBo, BoAddUserDataSameKeyTwiceTest) /* tbm_bo_delete_user_data() */ -TEST_P(TBMBo, BoDeleteUserData) +TEST_F(TBMBo, BoDeleteUserData) { tbm_bo bo; int ret; @@ -855,7 +855,7 @@ TEST_P(TBMBo, BoDeleteUserData) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoDeleteUserDataWithBoParam) +TEST_F(TBMBo, BoDeleteUserDataWithBoParam) { tbm_bo invalid_bo; int ret; @@ -868,7 +868,7 @@ TEST_P(TBMBo, BoDeleteUserDataWithBoParam) ASSERT_TRUE(ret == 0); } -TEST_P(TBMBo, BoDeleteUserDataWithKeyParam) +TEST_F(TBMBo, BoDeleteUserDataWithKeyParam) { tbm_bo bo; int ret; @@ -898,7 +898,7 @@ _ut_tbm_bo_user_data_free(void *user_data) *i = 1; } -TEST_P(TBMBo, BoSetUserData) +TEST_F(TBMBo, BoSetUserData) { tbm_bo bo; unsigned long key = 4887; @@ -924,7 +924,7 @@ TEST_P(TBMBo, BoSetUserData) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoSetUserDataWithBoParamTest) +TEST_F(TBMBo, BoSetUserDataWithBoParamTest) { tbm_bo invalid_bo; unsigned long key = 4887; @@ -939,7 +939,7 @@ TEST_P(TBMBo, BoSetUserDataWithBoParamTest) ASSERT_TRUE(ret == 0); } -TEST_P(TBMBo, BoSetUserDataWithKeyParamTest) +TEST_F(TBMBo, BoSetUserDataWithKeyParamTest) { tbm_bo bo; unsigned long key = 4887; @@ -968,7 +968,7 @@ TEST_P(TBMBo, BoSetUserDataWithKeyParamTest) /* tbm_bo_get_user_data() */ -TEST_P(TBMBo, BoGetUserData) +TEST_F(TBMBo, BoGetUserData) { tbm_bo bo; unsigned long key = 4887; @@ -996,7 +996,7 @@ TEST_P(TBMBo, BoGetUserData) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoGetUserDataWithBoParamTest) +TEST_F(TBMBo, BoGetUserDataWithBoParamTest) { tbm_bo invalid_bo; unsigned long key = 4887; @@ -1012,7 +1012,7 @@ TEST_P(TBMBo, BoGetUserDataWithBoParamTest) ASSERT_TRUE(ret == 0); } -TEST_P(TBMBo, BoGetUserDataWithKeyParamTest) +TEST_F(TBMBo, BoGetUserDataWithKeyParamTest) { tbm_bo bo; unsigned long key = 4887; @@ -1045,7 +1045,7 @@ TEST_P(TBMBo, BoGetUserDataWithKeyParamTest) /* tbm_bo_get_flags() */ -TEST_P(TBMBo, BoGetFlags) +TEST_F(TBMBo, BoGetFlags) { tbm_bo bo; int flags1 = TBM_BO_DEFAULT, flags2 = -1; @@ -1059,7 +1059,7 @@ TEST_P(TBMBo, BoGetFlags) tbm_bo_unref(bo); } -TEST_P(TBMBo, BoGetFlagsWithBoParamTest) +TEST_F(TBMBo, BoGetFlagsWithBoParamTest) { tbm_bo invalid_bo; int flags = -1; diff --git a/utests/ut_tbm_bufmgr.cpp b/utests/ut_tbm_bufmgr.cpp index 1c92d24..cfe28c1 100644 --- a/utests/ut_tbm_bufmgr.cpp +++ b/utests/ut_tbm_bufmgr.cpp @@ -57,7 +57,7 @@ void TBMBufmgr::TearDown() } /* tbm_bufmgr_get_capability() */ -TEST_P(TBMBufmgr, BufmgrGetCapability) +TEST_F(TBMBufmgr, BufmgrGetCapability) { unsigned int capability; @@ -65,7 +65,7 @@ TEST_P(TBMBufmgr, BufmgrGetCapability) EXPECT_NE(capability, TBM_BUFMGR_CAPABILITY_NONE); } -TEST_P(TBMBufmgr, BufmgrGetCapabilityWithNullBufmgr) +TEST_F(TBMBufmgr, BufmgrGetCapabilityWithNullBufmgr) { unsigned int capability; @@ -73,7 +73,7 @@ TEST_P(TBMBufmgr, BufmgrGetCapabilityWithNullBufmgr) EXPECT_EQ(capability, TBM_BUFMGR_CAPABILITY_NONE); } -TEST_P(TBMBufmgr, BufmgrGetCapabilityWithWrongBufmgr) +TEST_F(TBMBufmgr, BufmgrGetCapabilityWithWrongBufmgr) { tbm_bufmgr bufmgr = (tbm_bufmgr)UT_TBM_INVALID_VALUE; unsigned int capability; @@ -84,7 +84,7 @@ TEST_P(TBMBufmgr, BufmgrGetCapabilityWithWrongBufmgr) /* tbm_bufmgr_bind_native_display() */ #if 0 // TDDO:: fix the crash... -TEST_P(TBMBufmgr, BufmgrBindNativeDisplay) +TEST_F(TBMBufmgr, BufmgrBindNativeDisplay) { int ret; void *native_display = (void *)UT_TBM_INVALID_VALUE; @@ -93,7 +93,7 @@ TEST_P(TBMBufmgr, BufmgrBindNativeDisplay) ASSERT_EQ(ret, 1); } -TEST_P(TBMBufmgr, BufmgrBindNativeDisplayWithNullBufmgr) +TEST_F(TBMBufmgr, BufmgrBindNativeDisplayWithNullBufmgr) { int ret; void *native_display = (void *)UT_TBM_INVALID_VALUE; @@ -102,7 +102,7 @@ TEST_P(TBMBufmgr, BufmgrBindNativeDisplayWithNullBufmgr) ASSERT_EQ(ret, 0); } -TEST_P(TBMBufmgr, BufmgrBindNativeDisplayWithWrongBufmgr) +TEST_F(TBMBufmgr, BufmgrBindNativeDisplayWithWrongBufmgr) { int ret; void *native_display = (void *)UT_TBM_INVALID_VALUE; @@ -113,7 +113,7 @@ TEST_P(TBMBufmgr, BufmgrBindNativeDisplayWithWrongBufmgr) #endif /* tbm_bufmgr_set_bo_lock_type() */ -TEST_P(TBMBufmgr, BufmgrSetBoLockType) +TEST_F(TBMBufmgr, BufmgrSetBoLockType) { int ret; @@ -125,7 +125,7 @@ TEST_P(TBMBufmgr, BufmgrSetBoLockType) ASSERT_TRUE(ret == 1); } -TEST_P(TBMBufmgr, BufmgrSetBoLockTypeWithBufmgrParamTest) +TEST_F(TBMBufmgr, BufmgrSetBoLockTypeWithBufmgrParamTest) { tbm_bufmgr invalid_bufmgr; int ret; diff --git a/utests/ut_tbm_env.cpp b/utests/ut_tbm_env.cpp index 2119627..a27563b 100644 --- a/utests/ut_tbm_env.cpp +++ b/utests/ut_tbm_env.cpp @@ -57,7 +57,7 @@ void TBMEnv::TearDown(void) /* tbm_bufmgr_init(), tbm_bufmgr_deinit() */ -TEST_P(TBMEnv, BufmgrInitDeinit) +TEST_F(TBMEnv, BufmgrInitDeinit) { tbm_bufmgr bufmgr; @@ -69,7 +69,7 @@ TEST_P(TBMEnv, BufmgrInitDeinit) ASSERT_TRUE(tbm_bufmgr_debug_get_ref_count() == 0); } -TEST_P(TBMEnv, BufmgrInitWithoutEnv) +TEST_F(TBMEnv, BufmgrInitWithoutEnv) { tbm_bufmgr bufmgr; @@ -81,7 +81,7 @@ TEST_P(TBMEnv, BufmgrInitWithoutEnv) ASSERT_TRUE(tbm_bufmgr_debug_get_ref_count() == 0); } -TEST_P(TBMEnv, BufmgrInitFewTimes) +TEST_F(TBMEnv, BufmgrInitFewTimes) { tbm_bufmgr bufmgr[10]; int i; @@ -97,7 +97,7 @@ TEST_P(TBMEnv, BufmgrInitFewTimes) ASSERT_TRUE(tbm_bufmgr_debug_get_ref_count() == 0); } -TEST_P(TBMEnv, BufmgrDeinitWithNULL) +TEST_F(TBMEnv, BufmgrDeinitWithNULL) { tbm_bufmgr_deinit(NULL); @@ -105,7 +105,7 @@ TEST_P(TBMEnv, BufmgrDeinitWithNULL) } /* tbm_bufmgr_server_init() */ -TEST_P(TBMEnv, BufmgrServerInitDeinit) +TEST_F(TBMEnv, BufmgrServerInitDeinit) { tbm_bufmgr bufmgr; @@ -117,7 +117,7 @@ TEST_P(TBMEnv, BufmgrServerInitDeinit) ASSERT_TRUE(tbm_bufmgr_debug_get_ref_count() == 0); } -TEST_P(TBMEnv, BufmgrServerInitWithoutEnv) +TEST_F(TBMEnv, BufmgrServerInitWithoutEnv) { tbm_bufmgr bufmgr; @@ -131,7 +131,7 @@ TEST_P(TBMEnv, BufmgrServerInitWithoutEnv) ASSERT_TRUE(tbm_bufmgr_debug_get_ref_count() == 0); } -TEST_P(TBMEnv, BufmgrServerInitFewTimes) +TEST_F(TBMEnv, BufmgrServerInitFewTimes) { tbm_bufmgr bufmgr[10]; int i;