From a687a16ae9c80e16ae1800de7251e60a41611785 Mon Sep 17 00:00:00 2001
From: fwx1246009 <fuzijian5@huawei.com>
Date: Fri, 5 May 2023 15:46:23 +0800
Subject: [PATCH] Add EXPECT_* checks

Issue: I70JI2
Test: UT

Signed-off-by: fwx1246009 <fuzijian5@huawei.com>
Change-Id: I04419df6757ef66bc43972a88b2884c6337585d6
---
 base/test/unittest/common/utils_refbase_test.cpp | 10 +++++++++-
 .../unittest/common/utils_unique_fd_test.cpp     | 16 ++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/base/test/unittest/common/utils_refbase_test.cpp b/base/test/unittest/common/utils_refbase_test.cpp
index 2d3b149..84b07ef 100644
--- a/base/test/unittest/common/utils_refbase_test.cpp
+++ b/base/test/unittest/common/utils_refbase_test.cpp
@@ -981,10 +981,12 @@ HWTEST_F(UtilsRefbaseTest, testRefbaseDebug001, TestSize.Level1)
     sptr<RefBase> testObject1(new RefBase());
     testObject1->EnableTracker();
     sptr<RefBase> testObject2(testObject1);
+    EXPECT_EQ(testObject2->GetSptrRefCount(), 2);
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     wptr<RefBase> testObject3(testObject2);
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     wptr<RefBase> testObject4(testObject3);
+    EXPECT_EQ(testObject4->GetWptrRefCount(), 3);
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 }
 
@@ -998,10 +1000,12 @@ HWTEST_F(UtilsRefbaseTest, testRefbaseDebug002, TestSize.Level1)
     wptr<RefBase> testObject1(new RefBase());
     testObject1->EnableTracker();
     sptr<RefBase> testObject2 = testObject1.promote();
+    EXPECT_EQ(testObject2->GetSptrRefCount(), 2);
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     wptr<RefBase> testObject3(testObject2);
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     wptr<RefBase> testObject4(testObject3);
+    EXPECT_EQ(testObject4->GetWptrRefCount(), 3);
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 }
 
@@ -1025,9 +1029,11 @@ HWTEST_F(UtilsRefbaseTest, testRefbaseDebug003, TestSize.Level1)
     sptr<TestDebug> testObject2(testObject1);
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     sptr<TestDebug> testObject3;
+    EXPECT_EQ(testObject2->GetSptrRefCount(), 3);
     testObject3 = testObject2;
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     wptr<TestDebug> testObject4(testObject3);
+    EXPECT_EQ(testObject4->GetWptrRefCount(), 4);
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 }
 
@@ -1040,6 +1046,7 @@ HWTEST_F(UtilsRefbaseTest, testRefbaseDebug004, TestSize.Level1)
     sptr<TestDebug> testObject1(new TestDebug());
     std::thread subThread {[&testObject1]() {
         sptr<TestDebug> subTestObject1(testObject1);
+	EXPECT_EQ(testObject2->GetSptrRefCount(), 2);
         std::this_thread::sleep_for(std::chrono::milliseconds(1000));
         wptr<TestDebug> subTestObject2(subTestObject1);
         std::this_thread::sleep_for(std::chrono::milliseconds(1000));
@@ -1052,6 +1059,7 @@ HWTEST_F(UtilsRefbaseTest, testRefbaseDebug004, TestSize.Level1)
     wptr<TestDebug> testObject3(testObject2);
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
     subThread.join();
+    EXPECT_EQ(testObject4->GetWptrRefCount(), 4);
 }
 }  // namespace
-}  // namespace OHOS
\ No newline at end of file
+}  // namespace OHOS
diff --git a/base/test/unittest/common/utils_unique_fd_test.cpp b/base/test/unittest/common/utils_unique_fd_test.cpp
index 4734acc..3747ec7 100644
--- a/base/test/unittest/common/utils_unique_fd_test.cpp
+++ b/base/test/unittest/common/utils_unique_fd_test.cpp
@@ -53,11 +53,7 @@ void UtilsUniqueFd::TearDownTestCase(void)
     std::string testStr;
     inputfile >> testStr;
     inputfile.close();
-    if (remove(testfilename) == 0) {
-        ;
-    } else {
-        FAIL();
-    }
+    EXPECT_EQ(remove(testfilename), 0);
 }
 
 HWTEST_F(UtilsUniqueFd, testUtilsUniqueFd, TestSize.Level0)
@@ -65,18 +61,14 @@ HWTEST_F(UtilsUniqueFd, testUtilsUniqueFd, TestSize.Level0)
     int fd = open("NOTHISFILE", O_RDWR, 0666);
 
     UniqueFd ufd2(fd);
-    if (ufd2 == -1) {
-        SUCCEED();
-    }
+    EXPECT_EQ(ufd2, -1);
 };
 
 HWTEST_F(UtilsUniqueFd, testUtilsUniqueCtroFromInt, TestSize.Level0)
 {
 
     UniqueFd ufd2(open(testfilename, O_RDWR, 0666));
-    if (ufd2 == -1) {
-        FAIL();
-    }
+    EXPECT_NE(ufd2, -1);
 };
 
 HWTEST_F(UtilsUniqueFd, testUtilsUniqueFdeqcompare, TestSize.Level0)
@@ -167,4 +159,4 @@ HWTEST_F(UtilsUniqueFd, testUtilsUniqueFdDefineDeletorCloseStatus, TestSize.Leve
     ASSERT_EQ(ret, -1);
 };
 }  // namespace
-}  // namespace OHOS
\ No newline at end of file
+}  // namespace OHOS
-- 
Gitee