From fb2887febcca5b19760fa30ed30485fca46f8155 Mon Sep 17 00:00:00 2001 From: BrainL Date: Sun, 2 Feb 2025 20:43:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=96=87=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86IDL=E5=8C=96=E5=85=B3=E8=81=94=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL Change-Id: I36f1b77010306a222e1357337f1d0b7284d39103 --- .../uri_permission_manager_stub_impl.h | 2 +- .../include/mock_storage_manager_service.h | 65 ++++++++++--------- .../uri_permission_test.cpp | 4 +- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/services/uripermmgr/include/uri_permission_manager_stub_impl.h b/services/uripermmgr/include/uri_permission_manager_stub_impl.h index e9f97804a7..3cfb856afc 100644 --- a/services/uripermmgr/include/uri_permission_manager_stub_impl.h +++ b/services/uripermmgr/include/uri_permission_manager_stub_impl.h @@ -22,7 +22,7 @@ #include #include "app_mgr_interface.h" #include "batch_uri.h" -#include "istorage_manager.h" +#include "out/rk3568/gen/foundation/filemanagement/storage_service/services/storage_manager/istorage_manager.h" #include "tokenid_permission.h" #include "uri.h" #include "uri_permission_manager_stub.h" diff --git a/test/unittest/uri_permission_impl_test/mock/include/mock_storage_manager_service.h b/test/unittest/uri_permission_impl_test/mock/include/mock_storage_manager_service.h index 5e5a19a100..adbda453f8 100755 --- a/test/unittest/uri_permission_impl_test/mock/include/mock_storage_manager_service.h +++ b/test/unittest/uri_permission_impl_test/mock/include/mock_storage_manager_service.h @@ -17,7 +17,7 @@ #include "gmock/gmock.h" #include "iremote_stub.h" -#include "istorage_manager.h" +#include "out/rk3568/gen/foundation/filemanagement/storage_service/services/storage_manager/istorage_manager.h" namespace OHOS { namespace StorageManager { @@ -72,17 +72,17 @@ public: return E_OK; } - virtual int32_t GetFreeSizeOfVolume(std::string volumeUuid, int64_t &freeSize) override + virtual int32_t GetFreeSizeOfVolume(const std::string &volumeUuid, int64_t &freeSize) override { return E_OK; } - virtual int32_t GetTotalSizeOfVolume(std::string volumeUuid, int64_t &totalSize) override + virtual int32_t GetTotalSizeOfVolume(const std::string &volumeUuid, int64_t &totalSize) override { return E_OK; } - virtual int32_t GetBundleStats(std::string pkgName, BundleStats &bundleStats, + virtual int32_t GetBundleStats(const std::string &pkgName, BundleStats &bundleStats, int32_t index, uint32_t statFlag) override { return E_OK; @@ -108,7 +108,7 @@ public: return E_OK; } - virtual int32_t GetUserStorageStats(int32_t userId, StorageStats &storageStats) override + virtual int32_t GetUserStorageStatsIpc(int32_t userId, StorageStats &storageStats) override { return E_OK; } @@ -118,28 +118,28 @@ public: return E_OK; } - virtual int32_t NotifyVolumeCreated(VolumeCore vc) override + virtual int32_t NotifyVolumeCreated(const VolumeCore &vc) override { return E_OK; } - virtual int32_t NotifyVolumeMounted(std::string volumeId, int fsType, std::string fsUuid, - std::string path, std::string description) override + virtual int32_t NotifyVolumeMounted(const std::string &volumeId, int fsType, const std::string &fsUuid, + const std::string &path, const std::string &description) override { return E_OK; } - virtual int32_t NotifyVolumeStateChanged(std::string volumeId, VolumeState state) override + virtual int32_t NotifyVolumeStateChanged(const std::string &volumeId, uint32_t state) override { return E_OK; } - virtual int32_t Mount(std::string volumeId) override + virtual int32_t Mount(const std::string &volumeId) override { return E_OK; } - virtual int32_t Unmount(std::string volumeId) override + virtual int32_t Unmount(const std::string &volumeId) override { return E_OK; } @@ -149,17 +149,17 @@ public: return E_OK; } - virtual int32_t NotifyDiskCreated(Disk disk) override + virtual int32_t NotifyDiskCreated(const Disk &disk) override { return E_OK; } - virtual int32_t NotifyDiskDestroyed(std::string diskId) override + virtual int32_t NotifyDiskDestroyed(const std::string &diskId) override { return E_OK; } - virtual int32_t Partition(std::string diskId, int32_t type) override + virtual int32_t Partition(const std::string &diskId, int32_t type) override { return E_OK; } @@ -169,27 +169,27 @@ public: return E_OK; } - virtual int32_t GetVolumeByUuid(std::string fsUuid, VolumeExternal &vc) override + virtual int32_t GetVolumeByUuid(const std::string &fsUuid, VolumeExternal &vc) override { return E_OK; } - virtual int32_t GetVolumeById(std::string volumeId, VolumeExternal &vc) override + virtual int32_t GetVolumeById(const std::string &volumeId, VolumeExternal &vc) override { return E_OK; } - virtual int32_t SetVolumeDescription(std::string fsUuid, std::string description) override + virtual int32_t SetVolumeDescription(const std::string &fsUuid, const std::string & description) override { return E_OK; } - virtual int32_t Format(std::string volumeId, std::string fsType) override + virtual int32_t Format(const std::string &volumeId, const std::string &fsType) override { return E_OK; } - virtual int32_t GetDiskById(std::string diskId, Disk &disk) override + virtual int32_t GetDiskById(const std::string &diskId, Disk &disk) override { return E_OK; } @@ -216,7 +216,7 @@ public: const std::vector &newSecret, uint64_t secureUid, uint32_t userId, - std::vector> &plainText) override + const std::vector> &plainText) override { return E_OK; } @@ -255,7 +255,7 @@ public: return E_OK; } - virtual int32_t DeleteAppkey(const std::string keyId) override + virtual int32_t DeleteAppkey(const std::string &keyId) override { return E_OK; } @@ -300,19 +300,19 @@ public: return E_OK; } - virtual std::vector CreateShareFile(const std::vector &uriList, - uint32_t tokenId, uint32_t flag) override + virtual int32_t CreateShareFile(const std::vector &uriList, + uint32_t tokenId, uint32_t flag, std::vector& funcResult) override { int size = uriList.size(); if (size <= 0) { - return { -1 }; + return -1; } if (isZero) { - std::vector retVec(size, ERR_OK); - return retVec; + funcResult.assign(size, ERR_OK); + return E_OK; } - std::vector retVec(size, -1); - return retVec; + funcResult.assign(size, -1); + return E_OK; } virtual int32_t DeleteShareFile(uint32_t tokenId, const std::vector &sharePathList) override @@ -320,7 +320,8 @@ public: return E_OK; } - virtual int32_t GetUserStorageStatsByType(int32_t userId, StorageStats &storageStats, std::string type) override + virtual int32_t GetUserStorageStatsByType(int32_t userId, StorageStats &storageStats, + const std::string &type) override { return E_OK; } @@ -346,6 +347,12 @@ public: { return E_OK; } + + virtual int32_t SetBundleQuota(const std::string& bundleName, int32_t uid, const std::string& bundleDataDirPath, + int32_t limitSizeMb) override + { + return E_OK; + } }; bool StorageManagerServiceMock::isZero = true; diff --git a/test/unittest/uri_permission_test/uri_permission_test.cpp b/test/unittest/uri_permission_test/uri_permission_test.cpp index 3831e541f9..e656f9cc50 100755 --- a/test/unittest/uri_permission_test/uri_permission_test.cpp +++ b/test/unittest/uri_permission_test/uri_permission_test.cpp @@ -16,8 +16,8 @@ #include #include "event_report.h" -#include "istorage_manager.h" -#include "storage_manager_proxy.h" +#include "out/rk3568/gen/foundation/filemanagement/storage_service/services/storage_manager/istorage_manager.h" +#include "out/rk3568/gen/foundation/filemanagement/storage_service/services/storage_manager/storage_manager_proxy.h" #include "system_ability_definition.h" #include "tokenid_kit.h" #define private public -- Gitee