From 9dd11f4efe6d065758573edd2be5640d459a5268 Mon Sep 17 00:00:00 2001
From: jiyong <jiyong@huawei.com>
Date: Sun, 26 Sep 2021 18:34:50 +0800
Subject: [PATCH] jiyong@huawei.com

Signed-off-by: jiyong <jiyong@huawei.com>
---
 .../bmsgetinfosfifthscene/src/main/config.json     |  4 ++--
 .../bmsgetinfosfirstscene/src/main/config.json     |  2 +-
 .../src/main/config.json                           |  2 +-
 .../bmsgetinfosfourthscene/src/main/config.json    |  4 ++--
 .../bmsgetinfosscenesystem/src/main/config.json    |  2 +-
 .../bmsgetinfosscenevendor/src/main/config.json    |  4 ++--
 .../bmsgetinfosthirdscene/src/main/config.json     |  2 +-
 .../sceneProject/bmssceneeight/BUILD.gn            |  2 +-
 .../bmssceneeight/src/main/config.json             |  2 +-
 .../sceneProject/bmsscenefive/BUILD.gn             |  2 +-
 .../sceneProject/bmsscenefour/BUILD.gn             |  2 +-
 .../sceneProject/bmsscenenine/BUILD.gn             |  2 +-
 .../sceneProject/bmsscenenine/src/main/config.json |  2 +-
 .../sceneProject/bmssceneone/BUILD.gn              |  2 +-
 .../sceneProject/bmssceneseven/BUILD.gn            |  2 +-
 .../sceneProject/bmsscenesix/BUILD.gn              |  2 +-
 .../sceneProject/bmsscenethree/BUILD.gn            |  2 +-
 .../sceneProject/bmsscenetwo/BUILD.gn              |  2 +-
 .../appexecfwk_posix/src/BundleMgrTest.cpp         |  6 +++---
 utils_lite/kv_store_posix/src/KvStoreTest.cpp      | 14 +++++++-------
 20 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/src/main/config.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/src/main/config.json
index e981bb18f..0d803354d 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/src/main/config.json
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/src/main/config.json
@@ -68,7 +68,7 @@
               "customizeData": [
                 {
                   "name": "originWidgetName5A",
-                  "value": "com.huawei.weather.testWidget5A"
+                  "value": "com.openharmony.weather.testWidget5A"
                 }
               ]
             },
@@ -138,7 +138,7 @@
               "customizeData": [
                 {
                   "name": "originWidgetName5B",
-                  "value": "com.huawei.weather.testWidget5B"
+                  "value": "com.openharmony.weather.testWidget5B"
                 }
               ]
             },
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/src/main/config.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/src/main/config.json
index 92ee7db34..59ca1fcd4 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/src/main/config.json
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/src/main/config.json
@@ -66,7 +66,7 @@
               "customizeData": [
                 {
                   "name": "originWidgetName1",
-                  "value": "com.huawei.weather.testWidget1"
+                  "value": "com.openharmony.weather.testWidget1"
                 }
               ]
             },
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/src/main/config.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/src/main/config.json
index 1a1c2190b..dd6bd5b2a 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/src/main/config.json
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/src/main/config.json
@@ -65,7 +65,7 @@
               "customizeData": [
                 {
                   "name": "originWidgetNameA1",
-                  "value": "com.huawei.weather.testWidgetA1"
+                  "value": "com.openharmony.weather.testWidgetA1"
                 }
               ]
             },
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/src/main/config.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/src/main/config.json
index 44caf031d..ebe803a89 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/src/main/config.json
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/src/main/config.json
@@ -61,7 +61,7 @@
               "customizeData": [
                 {
                   "name": "originWidgetName4A",
-                  "value": "com.huawei.weather.testWidget4A"
+                  "value": "com.openharmony.weather.testWidget4A"
                 }
               ]
             },
@@ -83,7 +83,7 @@
               "customizeData": [
                 {
                   "name": "originWidgetName4B",
-                  "value": "com.huawei.weather.testWidget4B"
+                  "value": "com.openharmony.weather.testWidget4B"
                 }
               ]
             },
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/src/main/config.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/src/main/config.json
index 06a9c8975..8b8f72123 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/src/main/config.json
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/src/main/config.json
@@ -52,7 +52,7 @@
               "customizeData": [
                 {
                   "name": "originWidgetName1S",
-                  "value": "com.huawei.weather.testWidget1S"
+                  "value": "com.openharmony.weather.testWidget1S"
                 }
               ]
             },
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/src/main/config.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/src/main/config.json
index c00f7a3ae..ad832022b 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/src/main/config.json
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/src/main/config.json
@@ -52,7 +52,7 @@
               "customizeData": [
                 {
                   "name": "originWidgetName1V",
-                  "value": "com.huawei.weather.testWidget1V"
+                  "value": "com.openharmony.weather.testWidget1V"
                 }
               ]
             },
