From fd0a8df7b5fb3d48638a43b30924e5293bfa3aa4 Mon Sep 17 00:00:00 2001 From: lvchao_2580 Date: Fri, 11 Jul 2025 18:19:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E7=94=A8=E4=BE=8B=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lvchao_2580 --- .../service/test/object_asset_machine_test.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/distributeddataservice/service/test/object_asset_machine_test.cpp b/services/distributeddataservice/service/test/object_asset_machine_test.cpp index b772f2450..f129ac937 100644 --- a/services/distributeddataservice/service/test/object_asset_machine_test.cpp +++ b/services/distributeddataservice/service/test/object_asset_machine_test.cpp @@ -257,13 +257,16 @@ HWTEST_F(ObjectAssetMachineTest, StatusUpload002, TestSize.Level0) ChangedAssetInfo changedAssetInfo(asset, bindInfo, storeInfo); std::pair changedAsset{ "device_" + timestamp, asset }; + std::count << "machine->DFAPostEvent(UPLOAD, changedAssetInfo, asset) start" << std::endl; machine->DFAPostEvent(UPLOAD, changedAssetInfo, asset); ASSERT_EQ(changedAssetInfo.status, STATUS_UPLOADING); + std::count << "machine->DFAPostEvent(REMOTE_CHANGED, changedAssetInfo, asset, changedAsset) start" << std::endl; machine->DFAPostEvent(REMOTE_CHANGED, changedAssetInfo, asset, changedAsset); ASSERT_EQ(changedAssetInfo.status, STATUS_WAIT_TRANSFER); ASSERT_EQ(changedAssetInfo.asset.hash, asset.hash); + std::count << "machine->DFAPostEvent(UPLOAD_FINISHED, changedAssetInfo, asset) start" << std::endl; machine->DFAPostEvent(UPLOAD_FINISHED, changedAssetInfo, asset); ASSERT_EQ(changedAssetInfo.status, STATUS_TRANSFERRING); } -- Gitee From 4846b22b7e1645b6c9f3eabdd8bbb095f7a3c03f Mon Sep 17 00:00:00 2001 From: lvchao_2580 Date: Fri, 18 Jul 2025 15:25:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E7=94=A8=E4=BE=8B=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lvchao_2580 --- .../test/object_asset_machine_test.cpp | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/services/distributeddataservice/service/test/object_asset_machine_test.cpp b/services/distributeddataservice/service/test/object_asset_machine_test.cpp index f129ac937..4d4ad442d 100644 --- a/services/distributeddataservice/service/test/object_asset_machine_test.cpp +++ b/services/distributeddataservice/service/test/object_asset_machine_test.cpp @@ -32,6 +32,7 @@ class ObjectAssetMachineTest : public testing::Test { public: void SetUp(); void TearDown(); + static void SetUpTestCase(void); protected: AssetBindInfo AssetBindInfo_; @@ -39,11 +40,17 @@ protected: std::string uri_; std::string bundleName_ = "test_bundleName"; std::map changedAssets_; - std::string sessionId = "123"; + std::string sessionId_ = "123"; StoreInfo storeInfo_; - std::shared_ptr machine; + std::shared_ptr machine_; }; +void ObjectAssetMachineTest::SetUpTestCase(void) +{ + auto executors = std::make_shared(2, 1); + ObjectAssetLoader::GetInstance()->SetThreadPool(executors); +} + void ObjectAssetMachineTest::SetUp() { uri_ = "file:://com.huawei.hmos.notepad/data/storage/el2/distributedfiles/dir/asset1.jpg"; @@ -76,10 +83,8 @@ void ObjectAssetMachineTest::SetUp() ChangedAssetInfo changedAssetInfo(asset, AssetBindInfo, storeInfo); changedAssets_[uri_] = changedAssetInfo; changedAssets_[uri_].status = STATUS_STABLE; - if (machine == nullptr) { - machine = std::make_shared(); - auto executors = std::make_shared(2, 1); - ObjectAssetLoader::GetInstance()->SetThreadPool(executors); + if (machine_ == nullptr) { + machine_ = std::make_shared(); } } @@ -103,7 +108,7 @@ HWTEST_F(ObjectAssetMachineTest, StatusTransfer001, TestSize.Level0) }; std::pair changedAsset{ "device_2", asset }; changedAssets_[uri_].status = STATUS_TRANSFERRING; - machine->DFAPostEvent(REMOTE_CHANGED, changedAssets_[uri_], asset, changedAsset); + machine_->DFAPostEvent(REMOTE_CHANGED, changedAssets_[uri_], asset, changedAsset); ASSERT_EQ(changedAssets_[uri_].status, STATUS_WAIT_TRANSFER); ASSERT_EQ(changedAssets_[uri_].deviceId, changedAsset.first); ASSERT_EQ(changedAssets_[uri_].asset.hash, asset.hash); @@ -127,7 +132,7 @@ HWTEST_F(ObjectAssetMachineTest, StatusTransfer002, TestSize.Level0) }; std::pair changedAsset{ "device_2", asset }; changedAssets_[uri_].status = STATUS_TRANSFERRING; - machine->DFAPostEvent(TRANSFER_FINISHED, changedAssets_[uri_], asset, changedAsset); + machine_->DFAPostEvent(TRANSFER_FINISHED, changedAssets_[uri_], asset, changedAsset); ASSERT_EQ(changedAssets_[uri_].status, STATUS_STABLE); } @@ -149,7 +154,7 @@ HWTEST_F(ObjectAssetMachineTest, StatusTransfer003, TestSize.Level0) }; std::pair changedAsset{ "device_2", asset }; changedAssets_[uri_].status = STATUS_UPLOADING; - machine->DFAPostEvent(REMOTE_CHANGED, changedAssets_[uri_], asset, changedAsset); + machine_->DFAPostEvent(REMOTE_CHANGED, changedAssets_[uri_], asset, changedAsset); ASSERT_EQ(changedAssets_[uri_].status, STATUS_WAIT_TRANSFER); ASSERT_EQ(changedAssets_[uri_].deviceId, changedAsset.first); ASSERT_EQ(changedAssets_[uri_].asset.hash, asset.hash); @@ -171,7 +176,7 @@ HWTEST_F(ObjectAssetMachineTest, DFAPostEvent001, TestSize.Level0) }; std::pair changedAsset{ "device_2", asset }; changedAssets_[uri_].status = STATUS_UPLOADING; - auto ret = machine->DFAPostEvent(EVENT_BUTT, changedAssets_[uri_], asset, changedAsset); + auto ret = machine_->DFAPostEvent(EVENT_BUTT, changedAssets_[uri_], asset, changedAsset); ASSERT_EQ(ret, GeneralError::E_ERROR); } @@ -191,7 +196,7 @@ HWTEST_F(ObjectAssetMachineTest, DFAPostEvent002, TestSize.Level0) }; std::pair changedAsset{ "device_2", asset }; changedAssets_[uri_].status = DistributedData::STATUS_NO_CHANGE; - auto ret = machine->DFAPostEvent(UPLOAD, changedAssets_[uri_], asset, changedAsset); + auto ret = machine_->DFAPostEvent(UPLOAD, changedAssets_[uri_], asset, changedAsset); ASSERT_EQ(ret, GeneralError::E_ERROR); } @@ -212,13 +217,13 @@ HWTEST_F(ObjectAssetMachineTest, StatusUpload001, TestSize.Level0) .hash = "modifyTime1_size1", }; std::pair changedAsset{ "device_1", asset }; - machine->DFAPostEvent(UPLOAD, changedAssets_[uri_], asset, changedAsset); + machine_->DFAPostEvent(UPLOAD, changedAssets_[uri_], asset, changedAsset); ASSERT_EQ(changedAssets_[uri_].status, STATUS_UPLOADING); - machine->DFAPostEvent(UPLOAD_FINISHED, changedAssets_[uri_], asset); + machine_->DFAPostEvent(UPLOAD_FINISHED, changedAssets_[uri_], asset); ASSERT_EQ(changedAssets_[uri_].status, STATUS_STABLE); // dotransfer - machine->DFAPostEvent(REMOTE_CHANGED, changedAssets_[uri_], asset, changedAsset); + machine_->DFAPostEvent(REMOTE_CHANGED, changedAssets_[uri_], asset, changedAsset); ASSERT_EQ(changedAssets_[uri_].status, STATUS_TRANSFERRING); } @@ -257,17 +262,14 @@ HWTEST_F(ObjectAssetMachineTest, StatusUpload002, TestSize.Level0) ChangedAssetInfo changedAssetInfo(asset, bindInfo, storeInfo); std::pair changedAsset{ "device_" + timestamp, asset }; - std::count << "machine->DFAPostEvent(UPLOAD, changedAssetInfo, asset) start" << std::endl; - machine->DFAPostEvent(UPLOAD, changedAssetInfo, asset); + machine_->DFAPostEvent(UPLOAD, changedAssetInfo, asset); ASSERT_EQ(changedAssetInfo.status, STATUS_UPLOADING); - std::count << "machine->DFAPostEvent(REMOTE_CHANGED, changedAssetInfo, asset, changedAsset) start" << std::endl; - machine->DFAPostEvent(REMOTE_CHANGED, changedAssetInfo, asset, changedAsset); + machine_->DFAPostEvent(REMOTE_CHANGED, changedAssetInfo, asset, changedAsset); ASSERT_EQ(changedAssetInfo.status, STATUS_WAIT_TRANSFER); ASSERT_EQ(changedAssetInfo.asset.hash, asset.hash); - std::count << "machine->DFAPostEvent(UPLOAD_FINISHED, changedAssetInfo, asset) start" << std::endl; - machine->DFAPostEvent(UPLOAD_FINISHED, changedAssetInfo, asset); + machine_->DFAPostEvent(UPLOAD_FINISHED, changedAssetInfo, asset); ASSERT_EQ(changedAssetInfo.status, STATUS_TRANSFERRING); } @@ -304,10 +306,10 @@ HWTEST_F(ObjectAssetMachineTest, StatusDownload001, TestSize.Level0) ChangedAssetInfo changedAssetInfo(asset, AssetBindInfo, storeInfo); std::pair changedAsset{ "device_006", asset }; - machine->DFAPostEvent(DOWNLOAD, changedAssetInfo, asset, changedAsset); + machine_->DFAPostEvent(DOWNLOAD, changedAssetInfo, asset, changedAsset); ASSERT_EQ(changedAssetInfo.status, STATUS_DOWNLOADING); - machine->DFAPostEvent(DOWNLOAD_FINISHED, changedAssetInfo, asset); + machine_->DFAPostEvent(DOWNLOAD_FINISHED, changedAssetInfo, asset); ASSERT_EQ(changedAssetInfo.status, STATUS_STABLE); } } // namespace OHOS::Test \ No newline at end of file -- Gitee