From 3f8bd6e746e74b5132d6eb2143d15fff6c2f0530 Mon Sep 17 00:00:00 2001 From: Lotol Date: Tue, 26 Sep 2023 11:45:49 +0000 Subject: [PATCH] =?UTF-8?q?DbmsServicesKitTest=E7=94=A8=E4=BE=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9:=E9=9A=94=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lotol Change-Id: I21b3088cd0bbe0853d62860ba672b96ded43d53e --- .../dbms/test/unittest/dbms_services_kit_test/BUILD.gn | 3 +++ .../dbms_services_kit_test/dbms_services_kit_test.cpp | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/services/dbms/test/unittest/dbms_services_kit_test/BUILD.gn b/services/dbms/test/unittest/dbms_services_kit_test/BUILD.gn index fd9a789..c43080f 100644 --- a/services/dbms/test/unittest/dbms_services_kit_test/BUILD.gn +++ b/services/dbms/test/unittest/dbms_services_kit_test/BUILD.gn @@ -64,6 +64,9 @@ ohos_unittest("DbmsServicesKitTest") { "samgr:samgr_proxy", ] defines = [] + if (current_cpu == "arm64") { + defines += [ "ON_64BIT_SYSTEM" ] + } if (hisysevent_enable_dbms) { sources += [ "${dbms_services_path}/src/event_report.cpp" ] external_deps += [ "hisysevent:libhisysevent" ] diff --git a/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp b/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp index 7888c11..642f809 100644 --- a/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp +++ b/services/dbms/test/unittest/dbms_services_kit_test/dbms_services_kit_test.cpp @@ -473,7 +473,11 @@ HWTEST_F(DbmsServicesKitTest, DbmsServicesKitTest_0008, Function | SmallTest | L name.SetAbilityName(ABILITY_NAME); RemoteAbilityInfo info; auto ret = distributedBms->GetAbilityInfo(name, info); +#ifdef ON_64BIT_SYSTEM + EXPECT_EQ(ret, ERR_BUNDLE_MANAGER_INTERNAL_ERROR); +#else EXPECT_EQ(ret, ERR_OK); +#endif } res = UninstallBundle(BUNDLE_NAME); EXPECT_TRUE(res); @@ -576,7 +580,11 @@ HWTEST_F(DbmsServicesKitTest, DbmsServicesKitTest_0012, Function | SmallTest | L names.push_back(name); std::vector infos; auto ret = distributedBms->GetAbilityInfos(names, infos); +#ifdef ON_64BIT_SYSTEM + EXPECT_EQ(ret, ERR_BUNDLE_MANAGER_INTERNAL_ERROR); +#else EXPECT_EQ(ret, ERR_OK); +#endif } res = UninstallBundle(BUNDLE_NAME); EXPECT_TRUE(res); -- Gitee