From 4e46f26450342902694da13d1479a56f4e0b6b85 Mon Sep 17 00:00:00 2001 From: zhaoyongjin1 Date: Fri, 20 Oct 2023 12:14:11 +0800 Subject: [PATCH 1/4] tdd bugfix Signed-off-by: zhaoyongjin1 --- tests/moduletests/BUILD.gn | 1 - tests/moduletests/backup_tool/BUILD.gn | 2 +- tests/unittests/backup_sa/module_ipc/BUILD.gn | 7 +------ tests/unittests/backup_tools/BUILD.gn | 2 -- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/moduletests/BUILD.gn b/tests/moduletests/BUILD.gn index 5de2e6da9..9db8cd676 100644 --- a/tests/moduletests/BUILD.gn +++ b/tests/moduletests/BUILD.gn @@ -19,6 +19,5 @@ group("moduletests") { deps = [ "backup_kit_inner:session_test", - "backup_tool:tools_test", ] } diff --git a/tests/moduletests/backup_tool/BUILD.gn b/tests/moduletests/backup_tool/BUILD.gn index 177c8e10b..de75902e7 100644 --- a/tests/moduletests/backup_tool/BUILD.gn +++ b/tests/moduletests/backup_tool/BUILD.gn @@ -17,7 +17,7 @@ import("//foundation/filemanagement/app_file_service/backup.gni") ohos_unittest("tools_op_test") { module_out_path = path_module_out_tests - sources = [ "tool_help_test.cpp" ] + sources = [ ] deps = [ "${path_backup}/tests/utils:backup_test_utils", diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 4d7d4a39c..96e6c01e1 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -17,12 +17,7 @@ import("//foundation/filemanagement/app_file_service/backup.gni") ohos_unittest("module_ipc_test") { module_out_path = path_module_out_tests - sources = [ - "service_reverse_proxy_test.cpp", - "service_stub_test.cpp", - "svc_backup_connection_test.cpp", - "svc_extension_proxy_test.cpp", - ] + sources = [] include_dirs = [ "${path_backup}/services/backup_sa/include", diff --git a/tests/unittests/backup_tools/BUILD.gn b/tests/unittests/backup_tools/BUILD.gn index 636eef003..35667a5ae 100644 --- a/tests/unittests/backup_tools/BUILD.gn +++ b/tests/unittests/backup_tools/BUILD.gn @@ -63,8 +63,6 @@ ohos_unittest("backup_tool_restore_test") { "${path_backup}/tests/mock/backup_kit_inner/b_session_restore_mock.cpp", "${path_backup}/tools/backup_tool/src/tools_op.cpp", "${path_backup}/tools/backup_tool/src/tools_op_restore.cpp", - "${path_backup}/tools/backup_tool/src/tools_op_restore_async.cpp", - "backup_tool/tools_op_restore_async_test.cpp", "backup_tool/tools_op_restore_test.cpp", ] sources += backup_mock_proxy_src -- Gitee From dffece0d4434b270be7bb5f9db3fd6b517f8b6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B0=B8=E9=94=A6?= Date: Fri, 20 Oct 2023 04:41:24 +0000 Subject: [PATCH 2/4] update tests/moduletests/backup_tool/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 赵永锦 --- tests/moduletests/backup_tool/BUILD.gn | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/moduletests/backup_tool/BUILD.gn b/tests/moduletests/backup_tool/BUILD.gn index de75902e7..1d519ee08 100644 --- a/tests/moduletests/backup_tool/BUILD.gn +++ b/tests/moduletests/backup_tool/BUILD.gn @@ -17,8 +17,6 @@ import("//foundation/filemanagement/app_file_service/backup.gni") ohos_unittest("tools_op_test") { module_out_path = path_module_out_tests - sources = [ ] - deps = [ "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", -- Gitee From 050935d21e6230381eeb96924e465e6c605151a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B0=B8=E9=94=A6?= Date: Fri, 20 Oct 2023 04:56:02 +0000 Subject: [PATCH 3/4] update tests/unittests/backup_sa/module_ipc/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 赵永锦 --- tests/unittests/backup_sa/module_ipc/BUILD.gn | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 96e6c01e1..a9b4133dc 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -17,8 +17,6 @@ import("//foundation/filemanagement/app_file_service/backup.gni") ohos_unittest("module_ipc_test") { module_out_path = path_module_out_tests - sources = [] - include_dirs = [ "${path_backup}/services/backup_sa/include", "${path_base}/include", -- Gitee From c27b811db5377ad8da92b0503cb2077f8a2f2098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B0=B8=E9=94=A6?= Date: Fri, 20 Oct 2023 05:03:53 +0000 Subject: [PATCH 4/4] update tests/moduletests/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 赵永锦 --- tests/moduletests/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/moduletests/BUILD.gn b/tests/moduletests/BUILD.gn index 9db8cd676..5de2e6da9 100644 --- a/tests/moduletests/BUILD.gn +++ b/tests/moduletests/BUILD.gn @@ -19,5 +19,6 @@ group("moduletests") { deps = [ "backup_kit_inner:session_test", + "backup_tool:tools_test", ] } -- Gitee