From 9b4aa0014723c148ee69d5e326e11d142068b06c Mon Sep 17 00:00:00 2001 From: tianp Date: Fri, 29 Aug 2025 16:35:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=906.0=E3=80=91Fix=20ActsStorageFileI?= =?UTF-8?q?oV9JSTest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tianp --- services/cloudsyncservice/src/ipc/cloud_sync_service.cpp | 4 ++-- test/unittests/ani_core/cloud_file_cache_core_test.cpp | 4 ++-- test/unittests/cloudsync_sa/ipc/cloud_sync_service_test.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/cloudsyncservice/src/ipc/cloud_sync_service.cpp b/services/cloudsyncservice/src/ipc/cloud_sync_service.cpp index 345cb3ea4..46097dada 100644 --- a/services/cloudsyncservice/src/ipc/cloud_sync_service.cpp +++ b/services/cloudsyncservice/src/ipc/cloud_sync_service.cpp @@ -816,7 +816,7 @@ int32_t CloudSyncService::StartFileCache(const std::vector &uriVec, for (auto &uri : uriVec) { if (!DfsuAccessTokenHelper::CheckUriPermission(uri)) { LOGE("permission denied"); - return E_PERMISSION_DENIED; + return E_ILLEGAL_URI; } } } @@ -831,7 +831,7 @@ int32_t CloudSyncService::StartFileCache(const std::vector &uriVec, if (downloadCb == nullptr) { LOGE("Invalid downloadCallback, not a valid ICloudDownloadCallback."); // Common error code for single and batch download task. - return E_BROKEN_IPC; + return E_SERVICE_INNER_ERROR; } ret = dataSyncManager_->StartDownloadFile(bundleNameUserInfo, uriVec, downloadId, fieldkey, downloadCb, timeout); LOGI("End StartFileCache, ret: %{public}d", ret); diff --git a/test/unittests/ani_core/cloud_file_cache_core_test.cpp b/test/unittests/ani_core/cloud_file_cache_core_test.cpp index f52af33df..4d76c1a6b 100644 --- a/test/unittests/ani_core/cloud_file_cache_core_test.cpp +++ b/test/unittests/ani_core/cloud_file_cache_core_test.cpp @@ -117,7 +117,7 @@ HWTEST_F(CloudFileCacheCoreTest, DoStartTest1, TestSize.Level1) EXPECT_FALSE(ret.IsSuccess()); const auto &err = ret.GetError(); int errorCode = err.GetErrNo(); - EXPECT_EQ(errorCode, OHOS::FileManagement::E_PERMISSION); + EXPECT_EQ(errorCode, OHOS::FileManagement::E_INVALID_URI); } /** @@ -134,7 +134,7 @@ HWTEST_F(CloudFileCacheCoreTest, DoStartTest2, TestSize.Level1) EXPECT_FALSE(ret.IsSuccess()); const auto &err = ret.GetError(); int errorCode = err.GetErrNo(); - EXPECT_EQ(errorCode, OHOS::FileManagement::E_PERMISSION); + EXPECT_EQ(errorCode, OHOS::FileManagement::E_INVALID_URI); } /** diff --git a/test/unittests/cloudsync_sa/ipc/cloud_sync_service_test.cpp b/test/unittests/cloudsync_sa/ipc/cloud_sync_service_test.cpp index 32a1dc64b..cb42c00de 100644 --- a/test/unittests/cloudsync_sa/ipc/cloud_sync_service_test.cpp +++ b/test/unittests/cloudsync_sa/ipc/cloud_sync_service_test.cpp @@ -1395,7 +1395,7 @@ HWTEST_F(CloudSyncServiceTest, StartFileCacheTest001, TestSize.Level1) EXPECT_CALL(*dfsuAccessToken_, GetUserId()).WillOnce(Return(0)); EXPECT_CALL(*dfsuAccessToken_, GetPid()).WillOnce(Return(101)); auto ret = servicePtr_->StartFileCache({uri}, downloadId, fieldkey, callback, timeout); - EXPECT_EQ(ret, E_BROKEN_IPC); + EXPECT_EQ(ret, E_SERVICE_INNER_ERROR); } catch (...) { EXPECT_FALSE(true); GTEST_LOG_(INFO) << "StartFileCacheTest001 failed"; -- Gitee From 7c3b065bea4aa9ff60105bd1310cd8f04904a8d8 Mon Sep 17 00:00:00 2001 From: guomeicen Date: Fri, 29 Aug 2025 10:09:51 +0000 Subject: [PATCH 2/3] update services/cloudsyncservice/src/ipc/cloud_sync_service.cpp. Signed-off-by: guomeicen --- services/cloudsyncservice/src/ipc/cloud_sync_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/cloudsyncservice/src/ipc/cloud_sync_service.cpp b/services/cloudsyncservice/src/ipc/cloud_sync_service.cpp index 46097dada..8920d67ec 100644 --- a/services/cloudsyncservice/src/ipc/cloud_sync_service.cpp +++ b/services/cloudsyncservice/src/ipc/cloud_sync_service.cpp @@ -831,7 +831,7 @@ int32_t CloudSyncService::StartFileCache(const std::vector &uriVec, if (downloadCb == nullptr) { LOGE("Invalid downloadCallback, not a valid ICloudDownloadCallback."); // Common error code for single and batch download task. - return E_SERVICE_INNER_ERROR; + return E_BROKEN_IPC; } ret = dataSyncManager_->StartDownloadFile(bundleNameUserInfo, uriVec, downloadId, fieldkey, downloadCb, timeout); LOGI("End StartFileCache, ret: %{public}d", ret); -- Gitee From 99601c353d43b8ade5635c50bf63704d9ce025cf Mon Sep 17 00:00:00 2001 From: guomeicen Date: Fri, 29 Aug 2025 10:10:33 +0000 Subject: [PATCH 3/3] update test/unittests/cloudsync_sa/ipc/cloud_sync_service_test.cpp. Signed-off-by: guomeicen --- test/unittests/cloudsync_sa/ipc/cloud_sync_service_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittests/cloudsync_sa/ipc/cloud_sync_service_test.cpp b/test/unittests/cloudsync_sa/ipc/cloud_sync_service_test.cpp index cb42c00de..32a1dc64b 100644 --- a/test/unittests/cloudsync_sa/ipc/cloud_sync_service_test.cpp +++ b/test/unittests/cloudsync_sa/ipc/cloud_sync_service_test.cpp @@ -1395,7 +1395,7 @@ HWTEST_F(CloudSyncServiceTest, StartFileCacheTest001, TestSize.Level1) EXPECT_CALL(*dfsuAccessToken_, GetUserId()).WillOnce(Return(0)); EXPECT_CALL(*dfsuAccessToken_, GetPid()).WillOnce(Return(101)); auto ret = servicePtr_->StartFileCache({uri}, downloadId, fieldkey, callback, timeout); - EXPECT_EQ(ret, E_SERVICE_INNER_ERROR); + EXPECT_EQ(ret, E_BROKEN_IPC); } catch (...) { EXPECT_FALSE(true); GTEST_LOG_(INFO) << "StartFileCacheTest001 failed"; -- Gitee