From d41b327644943982eac50db936d47fb58b5dc4ee Mon Sep 17 00:00:00 2001
From: jiyong <jiyong@huawei.com>
Date: Wed, 3 Nov 2021 08:48:54 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!1011=20?=
 =?UTF-8?q?:=20L1=E6=95=8F=E6=84=9F=E8=AF=8D=E4=BF=AE=E6=94=B9'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ability_posix/src/AbilityMgrTest.cpp      | 46 +++++++++----------
 .../ability_posix/src/AbilityMgrTest2.cpp     | 46 +++++++++----------
 .../bundle_mgr_posix/src/BundleMgrTest.cpp    | 30 ++++++------
 utils_lite/kv_store_posix/src/KvStoreTest.cpp | 14 +++---
 4 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/aafwk_lite/ability_posix/src/AbilityMgrTest.cpp b/aafwk_lite/ability_posix/src/AbilityMgrTest.cpp
index 4783bfd1c..57f2a5b10 100755
--- a/aafwk_lite/ability_posix/src/AbilityMgrTest.cpp
+++ b/aafwk_lite/ability_posix/src/AbilityMgrTest.cpp
@@ -146,7 +146,7 @@ protected:
         bool uninstallResult = false;
         sem_init(&g_sem, 0, 0);
         InstallParam installParam = { .installLocation = 1, .keepData = false };
-        uninstallResult = Uninstall("com.openharmony.testnative", &installParam, TestBundleStateCallback);
+        uninstallResult = Uninstall("com.huawei.testnative", &installParam, TestBundleStateCallback);
         sem_wait(&g_sem);
         if (uninstallResult) {
             printf("sem exit \n");
@@ -207,14 +207,14 @@ HWTEST_F(AbilityMgrTest, testSetWantElement, Function | MediumTest | Level0)
     Want want = { nullptr };
     ElementName element = { nullptr };
     SetElementDeviceID(&element, "0001000");
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "SecondAbility");
     if (element.abilityName != nullptr) {
         bool setResult = SetWantElement(&want, element);
         if (setResult) {
             EXPECT_STREQ(want.element->deviceId, "0001000");
             EXPECT_STREQ(want.element->abilityName, "SecondAbility");
-            EXPECT_STREQ(want.element->bundleName, "com.openharmony.testnative");
+            EXPECT_STREQ(want.element->bundleName, "com.huawei.testnative");
         }
     }
     ClearElement(&element);
