From b9263958fed2a319c215d7bfc22600f1875ebe18 Mon Sep 17 00:00:00 2001 From: zhaoshuai Date: Fri, 4 Mar 2022 11:02:04 +0800 Subject: [PATCH 1/2] update file_manager_proxy TDD test case Signed-off-by: zhaoshuai --- services/test/BUILD.gn | 144 +++++++++++++++++- .../test/client/file_manager_proxy_test.cpp | 11 +- services/test/client/fms_manager_proxy_mock.h | 3 + 3 files changed, 151 insertions(+), 7 deletions(-) diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index 97862562..cf54806b 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -14,7 +14,7 @@ import("//build/test.gni") FMS_BASE_DIR = "//foundation/filemanagement/user_file_service/services" ohos_unittest("file_manager_proxy_test") { - module_out_path = "storage_manager/user_file_manager" + module_out_path = "filemanagement/user_file_service" sources = [ "client/file_manager_proxy_test.cpp" ] @@ -47,8 +47,98 @@ ohos_unittest("file_manager_proxy_test") { ] } +ohos_unittest("media_file_oper_test") { + module_out_path = "filemanagement/user_file_service" + + sources = [ + "fileoper/media_file_oper_test.cpp", + ] + + include_dirs = [ + "//third_party/json/include", + "//base/security/huks/interfaces/innerkits/huks_standard/main/include", + "$FMS_BASE_DIR/include", + "$FMS_BASE_DIR/src/client", + "$FMS_BASE_DIR/src/server", + "$FMS_BASE_DIR/src/fileoper", + "//foundation/appexecfwk/standard/kits/appkit/native/app/include", + "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", + "//foundation/aafwk/standard/interfaces/innerkits/base/include/ohos/aafwk/base", + "//foundation/aafwk/standard/frameworks/kits/ability/native/include/continuation/kits", + "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", + "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb/include", + "//foundation/multimedia/medialibrary_standard/interfaces/innerkits/native/include", + "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/test/unittest/mediathumbnail_test/include", + "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability/include", + ] + + configs = [ "//build/config/compiler:exceptions" ] + + deps = [ + "$FMS_BASE_DIR:fms_server", + "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability:medialibrary_data_ability", + "//utils/native/base:utils", + ] + + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "native_appdatamgr:native_dataability", + "native_appdatamgr:native_rdb", + "safwk:system_ability_fwk", + "samgr_standard:samgr_proxy", + ] +} + +ohos_unittest("media_file_utils_test") { + module_out_path = "filemanagement/user_file_service" + + sources = [ + "fileoper/media_file_utils_test.cpp", + ] + + include_dirs = [ + "//third_party/json/include", + "//base/security/huks/interfaces/innerkits/huks_standard/main/include", + "$FMS_BASE_DIR/include", + "$FMS_BASE_DIR/src/client", + "$FMS_BASE_DIR/src/server", + "$FMS_BASE_DIR/src/fileoper", + "//foundation/appexecfwk/standard/kits/appkit/native/app/include", + "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", + "//foundation/aafwk/standard/interfaces/innerkits/base/include/ohos/aafwk/base", + "//foundation/aafwk/standard/frameworks/kits/ability/native/include/continuation/kits", + "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", + "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb/include", + "//foundation/multimedia/medialibrary_standard/interfaces/innerkits/native/include", + "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/test/unittest/mediathumbnail_test/include", + "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability/include", + ] + + configs = [ "//build/config/compiler:exceptions" ] + + deps = [ + "$FMS_BASE_DIR:fms_server", + "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability:medialibrary_data_ability", + "//utils/native/base:utils", + ] + + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "native_appdatamgr:native_dataability", + "native_appdatamgr:native_rdb", + "safwk:system_ability_fwk", + "samgr_standard:samgr_proxy", + ] +} + ohos_unittest("oper_factory_test") { - module_out_path = "storage_manager/user_file_manager" + module_out_path = "filemanagement/user_file_service" sources = [ "fileoper/oper_factory_test.cpp" ] @@ -81,8 +171,53 @@ ohos_unittest("oper_factory_test") { ] } +ohos_unittest("file_manager_service_stub_test") { + module_out_path = "filemanagement/user_file_service" + + sources = [ + "server/file_manager_service_stub_test.cpp", + ] + + include_dirs = [ + "//third_party/json/include", + "//base/security/huks/interfaces/innerkits/huks_standard/main/include", + "$FMS_BASE_DIR/include", + "$FMS_BASE_DIR/src/client", + "$FMS_BASE_DIR/src/server", + "$FMS_BASE_DIR/src/fileoper", + "//foundation/appexecfwk/standard/kits/appkit/native/app/include", + "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", + "//foundation/aafwk/standard/interfaces/innerkits/base/include/ohos/aafwk/base", + "//foundation/aafwk/standard/frameworks/kits/ability/native/include/continuation/kits", + "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", + "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb/include", + "//foundation/multimedia/medialibrary_standard/interfaces/innerkits/native/include", + "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/test/unittest/mediathumbnail_test/include", + "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability/include", + ] + + configs = [ "//build/config/compiler:exceptions" ] + + deps = [ + "$FMS_BASE_DIR:fms_server", + "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability:medialibrary_data_ability", + "//utils/native/base:utils", + ] + + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "native_appdatamgr:native_dataability", + "native_appdatamgr:native_rdb", + "safwk:system_ability_fwk", + "samgr_standard:samgr_proxy", + ] +} + ohos_unittest("file_manager_service_test") { - module_out_path = "storage_manager/user_file_manager" + module_out_path = "filemanagement/user_file_service" sources = [ "server/file_manager_service_test.cpp" ] @@ -119,7 +254,10 @@ group("user_file_manager_test") { deps = [ ":file_manager_proxy_test", + ":file_manager_service_stub_test", ":file_manager_service_test", + ":media_file_oper_test", + ":media_file_utils_test", ":oper_factory_test", ] } diff --git a/services/test/client/file_manager_proxy_test.cpp b/services/test/client/file_manager_proxy_test.cpp index 5b6e3fda..a19e33f6 100644 --- a/services/test/client/file_manager_proxy_test.cpp +++ b/services/test/client/file_manager_proxy_test.cpp @@ -57,8 +57,11 @@ HWTEST_F(FileManagerProxyTest, File_Manager_Proxy_GetRoot_0000, testing::ext::Te { GTEST_LOG_(INFO) << "FileManagerProxyTest-begin File_Manager_Proxy_GetRoot_0000"; CmdOptions option; + DevInfo dev("local", ""); + option.SetDevInfo(dev); std::vector> fileRes; - int ret = proxy_->GetRoot(option, fileRes); + IFmsClient* result = IFmsClient::GetFmsInstance(); + int ret = result->GetRoot(option, fileRes); ASSERT_TRUE(ret == 0); GTEST_LOG_(INFO) << "FileManagerProxyTest-end File_Manager_Proxy_GetRoot_0000"; } @@ -102,7 +105,7 @@ HWTEST_F(FileManagerProxyTest, File_Manager_Proxy_Mkdir_0000, testing::ext::Test .Times(1) .WillOnce(testing::Invoke(mock_.GetRefPtr(), &FmsManagerProxyMock::InvokeSendRequest)); int ret = proxy_->Mkdir(name, path); - EXPECT_TRUE(ret == ERR_NONE); + EXPECT_EQ(ret, 1); GTEST_LOG_(INFO) << "FileManagerProxyTest-end File_Manager_Proxy_Mkdir_0000"; } @@ -126,7 +129,7 @@ HWTEST_F(FileManagerProxyTest, File_Manager_Proxy_ListFile_0000, testing::ext::T .Times(1) .WillOnce(testing::Invoke(mock_.GetRefPtr(), &FmsManagerProxyMock::InvokeSendRequest)); int ret = proxy_->ListFile(type, path, option, fileRes); - ASSERT_TRUE(ret == ERR_NONE); + EXPECT_EQ(ret, 0); GTEST_LOG_(INFO) << "FileManagerProxyTest-end File_Manager_Proxy_ListFile_0000"; } @@ -150,7 +153,7 @@ HWTEST_F(FileManagerProxyTest, File_Manager_Proxy_CreateFile_0000, testing::ext: .Times(1) .WillOnce(testing::Invoke(mock_.GetRefPtr(), &FmsManagerProxyMock::InvokeSendRequest)); int ret = proxy_->CreateFile(path, fileName, option, uri); - ASSERT_TRUE(ret == ERR_NONE); + EXPECT_EQ(ret, 0); GTEST_LOG_(INFO) << "FileManagerProxyTest-end File_Manager_Proxy_CreateFile_0000"; } } // namespace \ No newline at end of file diff --git a/services/test/client/fms_manager_proxy_mock.h b/services/test/client/fms_manager_proxy_mock.h index 4b1aed96..811807ed 100644 --- a/services/test/client/fms_manager_proxy_mock.h +++ b/services/test/client/fms_manager_proxy_mock.h @@ -20,6 +20,7 @@ #include "iremote_stub.h" #include "iremote_proxy.h" #include "ifms_client.h" +#include "cmd_response.h" namespace OHOS { namespace FileManagerService { @@ -31,6 +32,8 @@ public: MOCK_METHOD4(SendRequest, int(uint32_t, MessageParcel &, MessageParcel &, MessageOption &)); int32_t InvokeSendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { + sptr cmdResponse = new CmdResponse(); + reply.WriteParcelable(cmdResponse); return ERR_NONE; } virtual int Mkdir(const std::string &name, const std::string &path) override -- Gitee From 0d545925849edf06f747a67455802c686d2804b2 Mon Sep 17 00:00:00 2001 From: zhaoshuai Date: Fri, 4 Mar 2022 11:06:59 +0800 Subject: [PATCH 2/2] update file_manager_proxy TDD test case Signed-off-by: zhaoshuai --- services/test/BUILD.gn | 138 ----------------------------------------- 1 file changed, 138 deletions(-) diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index cf54806b..489e7167 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -47,96 +47,6 @@ ohos_unittest("file_manager_proxy_test") { ] } -ohos_unittest("media_file_oper_test") { - module_out_path = "filemanagement/user_file_service" - - sources = [ - "fileoper/media_file_oper_test.cpp", - ] - - include_dirs = [ - "//third_party/json/include", - "//base/security/huks/interfaces/innerkits/huks_standard/main/include", - "$FMS_BASE_DIR/include", - "$FMS_BASE_DIR/src/client", - "$FMS_BASE_DIR/src/server", - "$FMS_BASE_DIR/src/fileoper", - "//foundation/appexecfwk/standard/kits/appkit/native/app/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/base/include/ohos/aafwk/base", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/continuation/kits", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", - "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb/include", - "//foundation/multimedia/medialibrary_standard/interfaces/innerkits/native/include", - "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/test/unittest/mediathumbnail_test/include", - "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability/include", - ] - - configs = [ "//build/config/compiler:exceptions" ] - - deps = [ - "$FMS_BASE_DIR:fms_server", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability:medialibrary_data_ability", - "//utils/native/base:utils", - ] - - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", - "native_appdatamgr:native_dataability", - "native_appdatamgr:native_rdb", - "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", - ] -} - -ohos_unittest("media_file_utils_test") { - module_out_path = "filemanagement/user_file_service" - - sources = [ - "fileoper/media_file_utils_test.cpp", - ] - - include_dirs = [ - "//third_party/json/include", - "//base/security/huks/interfaces/innerkits/huks_standard/main/include", - "$FMS_BASE_DIR/include", - "$FMS_BASE_DIR/src/client", - "$FMS_BASE_DIR/src/server", - "$FMS_BASE_DIR/src/fileoper", - "//foundation/appexecfwk/standard/kits/appkit/native/app/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/base/include/ohos/aafwk/base", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/continuation/kits", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", - "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb/include", - "//foundation/multimedia/medialibrary_standard/interfaces/innerkits/native/include", - "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/test/unittest/mediathumbnail_test/include", - "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability/include", - ] - - configs = [ "//build/config/compiler:exceptions" ] - - deps = [ - "$FMS_BASE_DIR:fms_server", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability:medialibrary_data_ability", - "//utils/native/base:utils", - ] - - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", - "native_appdatamgr:native_dataability", - "native_appdatamgr:native_rdb", - "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", - ] -} - ohos_unittest("oper_factory_test") { module_out_path = "filemanagement/user_file_service" @@ -171,51 +81,6 @@ ohos_unittest("oper_factory_test") { ] } -ohos_unittest("file_manager_service_stub_test") { - module_out_path = "filemanagement/user_file_service" - - sources = [ - "server/file_manager_service_stub_test.cpp", - ] - - include_dirs = [ - "//third_party/json/include", - "//base/security/huks/interfaces/innerkits/huks_standard/main/include", - "$FMS_BASE_DIR/include", - "$FMS_BASE_DIR/src/client", - "$FMS_BASE_DIR/src/server", - "$FMS_BASE_DIR/src/fileoper", - "//foundation/appexecfwk/standard/kits/appkit/native/app/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/base/include/ohos/aafwk/base", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include/continuation/kits", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", - "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb/include", - "//foundation/multimedia/medialibrary_standard/interfaces/innerkits/native/include", - "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/test/unittest/mediathumbnail_test/include", - "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability/include", - ] - - configs = [ "//build/config/compiler:exceptions" ] - - deps = [ - "$FMS_BASE_DIR:fms_server", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability:medialibrary_data_ability", - "//utils/native/base:utils", - ] - - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", - "native_appdatamgr:native_dataability", - "native_appdatamgr:native_rdb", - "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", - ] -} - ohos_unittest("file_manager_service_test") { module_out_path = "filemanagement/user_file_service" @@ -254,10 +119,7 @@ group("user_file_manager_test") { deps = [ ":file_manager_proxy_test", - ":file_manager_service_stub_test", ":file_manager_service_test", - ":media_file_oper_test", - ":media_file_utils_test", ":oper_factory_test", ] } -- Gitee