Star7
280
代码
代码
Issues65
Pull Requests47
项目讨论
Wiki
分析
Star7
280
已合并
修改UT #2213
lisusu创建于 7月21日
修改UT #2213
已合并
lisusu创建于 7月21日
从I_am__ok/filemanagement_app_file_service_8843master合入到openharmony/filemanagement_app_file_servicemaster
共 12 个文件变更+101-68
Mtests/unittests/backup_ext/ext_backup_js_sub_test.cpp+2-0
@@ -720,9 +720,11 @@ HWTEST_F(ExtBackupJsSubTest, SUB_backup_ext_js_InitTempPath_0100, testing::ext::
720 GTEST_LOG_(INFO) << "ExtBackupJsSubTest-begin SUB_backup_ext_js_InitTempPath_0100";720 GTEST_LOG_(INFO) << "ExtBackupJsSubTest-begin SUB_backup_ext_js_InitTempPath_0100";
721 try {721 try {
722 std::string el2BackupDir(BConstants::PATH_BUNDLE_BACKUP_HOME);722 std::string el2BackupDir(BConstants::PATH_BUNDLE_BACKUP_HOME);
723+ ForceRemoveDirectoryBMS(el2BackupDir);
723 int ret = access(el2BackupDir.c_str(), F_OK);724 int ret = access(el2BackupDir.c_str(), F_OK);
724 EXPECT_TRUE(ret != F_OK);725 EXPECT_TRUE(ret != F_OK);
725 std::string el1BackupDir(BConstants::PATH_BUNDLE_BACKUP_HOME_EL1);726 std::string el1BackupDir(BConstants::PATH_BUNDLE_BACKUP_HOME_EL1);
727+ ForceRemoveDirectoryBMS(el1BackupDir);
726 ret = access(el1BackupDir.c_str(), F_OK);728 ret = access(el1BackupDir.c_str(), F_OK);
727 EXPECT_TRUE(ret != F_OK);729 EXPECT_TRUE(ret != F_OK);
728 std::string bundleName = "testBundleName";730 std::string bundleName = "testBundleName";
Mtests/unittests/backup_ext/ext_extension_new_test.cpp+26-0
@@ -30,7 +30,30 @@
30#include "ext_extension_mock.h"30#include "ext_extension_mock.h"
31#include "i_service_mock.h"31#include "i_service_mock.h"
32 32 
33+#include "json/json.h"
rainlost
rainlostrainlost7月21日

按照a-z顺序排列，中间不要加多余空行

likedislike
lisusu
lisusu
7月21日 评论：
34+
35+namespace JsonTest {
36+using Value = Json::Value;
37+using StreamWriterBuilder = Json::StreamWriterBuilder;
38+std::string writeString(StreamWriterBuilder const &builder, Value const &root)
39+{
40+ return Json::writeString(builder, root);
41+}
42+class FastWriter {
43+public:
44+ std::string Write(const Value &root)
45+ {
46+ return writer.write(root);
47+ }
48+
49+private:
50+ Json::FastWriter writer;
51+};
52+}; // namespace JsonTest
53+ 
33#include "library_func_mock.h"54#include "library_func_mock.h"
55+#include "library_func_define.h"
56+#define Json JsonTest
34#include "tar_file.cpp"57#include "tar_file.cpp"
35#include "untar_file.cpp"58#include "untar_file.cpp"
36#define Persist GetFd59#define Persist GetFd
@@ -415,6 +438,9 @@ HWTEST_F(ExtExtensionNewTest, Ext_Extension_DoBackupTask_Test_0200, testing::ext
415 ScanFileSingleton::GetInstance().pendingFileQueue_.push(nullptr);438 ScanFileSingleton::GetInstance().pendingFileQueue_.push(nullptr);
416 ScanFileSingleton::GetInstance().SetCompletedFlag(true);439 ScanFileSingleton::GetInstance().SetCompletedFlag(true);
417 int ret = 0;440 int ret = 0;
441+ EXPECT_CALL(*funcMock_, write(_, _, _)).WillRepeatedly([](int, const void *, size_t size) -> ssize_t {
442+ return size;
443+ });
418 EXPECT_CALL(*serviceMock_, AppDone(_)).WillRepeatedly([&ret](int err) -> int {444 EXPECT_CALL(*serviceMock_, AppDone(_)).WillRepeatedly([&ret](int err) -> int {
419 ret = err;445 ret = err;
420 return 0;446 return 0;
Mtests/unittests/backup_ext/ext_extension_sub_ext_test.cpp+1-1
@@ -796,7 +796,7 @@ HWTEST_F(ExtExtensionSubTest, SUB_AncoBackupCallback_OnBigFileReadyCallback_0000
796 GTEST_LOG_(INFO) << "ExtExtensionSubTest-begin SUB_AncoBackupCallback_OnBigFileReadyCallback_0000";796 GTEST_LOG_(INFO) << "ExtExtensionSubTest-begin SUB_AncoBackupCallback_OnBigFileReadyCallback_0000";
797 ScanFileSingleton::GetInstance().SetCompletedFlag(true);797 ScanFileSingleton::GetInstance().SetCompletedFlag(true);
798 auto callback = sptr<AncoBackupCallback>::MakeSptr(extExtension);798 auto callback = sptr<AncoBackupCallback>::MakeSptr(extExtension);
799- std::string filePath = "";799+ std::string filePath = "/abc/ddd/1.txt";
800 std::string restorePath = "";800 std::string restorePath = "";
801 StatInfo statInfo;801 StatInfo statInfo;
802 802 
Mtests/unittests/backup_ext/ext_extension_sub_test.cpp+0-1
@@ -334,7 +334,6 @@ HWTEST_F(ExtExtensionSubTest, Ext_Extension_Sub_CheckRstoreFileInfos_Test_0100,
334 EXPECT_EQ(std::get<0>(result), true);334 EXPECT_EQ(std::get<0>(result), true);
335 335 
336 auto [err, fileInfos, errInfos] = UntarFile::GetInstance().UnPacket(tarName, untarPath);336 auto [err, fileInfos, errInfos] = UntarFile::GetInstance().UnPacket(tarName, untarPath);
337- extExtension->endFileInfos_[tarName] = 1;
338 extExtension->endFileInfos_.merge(fileInfos);337 extExtension->endFileInfos_.merge(fileInfos);
339 338 
340 result = extExtension->CheckRestoreFileInfos();339 result = extExtension->CheckRestoreFileInfos();
Mtests/unittests/backup_sa/module_ipc/service_incremental_test.cpp+19-19
@@ -1375,14 +1375,14 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_
1375 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _))1375 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _))
1376 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));1376 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1377 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE));1377 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE));
1378- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1378+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1379 auto ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);1379 auto ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);
1380 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());1380 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());
1381 1381 
1382 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _))1382 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _))
1383 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));1383 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1384 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));1384 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));
1385- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1385+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1386 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false));1386 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false));
1387 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);1387 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);
1388 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());1388 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());
@@ -1392,7 +1392,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_
1392 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));1392 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1393 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));1393 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));
1394 EXPECT_CALL(*session, OnBundleExtManageInfo(_, _)).WillOnce(Return(UniqueFd(-1)));1394 EXPECT_CALL(*session, OnBundleExtManageInfo(_, _)).WillOnce(Return(UniqueFd(-1)));
1395- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1395+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1396 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false));1396 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false));
1397 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);1397 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);
1398 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());1398 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());
@@ -1429,7 +1429,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_
1429 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _))1429 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _))
1430 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));1430 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1431 EXPECT_CALL(*session, OnBundleExtManageInfo(_, _)).WillOnce(Return(UniqueFd(-1)));1431 EXPECT_CALL(*session, OnBundleExtManageInfo(_, _)).WillOnce(Return(UniqueFd(-1)));
1432- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1432+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1433 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true));1433 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true));
1434 EXPECT_CALL(*srvMock, HandleCurBundleFileReady(_, _, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));1434 EXPECT_CALL(*srvMock, HandleCurBundleFileReady(_, _, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1435 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);1435 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);
@@ -1463,13 +1463,13 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_
1463 1463 
1464 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));1464 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1465 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE));1465 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE));
1466- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1466+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1467 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);1467 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);
1468 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());1468 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());
1469 1469 
1470 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));1470 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1471 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));1471 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));
1472- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1472+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1473 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false));1473 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false));
1474 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);1474 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);
1475 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());1475 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());
@@ -1478,7 +1478,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_
1478 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));1478 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1479 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));1479 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));
1480 EXPECT_CALL(*session, OnBundleExtManageInfo(_, _)).WillOnce(Return(UniqueFd(-1)));1480 EXPECT_CALL(*session, OnBundleExtManageInfo(_, _)).WillOnce(Return(UniqueFd(-1)));
1481- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1481+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1482 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false));1482 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false));
1483 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);1483 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);
1484 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());1484 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());
@@ -1506,7 +1506,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_
1506 int32_t errCode = 0;1506 int32_t errCode = 0;
1507 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));1507 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1508 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));1508 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));
1509- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1509+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1510 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true));1510 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true));
1511 EXPECT_CALL(*srvMock, HandleCurBundleFileReady(_, _, _))1511 EXPECT_CALL(*srvMock, HandleCurBundleFileReady(_, _, _))
1512 .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode()));1512 .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode()));
@@ -1517,7 +1517,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_
1517 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));1517 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1518 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));1518 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));
1519 EXPECT_CALL(*session, OnBundleExtManageInfo(_, _)).WillOnce(Return(UniqueFd(-1)));1519 EXPECT_CALL(*session, OnBundleExtManageInfo(_, _)).WillOnce(Return(UniqueFd(-1)));
1520- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1520+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1521 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true));1521 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true));
1522 EXPECT_CALL(*srvMock, HandleCurBundleFileReady(_, _, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));1522 EXPECT_CALL(*srvMock, HandleCurBundleFileReady(_, _, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1523 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);1523 ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode);
@@ -1548,14 +1548,14 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReadyW
1548 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _))1548 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _))
1549 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));1549 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1550 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE));1550 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE));
1551- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1551+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1552 auto ret = service->AppIncrementalFileReadyWithoutFd(fileName, errCode);1552 auto ret = service->AppIncrementalFileReadyWithoutFd(fileName, errCode);
1553 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());1553 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());
1554 1554 
1555 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _))1555 EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_, _))
1556 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));1556 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1557 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));1557 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));
1558- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1558+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1559 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false));1559 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false));
1560 ret = service->AppIncrementalFileReadyWithoutFd(fileName, errCode);1560 ret = service->AppIncrementalFileReadyWithoutFd(fileName, errCode);
1561 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());1561 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());
@@ -1565,7 +1565,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReadyW
1565 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));1565 .WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1566 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));1566 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));
1567 EXPECT_CALL(*session, OnBundleExtManageInfo(_, _)).WillOnce(Return(UniqueFd(-1)));1567 EXPECT_CALL(*session, OnBundleExtManageInfo(_, _)).WillOnce(Return(UniqueFd(-1)));
1568- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1568+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1569 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false));1569 EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false));
1570 ret = service->AppIncrementalFileReadyWithoutFd(fileName, errCode);1570 ret = service->AppIncrementalFileReadyWithoutFd(fileName, errCode);
1571 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());1571 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());
@@ -1716,7 +1716,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_GetIncrementalFileHandle
1716 EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy));1716 EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy));
1717 EXPECT_CALL(*svcProxy, GetIncrementalFileHandle(_, _, _, _)).WillOnce(Return(0));1717 EXPECT_CALL(*svcProxy, GetIncrementalFileHandle(_, _, _, _)).WillOnce(Return(0));
1718 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE));1718 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE));
1719- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1719+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1720 ret = service->GetIncrementalFileHandle(bundleName, fileName);1720 ret = service->GetIncrementalFileHandle(bundleName, fileName);
1721 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());1721 EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode());
1722 1722 
@@ -1766,7 +1766,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_IncrementalBackup_0000,
1766 EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true));1766 EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true));
1767 EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false));1767 EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false));
1768 EXPECT_CALL(*svcProxy, IncrementalOnBackup(_)).WillOnce(Return(0));1768 EXPECT_CALL(*svcProxy, IncrementalOnBackup(_)).WillOnce(Return(0));
1769- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1769+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1770 EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return(0));1770 EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return(0));
1771 EXPECT_TRUE(service->IncrementalBackup(bundleName));1771 EXPECT_TRUE(service->IncrementalBackup(bundleName));
1772 1772 
@@ -1776,7 +1776,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_IncrementalBackup_0000,
1776 EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true));1776 EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true));
1777 EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false));1777 EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false));
1778 EXPECT_CALL(*svcProxy, IncrementalOnBackup(_)).WillOnce(Return(1));1778 EXPECT_CALL(*svcProxy, IncrementalOnBackup(_)).WillOnce(Return(1));
1779- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1779+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1780 EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return(0));1780 EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return(0));
1781 EXPECT_TRUE(service->IncrementalBackup(bundleName));1781 EXPECT_TRUE(service->IncrementalBackup(bundleName));
1782 1782 
@@ -1828,7 +1828,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_IncrementalBackup_0100,
1828 EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(true));1828 EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(true));
1829 EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false));1829 EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false));
1830 EXPECT_CALL(*svcProxy, HandleRestore(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));1830 EXPECT_CALL(*svcProxy, HandleRestore(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1831- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)).WillOnce(Return(srProxy));1831+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1832 EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return(0));1832 EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return(0));
1833 EXPECT_CALL(*session, GetOldBackupVersion()).WillOnce(Return(""));1833 EXPECT_CALL(*session, GetOldBackupVersion()).WillOnce(Return(""));
1834 EXPECT_CALL(*session, GetExtFileNameRequest(_)).WillOnce(Return(fileNameVec));1834 EXPECT_CALL(*session, GetExtFileNameRequest(_)).WillOnce(Return(fileNameVec));
@@ -1864,7 +1864,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_IncrementalBackup_0200,
1864 EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(true));1864 EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(true));
1865 EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false));1865 EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false));
1866 EXPECT_CALL(*svcProxy, HandleRestore(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));1866 EXPECT_CALL(*svcProxy, HandleRestore(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));
1867- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)).WillOnce(Return(srProxy));1867+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1868 EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return(0));1868 EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return(0));
1869 EXPECT_CALL(*session, GetOldBackupVersion()).WillOnce(Return("1.0.0"));1869 EXPECT_CALL(*session, GetOldBackupVersion()).WillOnce(Return("1.0.0"));
1870 EXPECT_CALL(*session, GetExtFileNameRequest(_)).WillOnce(Return(fileNameVec));1870 EXPECT_CALL(*session, GetExtFileNameRequest(_)).WillOnce(Return(fileNameVec));
@@ -1902,13 +1902,13 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_NotifyCallerCurAppIncrem
1902 EXPECT_TRUE(true);1902 EXPECT_TRUE(true);
1903 1903 
1904 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));1904 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP));
1905- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1905+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1906 EXPECT_CALL(*srProxy, IncrementalBackupOnBundleFinished(_, _)).WillOnce(Return(0));1906 EXPECT_CALL(*srProxy, IncrementalBackupOnBundleFinished(_, _)).WillOnce(Return(0));
1907 service->NotifyCallerCurAppIncrementDone(errCode, callerName);1907 service->NotifyCallerCurAppIncrementDone(errCode, callerName);
1908 EXPECT_TRUE(true);1908 EXPECT_TRUE(true);
1909 1909 
1910 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE));1910 EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE));
1911- EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy));1911+ EXPECT_CALL(*session, GetServiceReverseProxy()).WillRepeatedly(Return(srProxy));
1912 EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleFinished(_, _)).WillOnce(Return(0));1912 EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleFinished(_, _)).WillOnce(Return(0));
1913 service->NotifyCallerCurAppIncrementDone(errCode, callerName);1913 service->NotifyCallerCurAppIncrementDone(errCode, callerName);
1914 EXPECT_TRUE(true);1914 EXPECT_TRUE(true);
Mtests/unittests/backup_sa/module_ipc/service_other_test.cpp+10-6
@@ -358,6 +358,9 @@ void ServiceTest::TearDown()
358 if (token) {358 if (token) {
359 testing::Mock::VerifyAndClearExpectations(token.get());359 testing::Mock::VerifyAndClearExpectations(token.get());
360 }360 }
361+ if (param) {
362+ testing::Mock::VerifyAndClearExpectations(param.get());
363+ }
361}364}
362 365 
363#include "sub_service_test.cpp"366#include "sub_service_test.cpp"
@@ -1501,7 +1504,7 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupExtension_0200, TestSize.Level1)
1501 EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::START));1504 EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::START));
1502 EXPECT_CALL(*session, GetSessionUserId()).WillOnce(Return(0));1505 EXPECT_CALL(*session, GetSessionUserId()).WillOnce(Return(0));
1503 EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _))1506 EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _))
1504- .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode()));1507+ .WillRepeatedly(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode()));
1505 EXPECT_CALL(*param, GetBackupDebugOverrideAccount())1508 EXPECT_CALL(*param, GetBackupDebugOverrideAccount())
1506 .WillOnce(Return(make_pair<bool, int32_t>(true, DEBUG_ID + 1)));1509 .WillOnce(Return(make_pair<bool, int32_t>(true, DEBUG_ID + 1)));
1507 auto ret = service->LaunchBackupExtension(bundleName);1510 auto ret = service->LaunchBackupExtension(bundleName);
@@ -1521,7 +1524,7 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupExtension_0200, TestSize.Level1)
1521 EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::START));1524 EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::START));
1522 EXPECT_CALL(*session, GetSessionUserId()).WillOnce(Return(0));1525 EXPECT_CALL(*session, GetSessionUserId()).WillOnce(Return(0));
1523 EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _))1526 EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _))
1524- .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode()));1527+ .WillRepeatedly(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode()));
1525 ret = service->LaunchBackupExtension(bundleName);1528 ret = service->LaunchBackupExtension(bundleName);
1526 EXPECT_EQ(ret, BError(BError::Codes::SA_BOOT_EXT_FAIL));1529 EXPECT_EQ(ret, BError(BError::Codes::SA_BOOT_EXT_FAIL));
1527 } catch (...) {1530 } catch (...) {
@@ -2456,7 +2459,8 @@ HWTEST_F(ServiceTest, SUB_Service_TryToConnectExt_0200, testing::ext::TestSize.L
2456 .WillRepeatedly(Return(make_pair<bool, int32_t>(true, DEBUG_ID + 1)));2459 .WillRepeatedly(Return(make_pair<bool, int32_t>(true, DEBUG_ID + 1)));
2457 EXPECT_CALL(*skeleton, GetCallingUid()).WillRepeatedly(Return(BConstants::XTS_UID));2460 EXPECT_CALL(*skeleton, GetCallingUid()).WillRepeatedly(Return(BConstants::XTS_UID));
2458 EXPECT_CALL(*session, GetScenario()).WillRepeatedly(Return(IServiceReverseType::Scenario::UNDEFINED));2461 EXPECT_CALL(*session, GetScenario()).WillRepeatedly(Return(IServiceReverseType::Scenario::UNDEFINED));
2459- EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode()));2462+ EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _))
2463+ .WillRepeatedly(Return(BError(BError::Codes::OK).GetCode()));
2460 auto res = service->TryToConnectExt(bundleName, connectPtr);2464 auto res = service->TryToConnectExt(bundleName, connectPtr);
2461 EXPECT_EQ(res, BError(BError::Codes::OK).GetCode());2465 EXPECT_EQ(res, BError(BError::Codes::OK).GetCode());
2462 } catch (...) {2466 } catch (...) {
@@ -2492,7 +2496,7 @@ HWTEST_F(ServiceTest, SUB_Service_TryToConnectExt_0300, testing::ext::TestSize.L
2492 EXPECT_CALL(*skeleton, GetCallingUid()).WillRepeatedly(Return(BConstants::XTS_UID));2496 EXPECT_CALL(*skeleton, GetCallingUid()).WillRepeatedly(Return(BConstants::XTS_UID));
2493 EXPECT_CALL(*session, GetScenario()).WillRepeatedly(Return(IServiceReverseType::Scenario::UNDEFINED));2497 EXPECT_CALL(*session, GetScenario()).WillRepeatedly(Return(IServiceReverseType::Scenario::UNDEFINED));
2494 EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _))2498 EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _))
2495- .WillOnce(Return(BError(BError::Codes::SA_BOOT_EXT_FAIL).GetCode()));2499+ .WillRepeatedly(Return(BError(BError::Codes::SA_BOOT_EXT_FAIL).GetCode()));
2496 auto res = service->TryToConnectExt(bundleName, connectPtr);2500 auto res = service->TryToConnectExt(bundleName, connectPtr);
2497 EXPECT_EQ(res, BError(BError::Codes::SA_BOOT_EXT_FAIL).GetCode());2501 EXPECT_EQ(res, BError(BError::Codes::SA_BOOT_EXT_FAIL).GetCode());
2498 } catch (...) {2502 } catch (...) {
@@ -2586,7 +2590,7 @@ HWTEST_F(ServiceTest, SUB_Service_CleanBundleTempDir_0200, testing::ext::TestSiz
2586 EXPECT_CALL(*connect, IsExtAbilityConnected()).WillOnce(Return(true));2590 EXPECT_CALL(*connect, IsExtAbilityConnected()).WillOnce(Return(true));
2587 EXPECT_CALL(*session, GetScenario()).WillRepeatedly(Return(IServiceReverseType::Scenario::UNDEFINED));2591 EXPECT_CALL(*session, GetScenario()).WillRepeatedly(Return(IServiceReverseType::Scenario::UNDEFINED));
2588 EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _))2592 EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _))
2589- .WillOnce(Return(BError(BError::Codes::OK).GetCode()));2593+ .WillRepeatedly(Return(BError(BError::Codes::OK).GetCode()));
2590 EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode()));2594 EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode()));
2591 EXPECT_CALL(*mockEnhanceService, RemoveAncoTempDir(bundleName)).WillOnce(Return());2595 EXPECT_CALL(*mockEnhanceService, RemoveAncoTempDir(bundleName)).WillOnce(Return());
2592 auto res = service->CleanBundleTempDir(bundleName);2596 auto res = service->CleanBundleTempDir(bundleName);
@@ -2622,7 +2626,7 @@ HWTEST_F(ServiceTest, SUB_Service_CleanBundleTempDir_0300, testing::ext::TestSiz
2622 EXPECT_CALL(*connect, IsExtAbilityConnected()).WillOnce(Return(true));2626 EXPECT_CALL(*connect, IsExtAbilityConnected()).WillOnce(Return(true));
2623 EXPECT_CALL(*session, GetScenario()).WillRepeatedly(Return(IServiceReverseType::Scenario::UNDEFINED));2627 EXPECT_CALL(*session, GetScenario()).WillRepeatedly(Return(IServiceReverseType::Scenario::UNDEFINED));
2624 EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _))2628 EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _))
2625- .WillOnce(Return(BError(BError::Codes::OK).GetCode()));2629+ .WillRepeatedly(Return(BError(BError::Codes::OK).GetCode()));
2626 EnhanceServiceManager::GetInstance().service_ = nullptr;2630 EnhanceServiceManager::GetInstance().service_ = nullptr;
2627 auto res = service->CleanBundleTempDir(bundleName);2631 auto res = service->CleanBundleTempDir(bundleName);
2628 EnhanceServiceManager::GetInstance().service_ = mockEnhanceService;2632 EnhanceServiceManager::GetInstance().service_ = mockEnhanceService;
Mtests/unittests/backup_sa/module_ipc/service_throw_test.cpp+22-22
@@ -95,21 +95,21 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_GetLocalCapabilities_0100, testing:
95 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {95 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
96 throw BError(BError::Codes::EXT_THROW_EXCEPTION);96 throw BError(BError::Codes::EXT_THROW_EXCEPTION);
97 }));97 }));
98- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());98+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
99 auto ret = service->GetLocalCapabilities();99 auto ret = service->GetLocalCapabilities();
100 EXPECT_EQ(-ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());100 EXPECT_EQ(-ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());
101 101 
102 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {102 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
103 throw runtime_error("运行时错误");103 throw runtime_error("运行时错误");
104 }));104 }));
105- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());105+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
106 ret = service->GetLocalCapabilities();106 ret = service->GetLocalCapabilities();
107 EXPECT_EQ(-ret, EPERM);107 EXPECT_EQ(-ret, EPERM);
108 108 
109 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {109 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
110 throw "未知错误";110 throw "未知错误";
111 }));111 }));
112- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());112+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
113 ret = service->GetLocalCapabilities();113 ret = service->GetLocalCapabilities();
114 EXPECT_EQ(-ret, EPERM);114 EXPECT_EQ(-ret, EPERM);
115 } catch (...) {115 } catch (...) {
@@ -334,14 +334,14 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_AppendBundlesRestoreSession_0200, t
334 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {334 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
335 throw BError(BError::Codes::EXT_THROW_EXCEPTION);335 throw BError(BError::Codes::EXT_THROW_EXCEPTION);
336 }));336 }));
337- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());337+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
338 auto ret = service->AppendBundlesRestoreSession(UniqueFd(-1), {}, RESTORE_DATA_WAIT_SEND, 0);338 auto ret = service->AppendBundlesRestoreSession(UniqueFd(-1), {}, RESTORE_DATA_WAIT_SEND, 0);
339 EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());339 EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());
340 340 
341 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {341 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
342 throw "未知错误";342 throw "未知错误";
343 }));343 }));
344- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());344+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
345 ret = service->AppendBundlesRestoreSession(UniqueFd(-1), {}, RESTORE_DATA_WAIT_SEND, 0);345 ret = service->AppendBundlesRestoreSession(UniqueFd(-1), {}, RESTORE_DATA_WAIT_SEND, 0);
346 EXPECT_EQ(ret, EPERM);346 EXPECT_EQ(ret, EPERM);
347 } catch (...) {347 } catch (...) {
@@ -368,21 +368,21 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_AppendBundlesBackupSession_0100, te
368 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {368 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
369 throw BError(BError::Codes::EXT_THROW_EXCEPTION);369 throw BError(BError::Codes::EXT_THROW_EXCEPTION);
370 }));370 }));
371- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());371+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
372 auto ret = service->AppendBundlesBackupSession({});372 auto ret = service->AppendBundlesBackupSession({});
373 EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());373 EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());
374 374 
375 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {375 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
376 throw runtime_error("运行时错误");376 throw runtime_error("运行时错误");
377 }));377 }));
378- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());378+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
379 ret = service->AppendBundlesBackupSession({});379 ret = service->AppendBundlesBackupSession({});
380 EXPECT_EQ(ret, EPERM);380 EXPECT_EQ(ret, EPERM);
381 381 
382 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {382 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
383 throw "未知错误";383 throw "未知错误";
384 }));384 }));
385- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());385+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
386 ret = service->AppendBundlesBackupSession({});386 ret = service->AppendBundlesBackupSession({});
387 EXPECT_EQ(ret, EPERM);387 EXPECT_EQ(ret, EPERM);
388 } catch (...) {388 } catch (...) {
@@ -409,21 +409,21 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_AppendBundlesDetailsBackupSession_0
409 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {409 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
410 throw BError(BError::Codes::EXT_THROW_EXCEPTION);410 throw BError(BError::Codes::EXT_THROW_EXCEPTION);
411 }));411 }));
412- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());412+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
413 auto ret = service->AppendBundlesDetailsBackupSession({}, {});413 auto ret = service->AppendBundlesDetailsBackupSession({}, {});
414 EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());414 EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());
415 415 
416 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {416 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
417 throw runtime_error("运行时错误");417 throw runtime_error("运行时错误");
418 }));418 }));
419- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());419+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
420 ret = service->AppendBundlesDetailsBackupSession({}, {});420 ret = service->AppendBundlesDetailsBackupSession({}, {});
421 EXPECT_EQ(ret, EPERM);421 EXPECT_EQ(ret, EPERM);
422 422 
423 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {423 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
424 throw "未知错误";424 throw "未知错误";
425 }));425 }));
426- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());426+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
427 ret = service->AppendBundlesDetailsBackupSession({}, {});427 ret = service->AppendBundlesDetailsBackupSession({}, {});
428 EXPECT_EQ(ret, EPERM);428 EXPECT_EQ(ret, EPERM);
429 } catch (...) {429 } catch (...) {
@@ -792,7 +792,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_UpdateTimer_0100, testing::ext::Tes
792 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {792 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
793 throw "未知错误";793 throw "未知错误";
794 }));794 }));
795- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());795+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
796 auto ret = service->UpdateTimer(bundleName, 0, result);796 auto ret = service->UpdateTimer(bundleName, 0, result);
797 EXPECT_EQ(ret, EPERM);797 EXPECT_EQ(ret, EPERM);
798 } catch (...) {798 } catch (...) {
@@ -866,7 +866,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_GetLocalCapabilitiesIncremental_010
866 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {866 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
867 throw BError(BError::Codes::EXT_THROW_EXCEPTION);867 throw BError(BError::Codes::EXT_THROW_EXCEPTION);
868 }));868 }));
869- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());869+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
870 int fd = -1;870 int fd = -1;
871 ErrCode ret = service->GetLocalCapabilitiesIncremental(bundleNames, fd);871 ErrCode ret = service->GetLocalCapabilitiesIncremental(bundleNames, fd);
872 EXPECT_EQ(fd, BConstants::INVALID_FD_NUM);872 EXPECT_EQ(fd, BConstants::INVALID_FD_NUM);
@@ -874,14 +874,14 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_GetLocalCapabilitiesIncremental_010
874 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {874 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
875 throw runtime_error("运行时错误");875 throw runtime_error("运行时错误");
876 }));876 }));
877- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());877+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
878 ret = service->GetLocalCapabilitiesIncremental(bundleNames, fd);878 ret = service->GetLocalCapabilitiesIncremental(bundleNames, fd);
879 EXPECT_EQ(-fd, EPERM);879 EXPECT_EQ(-fd, EPERM);
880 880 
881 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {881 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
882 throw "未知错误";882 throw "未知错误";
883 }));883 }));
884- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());884+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
885 ret = service->GetLocalCapabilitiesIncremental(bundleNames, fd);885 ret = service->GetLocalCapabilitiesIncremental(bundleNames, fd);
886 EXPECT_EQ(-fd, EPERM);886 EXPECT_EQ(-fd, EPERM);
887 } catch (...) {887 } catch (...) {
@@ -908,21 +908,21 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_GetAppLocalListAndDoIncrementalBack
908 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {908 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
909 throw BError(BError::Codes::EXT_THROW_EXCEPTION);909 throw BError(BError::Codes::EXT_THROW_EXCEPTION);
910 }));910 }));
911- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());911+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
912 auto ret = service->GetAppLocalListAndDoIncrementalBackup();912 auto ret = service->GetAppLocalListAndDoIncrementalBackup();
913 EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());913 EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());
914 914 
915 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {915 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
916 throw runtime_error("运行时错误");916 throw runtime_error("运行时错误");
917 }));917 }));
918- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());918+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
919 ret = service->GetAppLocalListAndDoIncrementalBackup();919 ret = service->GetAppLocalListAndDoIncrementalBackup();
920 EXPECT_EQ(ret, EPERM);920 EXPECT_EQ(ret, EPERM);
921 921 
922 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {922 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
923 throw "未知错误";923 throw "未知错误";
924 }));924 }));
925- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());925+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
926 ret = service->GetAppLocalListAndDoIncrementalBackup();926 ret = service->GetAppLocalListAndDoIncrementalBackup();
927 EXPECT_EQ(ret, EPERM);927 EXPECT_EQ(ret, EPERM);
928 } catch (...) {928 } catch (...) {
@@ -1035,14 +1035,14 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_AppendBundlesIncrementalBackupSessi
1035 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {1035 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
1036 throw BError(BError::Codes::EXT_THROW_EXCEPTION);1036 throw BError(BError::Codes::EXT_THROW_EXCEPTION);
1037 }));1037 }));
1038- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());1038+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
1039 auto ret = service->AppendBundlesIncrementalBackupSession(bundlesToBackup);1039 auto ret = service->AppendBundlesIncrementalBackupSession(bundlesToBackup);
1040 EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());1040 EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());
1041 1041 
1042 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {1042 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
1043 throw "未知错误";1043 throw "未知错误";
1044 }));1044 }));
1045- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());1045+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
1046 ret = service->AppendBundlesIncrementalBackupSession(bundlesToBackup);1046 ret = service->AppendBundlesIncrementalBackupSession(bundlesToBackup);
1047 EXPECT_EQ(ret, EPERM);1047 EXPECT_EQ(ret, EPERM);
1048 } catch (...) {1048 } catch (...) {
@@ -1071,14 +1071,14 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_AppendBundlesIncrementalBackupSessi
1071 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {1071 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
1072 throw BError(BError::Codes::EXT_THROW_EXCEPTION);1072 throw BError(BError::Codes::EXT_THROW_EXCEPTION);
1073 }));1073 }));
1074- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());1074+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
1075 auto ret = service->AppendBundlesIncrementalBackupSessionWithBundleInfos(bundlesToBackup, infos);1075 auto ret = service->AppendBundlesIncrementalBackupSessionWithBundleInfos(bundlesToBackup, infos);
1076 EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());1076 EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode());
1077 1077 
1078 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {1078 EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() {
1079 throw "未知错误";1079 throw "未知错误";
1080 }));1080 }));
1081- EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return());1081+ EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillRepeatedly(Return());
1082 ret = service->AppendBundlesIncrementalBackupSessionWithBundleInfos(bundlesToBackup, infos);1082 ret = service->AppendBundlesIncrementalBackupSessionWithBundleInfos(bundlesToBackup, infos);
1083 EXPECT_EQ(ret, EPERM);1083 EXPECT_EQ(ret, EPERM);
1084 } catch (...) {1084 } catch (...) {
Mtests/unittests/backup_sa/module_ipc/sub_service_ex_test.cpp+4-4
@@ -1534,7 +1534,7 @@ HWTEST_F(ServiceTest, SUB_Service_MigrateFile_0007, testing::ext::TestSize.Level
1534 EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect));1534 EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect));
1535 EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy));1535 EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy));
1536 EXPECT_CALL(*svcProxy, GetIncrementalRpFileHandle(_, _)).WillOnce(Return(ERR_OK));1536 EXPECT_CALL(*svcProxy, GetIncrementalRpFileHandle(_, _)).WillOnce(Return(ERR_OK));
1537- EXPECT_CALL(*srProxy, IncrementalRestoreOnMigrateResult(EIO, _)).WillOnce(Return(ERR_OK));1537+ EXPECT_CALL(*srProxy, IncrementalRestoreOnMigrateResult(_, _)).WillRepeatedly(Return(ERR_OK));
1538 ErrCode ret = service->MigrateFile(path, "bundleName", "fileName");1538 ErrCode ret = service->MigrateFile(path, "bundleName", "fileName");
1539 EXPECT_EQ(ret, ERR_OK);1539 EXPECT_EQ(ret, ERR_OK);
1540 service->session_ = nullptr;1540 service->session_ = nullptr;
@@ -1580,7 +1580,7 @@ HWTEST_F(ServiceTest, SUB_Service_MigrateFile_0008, testing::ext::TestSize.Level
1580 EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect));1580 EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect));
1581 EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy));1581 EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy));
1582 EXPECT_CALL(*svcProxy, GetIncrementalRpFileHandle(_, _)).WillOnce(Return(ERR_OK));1582 EXPECT_CALL(*svcProxy, GetIncrementalRpFileHandle(_, _)).WillOnce(Return(ERR_OK));
1583- EXPECT_CALL(*srProxy, IncrementalRestoreOnMigrateResult(ENOMEM, _)).WillOnce(Return(ERR_OK));1583+ EXPECT_CALL(*srProxy, IncrementalRestoreOnMigrateResult(_, _)).WillRepeatedly(Return(ERR_OK));
1584 ErrCode ret = service->MigrateFile(path, "bundleName", "fileName");1584 ErrCode ret = service->MigrateFile(path, "bundleName", "fileName");
1585 EXPECT_EQ(ret, ERR_OK);1585 EXPECT_EQ(ret, ERR_OK);
1586 service->session_ = nullptr;1586 service->session_ = nullptr;
@@ -1626,7 +1626,7 @@ HWTEST_F(ServiceTest, SUB_Service_MigrateFile_0009, testing::ext::TestSize.Level
1626 EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect));1626 EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect));
1627 EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy));1627 EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy));
1628 EXPECT_CALL(*svcProxy, GetIncrementalRpFileHandle(_, _)).WillOnce(Return(ERR_OK));1628 EXPECT_CALL(*svcProxy, GetIncrementalRpFileHandle(_, _)).WillOnce(Return(ERR_OK));
1629- EXPECT_CALL(*srProxy, IncrementalRestoreOnMigrateResult(ENOSPC, _)).WillOnce(Return(ERR_OK));1629+ EXPECT_CALL(*srProxy, IncrementalRestoreOnMigrateResult(_, _)).WillRepeatedly(Return(ERR_OK));
1630 ErrCode ret = service->MigrateFile(path, "bundleName", "fileName");1630 ErrCode ret = service->MigrateFile(path, "bundleName", "fileName");
1631 EXPECT_EQ(ret, ERR_OK);1631 EXPECT_EQ(ret, ERR_OK);
1632 service->session_ = nullptr;1632 service->session_ = nullptr;
@@ -1760,7 +1760,7 @@ HWTEST_F(ServiceTest, SUB_Service_MigrateFile_0012, testing::ext::TestSize.Level
1760 EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect));1760 EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect));
1761 EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy));1761 EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy));
1762 EXPECT_CALL(*svcProxy, GetIncrementalRpFileHandle(_, _)).WillOnce(Return(ERR_OK));1762 EXPECT_CALL(*svcProxy, GetIncrementalRpFileHandle(_, _)).WillOnce(Return(ERR_OK));
1763- EXPECT_CALL(*srProxy, IncrementalRestoreOnMigrateResult(EPERM, _)).WillOnce(Return(ERR_OK));1763+ EXPECT_CALL(*srProxy, IncrementalRestoreOnMigrateResult(_, _)).WillRepeatedly(Return(ERR_OK));
1764 ErrCode ret = service->MigrateFile(path, "bundleName", "fileName");1764 ErrCode ret = service->MigrateFile(path, "bundleName", "fileName");
1765 EXPECT_EQ(ret, ERR_OK);1765 EXPECT_EQ(ret, ERR_OK);
1766 service->session_ = nullptr;1766 service->session_ = nullptr;
Mtests/unittests/backup_sa/module_ipc/sub_service_test.cpp+1-2
@@ -2023,8 +2023,7 @@ HWTEST_F(ServiceTest, SUB_Service_GetPresumablySize_0000, TestSize.Level1)
2023 EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false));2023 EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false));
2024 EXPECT_CALL(*bms, GetBundleDataSize(_, _)).WillOnce(Return(1));2024 EXPECT_CALL(*bms, GetBundleDataSize(_, _)).WillOnce(Return(1));
2025 EXPECT_CALL(*param, GetBackupDebugOverrideAccount())2025 EXPECT_CALL(*param, GetBackupDebugOverrideAccount())
2026- .WillOnce(Return(make_pair<bool, int32_t>(true, DEBUG_ID + 1)))2026+ .WillRepeatedly(Return(make_pair<bool, int32_t>(true, DEBUG_ID + 1)));
2027- .WillOnce(Return(make_pair<bool, int32_t>(true, DEBUG_ID + 1)));
2028 service->GetPresumablySize(bundleNameList, scanning);2027 service->GetPresumablySize(bundleNameList, scanning);
2029 EXPECT_EQ(service->bundleDataSizeList_.size(), 1);2028 EXPECT_EQ(service->bundleDataSizeList_.size(), 1);
2030 service->bundleDataSizeList_.clear();2029 service->bundleDataSizeList_.clear();
Mtests/unittests/backup_utils/b_filesystem/b_dir_sub_test.cpp+4-3
@@ -135,13 +135,14 @@ HWTEST_F(BDirSubTest, B_DIR_ProcessFile_003, testing::ext::TestSize.Level1)
135{135{
136 GTEST_LOG_(INFO) << "BDirSubTest-begin B_DIR_ProcessFile_003";136 GTEST_LOG_(INFO) << "BDirSubTest-begin B_DIR_ProcessFile_003";
137 GTEST_LOG_(INFO) << "3. test add big file";137 GTEST_LOG_(INFO) << "3. test add big file";
138- struct stat sta = {.st_size = 15};138+ struct stat sta = {};
139+ sta.st_size = 15;
139 EXPECT_CALL(*funcMock_, stat(_, _)).WillOnce(Invoke([sta](const char *pathname, struct stat *statbuf) {140 EXPECT_CALL(*funcMock_, stat(_, _)).WillOnce(Invoke([sta](const char *pathname, struct stat *statbuf) {
140 *statbuf = sta;141 *statbuf = sta;
141 GTEST_LOG_(INFO) << "sta.size =" << statbuf->st_size;142 GTEST_LOG_(INFO) << "sta.size =" << statbuf->st_size;
142 return 0;143 return 0;
143 }));144 }));
144- std::string backupPath = "test3";145+ std::string backupPath = "abc/aaa/test3";
145 std::string restorePath = "restore3";146 std::string restorePath = "restore3";
146 int64_t smallFileSize = 0;147 int64_t smallFileSize = 0;
147 int64_t bigFileSize = 0;148 int64_t bigFileSize = 0;
@@ -196,7 +197,7 @@ HWTEST_F(BDirSubTest, B_DIR_ProcessSingleFile_001, testing::ext::TestSize.Level1
196{197{
197 GTEST_LOG_(INFO) << "BDirSubTest-begin B_DIR_ProcessSingleFile_001";198 GTEST_LOG_(INFO) << "BDirSubTest-begin B_DIR_ProcessSingleFile_001";
198 EXPECT_CALL(*funcMock_, stat(_, _)).WillOnce(Return(-1));199 EXPECT_CALL(*funcMock_, stat(_, _)).WillOnce(Return(-1));
199- std::string backupPath = "test1";200+ std::string backupPath = "abc/aaa/test1";
200 std::string restorePath = "restore1";201 std::string restorePath = "restore1";
201 off_t sizeBoundary = 10;202 off_t sizeBoundary = 10;
202 auto [ret1, bigSize1, smallSize1] = ProcessSingleFile({}, backupPath, restorePath, sizeBoundary);203 auto [ret1, bigSize1, smallSize1] = ProcessSingleFile({}, backupPath, restorePath, sizeBoundary);
Mtests/unittests/backup_utils/b_filesystem/b_dir_test.cpp+2-1
@@ -190,8 +190,9 @@ HWTEST_F(BDirTest, b_dir_ExpandPathWildcard_0100, testing::ext::TestSize.Level1)
190 190 
191 std::vector<std::string> include = { dirCurrentUser };191 std::vector<std::string> include = { dirCurrentUser };
192 std::set<std::string> res = BDir::ExpandPathWildcard(include, true);192 std::set<std::string> res = BDir::ExpandPathWildcard(include, true);
193- EXPECT_EQ(res.size(), 2); // 2: valid path number
194 EXPECT_EQ(res.count(dirCurrentUser), 0);193 EXPECT_EQ(res.count(dirCurrentUser), 0);
194+ EXPECT_TRUE(res.count(dirCurrentUser + "haps/") > 0);
195+ EXPECT_TRUE(res.count(dirCurrentUser + "2.txt") > 0);
195 196 
196 std::string testDir = dirCurrentUser + "appdata";197 std::string testDir = dirCurrentUser + "appdata";
197 include = { testDir };198 include = { testDir };
Mtests/unittests/backup_utils/b_utils/scan_file_singleton_test.cpp+10-9
@@ -180,9 +180,10 @@ HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_001, testing::ext::TestSize.Le
180{180{
181 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: ADD_BIG_FILE_TEST_001";181 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: ADD_BIG_FILE_TEST_001";
182 GTEST_LOG_(INFO) << "1. test restorePath empty";182 GTEST_LOG_(INFO) << "1. test restorePath empty";
183- std::string filePath = "test1";183+ std::string filePath = "abc/aaa/test1";
184+ std::string restorePath = "";
184 struct stat sta = {};185 struct stat sta = {};
185- manager_.AddBigFile(filePath, sta);186+ manager_.AddBigFile(filePath, sta, restorePath);
186 auto fileInfo = manager_.GetFileInfo();187 auto fileInfo = manager_.GetFileInfo();
187 ASSERT_NE(fileInfo, nullptr);188 ASSERT_NE(fileInfo, nullptr);
188 EXPECT_EQ(fileInfo->GetRestorePath(), "");189 EXPECT_EQ(fileInfo->GetRestorePath(), "");
@@ -201,7 +202,7 @@ HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_002, testing::ext::TestSize.Le
201{202{
202 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: ADD_BIG_FILE_TEST_002";203 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: ADD_BIG_FILE_TEST_002";
203 GTEST_LOG_(INFO) << "2. test restorePath not empty";204 GTEST_LOG_(INFO) << "2. test restorePath not empty";
204- std::string filePath = "test2";205+ std::string filePath = "abc/aaa/test2";
205 std::string restorePath = "restore2";206 std::string restorePath = "restore2";
206 struct stat sta = {};207 struct stat sta = {};
207 manager_.AddBigFile(filePath, sta, restorePath);208 manager_.AddBigFile(filePath, sta, restorePath);
@@ -222,7 +223,7 @@ HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_002, testing::ext::TestSize.Le
222HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_003, testing::ext::TestSize.Level1)223HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_003, testing::ext::TestSize.Level1)
223{224{
224 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: ADD_BIG_FILE_TEST_003";225 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: ADD_BIG_FILE_TEST_003";
225- std::string filePath = "test3.txt";226+ std::string filePath = "abc/aaa/test3.txt";
226 std::string restorePath = "";227 std::string restorePath = "";
227 struct stat sta = {};228 struct stat sta = {};
228 manager_.AddBigFile(filePath, sta, restorePath);229 manager_.AddBigFile(filePath, sta, restorePath);
@@ -243,7 +244,7 @@ HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_003, testing::ext::TestSize.Le
243HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_004, testing::ext::TestSize.Level1)244HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_004, testing::ext::TestSize.Level1)
244{245{
245 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: ADD_BIG_FILE_TEST_004";246 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: ADD_BIG_FILE_TEST_004";
246- std::string filePath = "test4.txt";247+ std::string filePath = "abc/aaa/test4.txt";
247 std::string restorePath = "restore4";248 std::string restorePath = "restore4";
248 struct stat sta = {};249 struct stat sta = {};
249 manager_.AddBigFile(filePath, sta, restorePath);250 manager_.AddBigFile(filePath, sta, restorePath);
@@ -264,7 +265,7 @@ HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_004, testing::ext::TestSize.Le
264HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_005, testing::ext::TestSize.Level1)265HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_005, testing::ext::TestSize.Level1)
265{266{
266 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: ADD_BIG_FILE_TEST_005";267 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: ADD_BIG_FILE_TEST_005";
267- std::string filePath = "test5.txt_anco_aaa";268+ std::string filePath = "abc/aaa/test5.txt_anco_aaa";
268 std::string restorePath = "";269 std::string restorePath = "";
269 struct stat sta = {};270 struct stat sta = {};
270 manager_.AddBigFile(filePath, sta, restorePath);271 manager_.AddBigFile(filePath, sta, restorePath);
@@ -285,7 +286,7 @@ HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_005, testing::ext::TestSize.Le
285HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_006, testing::ext::TestSize.Level1)286HWTEST_F(ScanResultManagerTest, ADD_BIG_FILE_TEST_006, testing::ext::TestSize.Level1)
286{287{
287 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: ADD_BIG_FILE_TEST_006";288 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: ADD_BIG_FILE_TEST_006";
288- std::string filePath = "test5.txt_anco_sss";289+ std::string filePath = "abc/aaa/test6.txt_anco_sss";
289 std::string restorePath = "restore6";290 std::string restorePath = "restore6";
290 struct stat sta = {};291 struct stat sta = {};
291 manager_.AddBigFile(filePath, sta, restorePath);292 manager_.AddBigFile(filePath, sta, restorePath);
@@ -468,7 +469,7 @@ HWTEST_F(ScanResultManagerTest, WAIT_FOR_FILES_TEST_001, testing::ext::TestSize.
468{469{
469 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: WAIT_FOR_FILES_TEST_001";470 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: WAIT_FOR_FILES_TEST_001";
470 GTEST_LOG_(INFO) << "1. test wait for files";471 GTEST_LOG_(INFO) << "1. test wait for files";
471- std::string filePath = "test1";472+ std::string filePath = "abc/aaa/test1";
472 struct stat sta = {};473 struct stat sta = {};
473 manager_.AddBigFile(filePath, sta);474 manager_.AddBigFile(filePath, sta);
474 EXPECT_EQ(manager_.pendingFileQueue_.size(), 1);475 EXPECT_EQ(manager_.pendingFileQueue_.size(), 1);
@@ -493,7 +494,7 @@ HWTEST_F(ScanResultManagerTest, WAIT_FOR_PACKET_FLAG_TEST_001, testing::ext::Tes
493{494{
494 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: WAIT_FOR_PACKET_FLAG_TEST_001";495 GTEST_LOG_(INFO) << "ScanResultManagerTest-begin: WAIT_FOR_PACKET_FLAG_TEST_001";
495 GTEST_LOG_(INFO) << "1. test wait for packet";496 GTEST_LOG_(INFO) << "1. test wait for packet";
496- std::string filePath = "test1";497+ std::string filePath = "abc/aaa/test1";
497 struct stat sta = {};498 struct stat sta = {};
498 manager_.AddBigFile(filePath, sta);499 manager_.AddBigFile(filePath, sta);
499 EXPECT_EQ(manager_.pendingFileQueue_.size(), 1);500 EXPECT_EQ(manager_.pendingFileQueue_.size(), 1);