@@ -74,7 +74,7 @@
               "customizeData": [
                 {
                   "name": "originWidgetName1V2",
-                  "value": "com.huawei.weather.testWidget1V2"
+                  "value": "com.openharmony.weather.testWidget1V2"
                 }
               ]
             },
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/src/main/config.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/src/main/config.json
index 96b253543..60b95c5cc 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/src/main/config.json
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/src/main/config.json
@@ -67,7 +67,7 @@
               "customizeData": [
                 {
                   "name": "originWidgetName3",
-                  "value": "com.huawei.weather.testWidget3"
+                  "value": "com.openharmony.weather.testWidget3"
                 }
               ]
             },
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn
index ddcb136a9..e3bbd4cee 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/src/main/config.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/src/main/config.json
index 66293979a..e7c204192 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/src/main/config.json
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/src/main/config.json
@@ -52,7 +52,7 @@
               "customizeData": [
                 {
                   "name": "originWidgetName1",
-                  "value": "com.huawei.weather.testWidget1"
+                  "value": "com.openharmony.weather.testWidget1"
                 }
               ]
             },
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn
index 02f4d753c..ded8e46f0 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn
index 32936290d..7881a0bad 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn
index 16631f9e8..dcca89660 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/src/main/config.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/src/main/config.json
index c3b302c17..5dbdecb14 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/src/main/config.json
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/src/main/config.json
@@ -52,7 +52,7 @@
               "customizeData": [
                 {
                   "name": "originWidgetNameA1",
-                  "value": "com.huawei.weather.testWidgetA1"
+                  "value": "com.openharmony.weather.testWidgetA1"
                 }
               ]
             },
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn
index b0e5398ec..013e126a0 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn
index e24e97b77..23a52378b 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn
index 793f25b46..15f34948d 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn
index a0a4d6c1b..07e7c48f8 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn
index 1de8fdf03..c17bfce1b 100644
--- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn
+++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (C) 2021 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/appexecfwk_lite/appexecfwk_posix/src/BundleMgrTest.cpp b/appexecfwk_lite/appexecfwk_posix/src/BundleMgrTest.cpp
index f3008a606..82dda1b72 100755
--- a/appexecfwk_lite/appexecfwk_posix/src/BundleMgrTest.cpp
+++ b/appexecfwk_lite/appexecfwk_posix/src/BundleMgrTest.cpp
@@ -869,8 +869,8 @@ HWTEST_F(BundleMgrTest, testGetBundleSizeWithLegal_0001, Function | MediumTest |
 HWTEST_F(BundleMgrTest, testGetBundleSizeWithLegal_0002, Function | MediumTest | Level1)
 {
     printf("------start testGetBundleSizeWithLegal_0002------\n");
-    char *bundleName = (char*)"com.openharmony.testjsdemoBundleNamelengthequalto127" \
-"testjsdemoBundleNamelengthequalto127testjsdemoBundleNamelengthequalto127testjsde";
+    char *bundleName = (char*)"com.openharmony.testjsdemoBundleNameleng" \
+"thequalto127testjsdemoBundleNamelengthequalto127testjsdemoBundleNamelengthequalto127tes";
     sem_init(&g_sem, 0, 0);
     InstallParam installParam = {.installLocation = 1,.keepData = false };
     string hapPath = g_testPath + "testGetBundleNameWithLegal127.hap";
@@ -895,7 +895,7 @@ HWTEST_F(BundleMgrTest, testGetBundleSizeWithIllegal_0001, Function | MediumTest
 {
     printf("------start testGetBundleSizeWithIllegal_0001------\n");
     char *bundleName = (char*)"com.openharmony.testjsdemoBundleNameLength128test" \
-"jsdemoBundleNameLength128testjsdemoBundleNameLength128testjsdemoBundleNameLength128T";
+"jsdemoBundleNameLength128testjsdemoBundleNameLength128testjsdemoBundleNameLengt";
     EXPECT_EQ(strlen(bundleName), 128);
     uint32_t resultCode = GetBundleSize(bundleName);
     EXPECT_EQ(resultCode, 0);
diff --git a/utils_lite/kv_store_posix/src/KvStoreTest.cpp b/utils_lite/kv_store_posix/src/KvStoreTest.cpp
index eda16e0ab..60f8edf8a 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.huawei.kv", S_IRUSR | S_IWUSR);
-        printf("/storage/com.huawei.kv ret = %d\n", ret);
-        ret = UtilsSetEnv("/storage/com.huawei.kv");
+        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");
         EXPECT_EQ(ret, 0);
     }
     // TearDownTestCase：测试套清理动作，在最后一个TestCase之后执行
     static void TearDownTestCase(void)
     {
-        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);
+        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);
         printf("----------test case with KvStoreTest end-------------\n");
     }
     // 用例的预置动作
-- 
GitLab