diff --git a/base/test/unittest/common/utils_refbase_test.cpp b/base/test/unittest/common/utils_refbase_test.cpp index 2d3b149e76ab4cbeeb812d42975ec84ed5e02455..84b07ef0e8f83015d781597fa29d2c2d7a9bdbe1 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 testObject1(new RefBase()); testObject1->EnableTracker(); sptr testObject2(testObject1); + EXPECT_EQ(testObject2->GetSptrRefCount(), 2); std::this_thread::sleep_for(std::chrono::milliseconds(1000)); wptr testObject3(testObject2); std::this_thread::sleep_for(std::chrono::milliseconds(1000)); wptr 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 testObject1(new RefBase()); testObject1->EnableTracker(); sptr testObject2 = testObject1.promote(); + EXPECT_EQ(testObject2->GetSptrRefCount(), 2); std::this_thread::sleep_for(std::chrono::milliseconds(1000)); wptr testObject3(testObject2); std::this_thread::sleep_for(std::chrono::milliseconds(1000)); wptr 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 testObject2(testObject1); std::this_thread::sleep_for(std::chrono::milliseconds(1000)); sptr testObject3; + EXPECT_EQ(testObject2->GetSptrRefCount(), 3); testObject3 = testObject2; std::this_thread::sleep_for(std::chrono::milliseconds(1000)); wptr 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 testObject1(new TestDebug()); std::thread subThread {[&testObject1]() { sptr subTestObject1(testObject1); + EXPECT_EQ(testObject2->GetSptrRefCount(), 2); std::this_thread::sleep_for(std::chrono::milliseconds(1000)); wptr subTestObject2(subTestObject1); std::this_thread::sleep_for(std::chrono::milliseconds(1000)); @@ -1052,6 +1059,7 @@ HWTEST_F(UtilsRefbaseTest, testRefbaseDebug004, TestSize.Level1) wptr 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 4734acc15938b6d2180c1a2eacd4022967fa8479..3747ec793be829a4ceeef0cd8de0233be0e272c1 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