@@ -280,14 +280,14 @@ HWTEST_F(AbilityMgrTest, testWantToUri, Function | MediumTest | Level0)
     Want want = { nullptr };
     ElementName element = { nullptr };
     SetElementDeviceID(&element, "0001000");
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "SecondAbility");
     if (element.abilityName !=nullptr) {
         bool setResult = SetWantElement(&want, element);
         if (setResult) {
             const char *uri = WantToUri(want);
             printf("uri is %s \n", uri);
-            const char *expectResult = "#Want;device=0001000;bundle=com.openharmony.testnative;ability=SecondAbility;end";
+            const char *expectResult = "#Want;device=0001000;bundle=com.huawei.testnative;ability=SecondAbility;end";
             EXPECT_STREQ(uri, expectResult);
             free((void*)uri);
         }
@@ -367,7 +367,7 @@ HWTEST_F(AbilityMgrTest, testWantParseUri, Function | MediumTest | Level0)
     Want want = { nullptr };
     ElementName element = { nullptr };
     SetElementDeviceID(&element, "0001000");
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "SecondAbility");
     if (element.abilityName != nullptr) {
         bool setResult = SetWantElement(&want, element);
@@ -446,7 +446,7 @@ HWTEST_F(AbilityMgrTest, testGetBundleNameIllegal, Function | MediumTest | Level
     memset_s(&want, sizeof(Want), 0, sizeof(Want));
     ElementName element;
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "SecondAbility");
     SetWantElement(&want, element);
     int result = StartAbility(&want);
@@ -468,7 +468,7 @@ HWTEST_F(AbilityMgrTest, testGetSrcPathIllegal, Function | MediumTest | Level1)
     printf("------start testGetSrcPathIllegal------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "SecondAbility");
     SetWantElement(&want, element);
     int result = StartAbility(&want);
@@ -489,7 +489,7 @@ HWTEST_F(AbilityMgrTest, testGetDataPathIllegal, Function | MediumTest | Level1)
     printf("------start testGetDataPathIllegal------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "SecondAbility");
     SetWantElement(&want, element);
     int result = StartAbility(&want);
@@ -513,7 +513,7 @@ HWTEST_F(AbilityMgrTest, testDumpIllegal, Function | MediumTest | Level1)
     memset_s(&want, sizeof(Want), 0, sizeof(Want));
     ElementName element;
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "SecondAbility");
     SetWantElement(&want, element);
     Ability *ability = new Ability();
@@ -536,7 +536,7 @@ HWTEST_F(AbilityMgrTest, testStartAbility, Function | MediumTest | Level1)
     printf("------start testStartAbility------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "MainAbility");
     SetWantElement(&want, element);
     int result = StartAbility(&want);
@@ -573,7 +573,7 @@ HWTEST_F(AbilityMgrTest, testStopAbility, Function | MediumTest | Level0)
     printf("------start testStopAbility------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     g_errorCode = StartAbility(&want);
@@ -613,7 +613,7 @@ HWTEST_F(AbilityMgrTest, testConnectAbility, Function | MediumTest | Level1)
     printf("------start testConnectAbility------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     sem_init(&g_sem, 0, 0);
@@ -643,7 +643,7 @@ HWTEST_F(AbilityMgrTest, testDisConnectAbility, Function | MediumTest | Level1)
     printf("------start testDisConnectAbility------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     sem_init(&g_sem, 0, 0);
@@ -675,7 +675,7 @@ HWTEST_F(AbilityMgrTest, testConnectAbilityIllegal, Function | MediumTest | Leve
     printf("------start testConnectAbilityIllegal------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     g_errorCode = ConnectAbility(nullptr, &g_conn, this);
@@ -699,7 +699,7 @@ HWTEST_F(AbilityMgrTest, testDisConnectAbilityIllegal, Function | MediumTest | L
     printf("------start testDisConnectAbilityIllegal------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     sem_init(&g_sem, 0, 0);
@@ -730,7 +730,7 @@ HWTEST_F(AbilityMgrTest, testTerminateAbility, Function | MediumTest | Level1)
     printf("------start testTerminateAbility------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "SecondAbility");
     SetWantElement(&want, element);
     int result1 = StartAbility(&want);
@@ -761,7 +761,7 @@ HWTEST_F(AbilityMgrTest, testWantMatchBundle, Function | MediumTest | Level1)
     ElementName element;
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, "MainAbility");
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementDeviceID(&element, "");
     SetWantElement(&want, element);
     AbilityInfo abilityInfo;
@@ -797,7 +797,7 @@ HWTEST_F(AbilityMgrTest, testWantNotMathBundle, Function | MediumTest | Level2)
     std::string aName = "NoThisAbility";
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, aName.c_str());
-    SetElementBundleName(&element, "com.openharmony.nothishap");
+    SetElementBundleName(&element, "com.huawei.nothishap");
     SetWantElement(&want, element);
     AbilityInfo abilityInfo;
     memset_s(&abilityInfo, sizeof(AbilityInfo), 0, sizeof(AbilityInfo));
@@ -826,7 +826,7 @@ HWTEST_F(AbilityMgrTest, testWantOnlyMathBundleName, Function | MediumTest | Lev
     std::string aName = "Ability";
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, aName.c_str());
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetWantElement(&want, element);
     AbilityInfo abilityInfo;
     memset_s(&abilityInfo, sizeof(AbilityInfo), 0, sizeof(AbilityInfo));
@@ -855,7 +855,7 @@ HWTEST_F(AbilityMgrTest, testWantOnlyMathAbility, Function | MediumTest | Level1
     std::string aName = "MainAbility";
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, aName.c_str());
-    SetElementBundleName(&element, "com.openharmony.test");
+    SetElementBundleName(&element, "com.huawei.test");
     SetWantElement(&want, element);
     AbilityInfo abilityInfo;
     memset_s(&abilityInfo, sizeof(AbilityInfo), 0, sizeof(AbilityInfo));
@@ -883,7 +883,7 @@ HWTEST_F(AbilityMgrTest, testWantDataMatchLength, Function | MediumTest | Level1
     ElementName element;
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, "MainAbility");
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetWantElement(&want, element);
     SetWantData(&want, "test", 5);
     AbilityInfo abilityInfo;
@@ -916,7 +916,7 @@ HWTEST_F(AbilityMgrTest, testWantDataNotMatchLength, Function | MediumTest | Lev
     ElementName element;
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, "SecondAbility");
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetWantElement(&want, element);
     SetWantData(&want, "test", 3);
     int result = StartAbility(&want);
diff --git a/aafwk_lite/ability_posix/src/AbilityMgrTest2.cpp b/aafwk_lite/ability_posix/src/AbilityMgrTest2.cpp
index f970fd9de..179416a70 100755
--- a/aafwk_lite/ability_posix/src/AbilityMgrTest2.cpp
+++ b/aafwk_lite/ability_posix/src/AbilityMgrTest2.cpp
@@ -146,7 +146,7 @@ protected:
         bool uninstallResult = false;
         sem_init(&g_sem, 0, 0);
         InstallParam installParam = { .installLocation = 1, .keepData = false };
-        uninstallResult = Uninstall("com.openharmony.testnative", &installParam, TestBundleStateCallback);
+        uninstallResult = Uninstall("com.huawei.testnative", &installParam, TestBundleStateCallback);
         sem_wait(&g_sem);
         if (uninstallResult) {
             printf("sem exit \n");
@@ -207,14 +207,14 @@ HWTEST_F(AbilityMgrTest2, testSetWantElement, Function | MediumTest | Level0)
     Want want = { nullptr };
     ElementName element = { nullptr };
     SetElementDeviceID(&element, "0001000");
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     if (element.abilityName != nullptr) {
         bool setResult = SetWantElement(&want, element);
         if (setResult) {
             EXPECT_STREQ(want.element->deviceId, "0001000");
             EXPECT_STREQ(want.element->abilityName, "ServiceAbility");
-            EXPECT_STREQ(want.element->bundleName, "com.openharmony.testnative");
+            EXPECT_STREQ(want.element->bundleName, "com.huawei.testnative");
         }
     }
     ClearElement(&element);
@@ -280,14 +280,14 @@ HWTEST_F(AbilityMgrTest2, testWantToUri, Function | MediumTest | Level0)
     Want want = { nullptr };
     ElementName element = { nullptr };
     SetElementDeviceID(&element, "0001000");
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "SecondAbility");
     if (element.abilityName !=nullptr) {
         bool setResult = SetWantElement(&want, element);
         if (setResult) {
             const char *uri = WantToUri(want);
             printf("uri is %s \n", uri);
-            const char *expectResult = "#Want;device=0001000;bundle=com.openharmony.testnative;ability=SecondAbility;end";
+            const char *expectResult = "#Want;device=0001000;bundle=com.huawei.testnative;ability=SecondAbility;end";
             EXPECT_STREQ(uri, expectResult);
             free((void*)uri);
         }
@@ -367,7 +367,7 @@ HWTEST_F(AbilityMgrTest2, testWantParseUri, Function | MediumTest | Level0)
     Want want = { nullptr };
     ElementName element = { nullptr };
     SetElementDeviceID(&element, "0001000");
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     if (element.abilityName != nullptr) {
         bool setResult = SetWantElement(&want, element);
@@ -446,7 +446,7 @@ HWTEST_F(AbilityMgrTest2, testGetBundleNameIllegal, Function | MediumTest | Leve
     memset_s(&want, sizeof(Want), 0, sizeof(Want));
     ElementName element;
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     int result = StartAbility(&want);
@@ -470,7 +470,7 @@ HWTEST_F(AbilityMgrTest2, testGetSrcPathIllegal, Function | MediumTest | Level1)
     printf("------start testGetSrcPathIllegal------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     int result = StartAbility(&want);
@@ -494,7 +494,7 @@ HWTEST_F(AbilityMgrTest2, testGetDataPathIllegal, Function | MediumTest | Level1
     printf("------start testGetDataPathIllegal------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     int result = StartAbility(&want);
@@ -520,7 +520,7 @@ HWTEST_F(AbilityMgrTest2, testDumpIllegal, Function | MediumTest | Level1)
     memset_s(&want, sizeof(Want), 0, sizeof(Want));
     ElementName element;
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     Ability *ability = new Ability();
@@ -545,7 +545,7 @@ HWTEST_F(AbilityMgrTest2, testStartAbility, Function | MediumTest | Level1)
     printf("------start testStartAbility------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     int result = StartAbility(&want);
@@ -584,7 +584,7 @@ HWTEST_F(AbilityMgrTest2, testStopAbility, Function | MediumTest | Level0)
     printf("------start testStopAbility------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     g_errorCode = StartAbility(&want);
@@ -624,7 +624,7 @@ HWTEST_F(AbilityMgrTest2, testConnectAbility, Function | MediumTest | Level1)
     printf("------start testConnectAbility------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     sem_init(&g_sem, 0, 0);
@@ -655,7 +655,7 @@ HWTEST_F(AbilityMgrTest2, testDisConnectAbility, Function | MediumTest | Level1)
     printf("------start testDisConnectAbility------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     sem_init(&g_sem, 0, 0);
@@ -688,7 +688,7 @@ HWTEST_F(AbilityMgrTest2, testConnectAbilityIllegal, Function | MediumTest | Lev
     printf("------start testConnectAbilityIllegal------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     g_errorCode = ConnectAbility(nullptr, &g_conn, this);
@@ -712,7 +712,7 @@ HWTEST_F(AbilityMgrTest2, testDisConnectAbilityIllegal, Function | MediumTest |
     printf("------start testDisConnectAbilityIllegal------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     sem_init(&g_sem, 0, 0);
@@ -744,7 +744,7 @@ HWTEST_F(AbilityMgrTest2, testTerminateAbility, Function | MediumTest | Level1)
     printf("------start testTerminateAbility------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementAbilityName(&element, "ServiceAbility");
     SetWantElement(&want, element);
     int result1 = StartAbility(&want);
@@ -775,7 +775,7 @@ HWTEST_F(AbilityMgrTest2, testWantMatchBundle, Function | MediumTest | Level1)
     ElementName element;
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, "ServiceAbility");
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetElementDeviceID(&element, "");
     SetWantElement(&want, element);
     AbilityInfo abilityInfo;
@@ -815,7 +815,7 @@ HWTEST_F(AbilityMgrTest2, testWantNotMathBundle, Function | MediumTest | Level2)
     std::string aName = "NoThisAbility";
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, aName.c_str());
-    SetElementBundleName(&element, "com.openharmony.nothishap");
+    SetElementBundleName(&element, "com.huawei.nothishap");
     SetWantElement(&want, element);
     AbilityInfo abilityInfo;
     memset_s(&abilityInfo, sizeof(AbilityInfo), 0, sizeof(AbilityInfo));
@@ -848,7 +848,7 @@ HWTEST_F(AbilityMgrTest2, testWantOnlyMathBundleName, Function | MediumTest | Le
     std::string aName = "Ability";
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, aName.c_str());
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetWantElement(&want, element);
     AbilityInfo abilityInfo;
     memset_s(&abilityInfo, sizeof(AbilityInfo), 0, sizeof(AbilityInfo));
@@ -881,7 +881,7 @@ HWTEST_F(AbilityMgrTest2, testWantOnlyMathAbility, Function | MediumTest | Level
     std::string aName = "ServiceAbility";
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, aName.c_str());
-    SetElementBundleName(&element, "com.openharmony.test");
+    SetElementBundleName(&element, "com.huawei.test");
     SetWantElement(&want, element);
     AbilityInfo abilityInfo;
     memset_s(&abilityInfo, sizeof(AbilityInfo), 0, sizeof(AbilityInfo));
@@ -913,7 +913,7 @@ HWTEST_F(AbilityMgrTest2, testWantDataMatchLength, Function | MediumTest | Level
     ElementName element;
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, "ServiceAbility");
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetWantElement(&want, element);
     SetWantData(&want, "test", 5);
     AbilityInfo abilityInfo;
@@ -946,7 +946,7 @@ HWTEST_F(AbilityMgrTest2, testWantDataNotMatchLength, Function | MediumTest | Le
     ElementName element;
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, "ServiceAbility");
-    SetElementBundleName(&element, "com.openharmony.testnative");
+    SetElementBundleName(&element, "com.huawei.testnative");
     SetWantElement(&want, element);
     SetWantData(&want, "test", 3);
     int result = StartAbility(&want);
diff --git a/appexecfwk_lite/bundle_mgr_posix/src/BundleMgrTest.cpp b/appexecfwk_lite/bundle_mgr_posix/src/BundleMgrTest.cpp
index 82c919102..659cb56ac 100755
--- a/appexecfwk_lite/bundle_mgr_posix/src/BundleMgrTest.cpp
+++ b/appexecfwk_lite/bundle_mgr_posix/src/BundleMgrTest.cpp
@@ -83,7 +83,7 @@ protected:
     {
         sem_init(&g_sem, 0, 0);
         InstallParam installParam = { .installLocation = 1, .keepData = false };
-        Uninstall("com.openharmony.testjsdemo", &installParam, TestBundleStateCallback);
+        Uninstall("com.huawei.testjsdemo", &installParam, TestBundleStateCallback);
         sem_wait(&g_sem);
         printf("callback uninstallresult is %d \n", g_errorCode);
         EXPECT_EQ(g_errorCode, 0);
@@ -103,10 +103,10 @@ HWTEST_F(BundleMgrTest, testClearAbilityInfoIllegal, Function | MediumTest | Lev
     // abilityInfo is nullptr
     AbilityInfo abilityInfo;
     memset_s(&abilityInfo, sizeof(abilityInfo), 0, sizeof(abilityInfo));
-    abilityInfo.bundleName = (char*)"com.openharmony.testjsdemo";
+    abilityInfo.bundleName = (char*)"com.huawei.testjsdemo";
     printf("abilityInfo.bundleName is %s \n", abilityInfo.bundleName);
     ClearAbilityInfo(nullptr);
-    EXPECT_STREQ(abilityInfo.bundleName, "com.openharmony.testjsdemo");
+    EXPECT_STREQ(abilityInfo.bundleName, "com.huawei.testjsdemo");
     printf("------end testClearAbilityInfoIllegal------\n");
 }
 
@@ -120,11 +120,11 @@ HWTEST_F(BundleMgrTest, testClearBundleInfoIllegal, Function | MediumTest | Leve
     printf("------start testClearBundleInfoIllegal------\n");
     BundleInfo bundleInfo;
     memset_s(&bundleInfo, sizeof(bundleInfo), 0, sizeof(bundleInfo));
-    bundleInfo.bundleName = (char*)"com.openharmony.testjsdemo";
+    bundleInfo.bundleName = (char*)"com.huawei.testjsdemo";
     printf("abilityInfo.bundleName is %s \n", bundleInfo.bundleName);
     ClearBundleInfo(nullptr);
     printf("abilityInfo.bundleName afterclear is %s \n", bundleInfo.bundleName);
-    EXPECT_STREQ(bundleInfo.bundleName, "com.openharmony.testjsdemo");
+    EXPECT_STREQ(bundleInfo.bundleName, "com.huawei.testjsdemo");
     printf("------end testClearBundleInfoIllegal------\n");
 }
 
@@ -201,10 +201,10 @@ HWTEST_F(BundleMgrTest, testSetElementBundleName, Function | MediumTest | Level0
     printf("------start testSetElementBundleName------\n");
     Want want = { nullptr };
     ElementName element = { nullptr };
-    SetElementBundleName(&element, "com.openharmony.testjsdemo");
+    SetElementBundleName(&element, "com.huawei.testjsdemo");
     SetWantElement(&want, element);
     printf("element is %s \n", want.element->bundleName);
-    char bName[] = "com.openharmony.testjsdemo";
+    char bName[] = "com.huawei.testjsdemo";
     EXPECT_STREQ(want.element->bundleName, bName);
     ClearElement(&element);
     ClearWant(&want);
@@ -439,7 +439,7 @@ HWTEST_F(BundleMgrTest, testBundleMgrInstallBadfile, Function | MediumTest | Lev
 HWTEST_F(BundleMgrTest, testUninstallNullCallback, Function | MediumTest | Level2)
 {
     printf("------start testUninstallNullCallback------\n");
-    const char *bundleName = (char*)"com.openharmony.testdemo";
+    const char *bundleName = (char*)"com.huawei.testdemo";
     InstallParam installParam = { .installLocation = 1, .keepData = false };
     bool isUninstallSuccess = Uninstall(bundleName, &installParam, nullptr);
     EXPECT_FALSE(isUninstallSuccess);
@@ -477,7 +477,7 @@ HWTEST_F(BundleMgrTest, testUninstallright, Function | MediumTest | Level0)
     sem_wait(&g_sem);
     EXPECT_TRUE(installResult);
     sleep(1);
-    const char *bundleName = (char*)"com.openharmony.testnative";
+    const char *bundleName = (char*)"com.huawei.testnative";
     bool isUninstallSuccess = false;
     sem_init(&g_sem, 0, 0);
     bool uninstallState = Uninstall(bundleName, &installParam, TestBundleStateCallback);
@@ -502,7 +502,7 @@ HWTEST_F(BundleMgrTest, testUninstallright, Function | MediumTest | Level0)
 HWTEST_F(BundleMgrTest, testUninstallErrorName, Function | MediumTest | Level2)
 {
     printf("------start testUninstallErrorName------\n");
-    const char *bundleName = (char*)"com.openharmony.nothisBundleName";
+    const char *bundleName = (char*)"com.huawei.nothisBundleName";
     bool isUninstallSuccess = false;
     sem_init(&g_sem, 0, 0);
     InstallParam installParam = { .installLocation = 1, .keepData = false };
@@ -560,7 +560,7 @@ HWTEST_F(BundleMgrTest, testQueryAbilityInfoRight, Function | MediumTest | Level
     ElementName element;
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, "MainAbility");
-    SetElementBundleName(&element, "com.openharmony.testjsdemo");
+    SetElementBundleName(&element, "com.huawei.testjsdemo");
     SetWantElement(&want, element);
     SetWantData(&want, "test", 4);
     AbilityInfo abilityInfo;
@@ -595,7 +595,7 @@ HWTEST_F(BundleMgrTest, testQueryAbilityInfoIllegal, Function | MediumTest | Lev
     ElementName element;
     memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName));
     SetElementAbilityName(&element, "MainAbility");
-    SetElementBundleName(&element, "com.openharmony.testjsdemo");
+    SetElementBundleName(&element, "com.huawei.testjsdemo");
     SetWantElement(&want, element);
     SetWantData(&want, "test", 4);
     g_errorCode = QueryAbilityInfo(&want, nullptr);
@@ -625,7 +625,7 @@ HWTEST_F(BundleMgrTest, testGetBundleInfoRight, Function | MediumTest | Level1)
     printf("------start testGetBundleInfoRight------\n");
     BundleInfo bundleInfo;
     memset_s(&bundleInfo, sizeof(bundleInfo), 0, sizeof(bundleInfo));
-    const char *bundleName = (char*)"com.openharmony.testjsdemo";
+    const char *bundleName = (char*)"com.huawei.testjsdemo";
     int32_t flags = 0;
     printf("bundleName is %s \n", bundleName);
     sleep(2);
@@ -656,7 +656,7 @@ HWTEST_F(BundleMgrTest, testGetBundleInfoIllegal, Function | MediumTest | Level2
     printf("------start testGetBundleInfoIllegal------\n");
     BundleInfo bundleInfo;
     memset_s(&bundleInfo, sizeof(bundleInfo), 0, sizeof(bundleInfo));
-    const char *bundleName = (char*)"com.openharmony.nothishap";
+    const char *bundleName = (char*)"com.huawei.nothishap";
     int32_t flags = 0;
     // error bundleName
     g_errorCode = GetBundleInfo(bundleName, flags, &bundleInfo);
@@ -678,7 +678,7 @@ HWTEST_F(BundleMgrTest, testGetBundleInfoIllegal, Function | MediumTest | Level2
     printf("bundleInfo3.codePath is %s \n", bundleInfo.codePath);
     EXPECT_TRUE(g_errorCode == 2);
     // flags not exit
-    g_errorCode = GetBundleInfo("com.openharmony.testjsdemo", 2, &bundleInfo);
+    g_errorCode = GetBundleInfo("com.huawei.testjsdemo", 2, &bundleInfo);
     sleep(2);
     printf("bundleInfo3.bundleName is %s \n", bundleInfo.bundleName);
     printf("bundleInfo3.versionCode is %d \n", bundleInfo.versionCode);
diff --git a/utils_lite/kv_store_posix/src/KvStoreTest.cpp b/utils_lite/kv_store_posix/src/KvStoreTest.cpp
index 60f8edf8a..eda16e0ab 100755
--- a/utils_lite/kv_store_posix/src/KvStoreTest.cpp
+++ b/utils_lite/kv_store_posix/src/KvStoreTest.cpp
@@ -36,18 +36,18 @@ protected:
     static void SetUpTestCase(void)
     {
         printf("----------test case with KvStoreTest start-------------\n");
-        int ret = mkdir("/storage/com.openharmony.kv", S_IRUSR | S_IWUSR);
-        printf("/storage/com.openharmony.kv ret = %d\n", ret);
-        ret = UtilsSetEnv("/storage/com.openharmony.kv");
+        int ret = mkdir("/storage/com.huawei.kv", S_IRUSR | S_IWUSR);
+        printf("/storage/com.huawei.kv ret = %d\n", ret);
+        ret = UtilsSetEnv("/storage/com.huawei.kv");
         EXPECT_EQ(ret, 0);
     }
     // TearDownTestCase：测试套清理动作，在最后一个TestCase之后执行
     static void TearDownTestCase(void)
     {
-        int ret = rmdir("/storage/com.openharmony.kv/kvstore");
-        printf("/storage/com.openharmony.kv/kvstore ret = %d\n", ret);
-        ret = rmdir("/storage/com.openharmony.kv");
-        printf("/storage/com.openharmony.kv ret = %d\n", ret);
+        int ret = rmdir("/storage/com.huawei.kv/kvstore");
+        printf("/storage/com.huawei.kv/kvstore ret = %d\n", ret);
+        ret = rmdir("/storage/com.huawei.kv");
+        printf("/storage/com.huawei.kv ret = %d\n", ret);
         printf("----------test case with KvStoreTest end-------------\n");
     }
     // 用例的预置动作
-- 
GitLab