!5025 【Distributeddatamgr】【monthly_20220816】新增stage模型用例，新接口覆盖率补齐

Merge pull request !5025 from 梁梁/cherry-pick-1660805147

distributeddatamgr/BUILD.gn

@@ -18,7 +18,7 @@ group("distributeddatamgr") {
     deps = [
       "dataObjectjstest/hap:dataObject_js_test",
       "dataSharejstest/hap:dataShare_js_test",
-      "kvStorejstest/hap:kvStore_js_test",
+      "kvStoretest:kvStoretest",
       "preferencesjstest/hap:preferences_js_test",
       "relationalStorejstest/hap:relationalstore_js_test",
     ]

distributeddatamgr/kvStoretest/BUILD.gn

+# Copyright (c) 2022 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//test/xts/tools/build/suite.gni")
+
+group("kvStoretest") {
+  testonly = true
+  if (is_standard_system) {
+    deps = [
+      "kvStoreStagetest:ActsKvStoreStageTest",
+      "kvStorejstest/hap:kvStore_js_test",
+    ]
+  }
+}

distributeddatamgr/kvStoretest/kvStoreStagetest/AppScope/app.json

+{
+  "app": {
+    "bundleName": "ohos.acts.kvStoreStage",
+    "vendor": "example",
+    "versionCode": 1000000,
+    "versionName": "1.0.0",
+    "icon": "$media:app_icon",
+    "label": "$string:app_name",
+	"debug": false,
+    "distributedNotificationEnabled": true,
+	   "keepAlive": true,
+        "singleUser": true,
+        "minAPIVersion": 9,
+        "targetAPIVersion": 9,
+        "car": {
+            "apiCompatibleVersion": 9,
+            "singleUser": false
+        }
+  }
+}

distributeddatamgr/kvStoretest/kvStoreStagetest/AppScope/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "MyApplication2"
+    }
+  ]
+}

distributeddatamgr/kvStoretest/kvStoreStagetest/BUILD.gn

+# Copyright (c) 2022 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("ActsKvStoreStageTest") {
+  hap_profile = "entry/src/main/module.json"
+  js_build_mode = "debug"
+  deps = [
+    ":kvStoreStage_js_assets",
+    ":kvStoreStage_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "signature/openharmony_sx.p7b"
+  hap_name = "ActsKvStoreStageTest"
+  subsystem_name = "distributeddatamgr"
+  part_name = "distributeddatamgr"
+}
+
+ohos_app_scope("kvStoreStage_app_profile") {
+  app_profile = "AppScope/app.json"
+  sources = [ "AppScope/resources" ]
+}
+
+ohos_js_assets("kvStoreStage_js_assets") {
+  source_dir = "entry/src/main/ets"
+}
+
+ohos_resources("kvStoreStage_resources") {
+  sources = [ "entry/src/main/resources" ]
+  deps = [ ":kvStoreStage_app_profile" ]
+  hap_profile = "entry/src/main/module.json"
+}

distributeddatamgr/kvStoretest/kvStoreStagetest/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+    "driver": {
+        "type": "OHJSUnitTest",
+        "test-timeout": "180000",
+        "bundle-name": "ohos.acts.kvStoreStage",
+        "module-name": "entry",
+        "shell-timeout": "600000",
+        "testcase-timeout": 70000
+    },
+    "kits": [{
+        "test-file-name": [
+            "ActsKvStoreStageTest.hap"
+        ],
+        "type": "AppInstallKit",
+        "cleanup-apps": true
+    }]
+}
\ No newline at end of file

distributeddatamgr/kvStoretest/kvStoreStagetest/entry/src/main/ets/Application/AbilityStage.ts

+/*
+* Copyright (c) 2022 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
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+import AbilityStage from "@ohos.application.AbilityStage"
+
+export default class MyAbilityStage extends AbilityStage {
+    onCreate() {
+        console.log("[Demo] MyAbilityStage onCreate")
+    }
+}
\ No newline at end of file

distributeddatamgr/kvStoretest/kvStoreStagetest/entry/src/main/ets/MainAbility/MainAbility.ts

+/*
+* Copyright (c) 2022 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
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+import Ability from '@ohos.application.Ability'
+import dataShare from '@ohos.data.dataShare'
+import rpc from "@ohos.rpc";
+
+var seConnect = {
+    onConnect:function (elementName, proxy) {
+        console.log("[ttt] [DataShareTest] <<Consumer>> seConnect onConnect called.");
+        console.log("[ttt] [DataShareTest] <<Consumer>> seConnect onConnect elementName = " + elementName);
+        console.log("[ttt] [DataShareTest] <<Consumer>> seConnect onConnect proxy = " + proxy);
+         let data = rpc.MessageParcel.create();
+         let reply = rpc.MessageParcel.create();
+         let option = new rpc.MessageOption();
+         data.writeInterfaceToken("connect-test");
+         data.writeInt(111);
+
+         console.log("[ttt] [DataShareTest] <<Consumer>> seConnect onConnect sendRequest.");
+         proxy.sendRequest(1, data, reply, option)
+             .then(function (result) {
+                 if (result.errCode === 0) {
+                     // let msg = reply.readString();
+                     let msg = result.reply.readInt();
+                     console.log("[ttt] [DataShareTest] <<Consumer>> seConnect reply msg: " + msg);
+                 } else {
+                     console.log("[ttt] [DataShareTest] <<Consumer>> seConnect sendRequest failed, errCode: " + result.errCode);
+                 }
+                 // callback没有返回值，默认返回undefined
+             }).catch(function (e) {
+             console.log("[ttt] [DataShareTest] <<Consumer>> seConnect sendRequest got exception: " + e);
+         }).finally (async () => {
+             console.log("[ttt] [DataShareTest] <<Consumer>> seConnect sendRequest ends, reclaim parcel");
+             data.reclaim();
+             reply.reclaim();
+         })
+    },
+    onDisconnect:function (elementName) {
+        console.log("[ttt] [DataShareTest] <<Consumer>> seConnect onDisconnect");
+    },
+    onFailed:function (code) {
+        console.log("[ttt] [DataShareTest] <<Consumer>> seConnect onFailed");
+    }
+};
+
+let dseProxy = 0;
+let dseUri = ("datashare:///com.samples.datasharekvtest.DataShare");
+
+var dseConnect = {
+    onConnect:function (elementName, proxy) {
+        console.log("[ttt] [DataShareTest] <<Consumer>> dseConnect onConnect called.");
+        // console.log("[ttt] [DataShareTest] <<Consumer>> dseConnect onConnect elementName = " + elementName);
+        // console.log("[ttt] [DataShareTest] <<Consumer>> dseConnect onConnect proxy = " + proxy);
+        dseProxy = proxy;
+    },
+    onDisconnect:function (elementName) {
+        console.log("[ttt] [DataShareTest] <<Consumer>> dseConnect onDisconnect, elementName:" + elementName);
+    },
+    onFailed:function (code) {
+        console.log("[ttt] [DataShareTest] <<Consumer>> dseConnect onFailed, code:" + code);
+    }
+};
+
+let seConnectionId = -1;
+let dseConnectionId = -1;
+
+let seWant = {
+    "bundleName": "com.samples.datasharetest",
+    "abilityName": "ServiceExtAbility",
+}
+
+let dseWant = {
+    "bundleName": "com.samples.datasharetest",
+    "abilityName": "DataShareExtAbility",
+}
+
+export function onCallback() {
+    console.info("[ttt] [DataShareTest] <<Consumer>> **** Observer on callback ****");
+}
+
+export function offCallback() {
+    console.info("[ttt] [DataShareTest] <<Consumer>> **** Observer off callback ****");
+}
+
+export default class MainAbility extends Ability {
+    onCreate(want, launchParam) {
+        // Ability is creating, initialize resources for this ability
+        console.log("[ttt] [DataShareTest] <<Consumer>> MainAbility onCreate")
+        globalThis.abilityWant = want;
+    }
+
+    onDestroy() {
+        // Ability is destroying, release resources for this ability
+        console.log("[ttt] [DataShareTest] <<Consumer>> MainAbility onDestroy")
+    }
+
+    onWindowStageCreate(windowStage) {
+        // Main window is created, set main page for this ability
+        console.log("[ttt] [DataShareTest] <<Consumer>> MainAbility onWindowStageCreate")
+        globalThis.abilityContext = this.context;
+        let context = this.context;
+        dseConnectionId = context.connectAbility(dseWant, dseConnect);
+        globalThis.connectDataShareExtAbility = (async () => {
+            console.log("[ttt] [DataShareTest] <<Consumer>> connectDataShareExtAbility begin");
+            await dataShare.createDataShareHelper(globalThis.abilityContext, dseUri, (err,data)=>{
+                globalThis.helper = data;
+                globalThis.testhelper = data;
+                console.info("[ttt] [DataShareTest] <<Consumer>> ----- 1 -----, globalThis.helper = " + globalThis.helper);
+                console.info("[ttt] [DataShareTest] <<Consumer>> ----- 2 -----, data = " + data);
+                console.info("[ttt] [DataShareTest] <<Consumer>> ----- 3 -----, err = " + err);
+                console.info("[ttt] [DataShareTest] <<Consumer>> ----- 4 -----, JSON.stringify(err) = " + JSON.stringify(err));
+            });
+            dseConnectionId = await context.connectAbility(dseWant, dseConnect);
+        })
+        windowStage.setUIContent(this.context, "MainAbility/pages/index", null)
+    }
+
+    onWindowStageDestroy() {
+        // Main window is destroyed, release UI related resources
+        console.log("[ttt] [DataShareTest] <<Consumer>> MainAbility onWindowStageDestroy")
+    }
+
+    onForeground() {
+        // Ability has brought to foreground
+        console.log("[ttt] [DataShareTest] <<Consumer>> MainAbility onForeground")
+    }
+
+    onBackground() {
+        // Ability has back to background
+        console.log("[ttt] [DataShareTest] <<Consumer>> MainAbility onBackground")
+    }
+};

distributeddatamgr/kvStoretest/kvStoreStagetest/entry/src/main/ets/MainAbility/pages/index.ets

+/*
+* Copyright (c) 2022 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
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+import file from '@system.file';
+import router from '@ohos.router';
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../../test/List.test'
+
+//InstrumentLog, ReportExtend
+
+@Entry
+@Component
+struct Index {
+
+  aboutToAppear(){
+    console.info("start run testcase!!!!")
+    var abilityDelegator: any
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments: any
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+  }
+
+  build() {
+    Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) {
+      Text('Hello World')
+        .fontSize(50)
+        .fontWeight(FontWeight.Bold)
+      Button() {
+        Text('next page')
+          .fontSize(25)
+          .fontWeight(FontWeight.Bold)
+      }.type(ButtonType.Capsule)
+      .margin({
+        top: 20
+      })
+      .backgroundColor('#0D9FFB')
+      .onClick(() => {
+
+      })
+    }
+    .width('100%')
+    .height('100%')
+  }
+}
\ No newline at end of file

distributeddatamgr/kvStoretest/kvStoreStagetest/entry/src/main/ets/TestAbility/TestAbility.ts

+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import Ability from '@ohos.application.Ability'
+
+export default class TestAbility extends Ability {
+    onCreate(want, launchParam) {
+        console.log('TestAbility onCreate')
+    }
+
+    onDestroy() {
+        console.log('TestAbility onDestroy')
+    }
+
+    onWindowStageCreate(windowStage) {
+        console.log('TestAbility onWindowStageCreate')
+        windowStage.loadContent("TestAbility/pages/index", (err, data) => {
+            if (err.code) {
+                console.error('Failed to load the content. Cause:' + JSON.stringify(err));
+                return;
+            }
+            console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data))
+        });
+
+        globalThis.abilityContext = this.context;
+    }
+
+    onWindowStageDestroy() {
+        console.log('TestAbility onWindowStageDestroy')
+    }
+
+    onForeground() {
+        console.log('TestAbility onForeground')
+    }
+
+    onBackground() {
+        console.log('TestAbility onBackground')
+    }
+};
\ No newline at end of file

distributeddatamgr/kvStoretest/kvStoreStagetest/entry/src/main/ets/TestAbility/pages/index.ets

+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import router from '@ohos.router';
+
+@Entry
+@Component
+struct Index {
+  aboutToAppear() {
+    console.info('TestAbility index aboutToAppear')
+  }
+ @State message: string = 'Hello World'
+   build() {
+         Row() {
+           Column() {
+             Text(this.message)
+               .fontSize(50)
+               .fontWeight(FontWeight.Bold)
+             Button() {
+               Text('next page')
+                 .fontSize(20)
+                 .fontWeight(FontWeight.Bold)
+             }.type(ButtonType.Capsule)
+             .margin({
+               top: 20
+             })
+             .backgroundColor('#0D9FFB')
+             .width('35%')
+             .height('5%')
+             .onClick(()=>{
+             })
+           }
+             .width('100%')
+         }
+             .height('100%')
+   }
+ }
\ No newline at end of file

distributeddatamgr/kvStoretest/kvStoreStagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import TestRunner from '@ohos.application.testRunner'
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+var abilityDelegator = undefined
+var abilityDelegatorArguments = undefined
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s it',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams = `${targetParams} ${key} ${parameters[key]}`
+        }
+    }
+    return targetParams.trim()
+}
+
+async function onAbilityCreateCallback() {
+    console.log("onAbilityCreateCallback");
+}
+
+async function addAbilityMonitorCallback(err: any) {
+    console.info("addAbilityMonitorCallback : " + JSON.stringify(err))
+}
+
+export default class OpenHarmonyTestRunner implements TestRunner {
+    constructor() {
+    }
+
+    onPrepare() {
+        console.info("OpenHarmonyTestRunner OnPrepare ")
+    }
+
+    async onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility'
+        let lMonitor = {
+            abilityName: testAbilityName,
+            onAbilityCreate: onAbilityCreateCallback,
+        };
+        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
+        var cmd = 'aa start -d 0 -a ohos.acts.kvStoreStage.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd,
+            (err: any, d: any) => {
+                console.info('executeShellCommand : err : ' + JSON.stringify(err));
+                console.info('executeShellCommand : data : ' + d.stdResult);
+                console.info('executeShellCommand : data : ' + d.exitCode);
+            })
+        console.info('OpenHarmonyTestRunner onRun end')
+    }
+};
\ No newline at end of file

distributeddatamgr/kvStoretest/kvStoreStagetest/entry/src/main/ets/test/List.test.ets

+/*
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import kvStoreBackupCallbackJsunittest from './kvStoreBackupCallbackJsunit.test.ets'
+import kvStoreBackupPromiseJsunittest from './kvStoreBackupPromiseJsunit.test.ets'
+export default function testsuite() {
+  kvStoreBackupCallbackJsunittest(globalThis.abilityContext);
+  kvStoreBackupPromiseJsunittest(globalThis.abilityContext);
+}
\ No newline at end of file

distributeddatamgr/kvStoretest/kvStoreStagetest/entry/src/main/ets/test/kvStoreBackupCallbackPublicFunction.test.ets

+/*
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {describe, it, expect} from "@ohos/hypium"
+import distributedData from '@ohos.data.distributedData';
+import deviceManager from '@ohos.distributedHardware.deviceManager';
+import prompt from '@system.prompt';
+
+let BUNDLE_NAME = 'ohos.acts.kvStoreStage';
+
+let STORE_ID = 'kvstoreBackupCallback';
+
+let mKVMgrConfig = {
+    userInfo: {
+        userId: '0',
+        userType: distributedData.UserType.SAME_USER_ID
+    },
+    bundleName: BUNDLE_NAME,
+    context : globalThis.abilityContext
+};
+
+//getKvStore公共方法
+function publicgetKvStore(optionsp){
+    console.log(`TestDFX getKvStore `)
+    return new Promise(function(resolve, reject) {
+        distributedData.createKVManager(mKVMgrConfig, (err, data) => {
+            console.info('TestDFX createKVManager begin')
+            if (err) {
+                console.info('TestDFX createKVManager err = ' + err );
+                reject(err);
+            }
+            console.info('TestDFX createKVManager data = ' + data);
+
+            //            this.log('create success: ' + JSON.stringify(data));
+            globalThis.kvManager = data;
+            data.getKVStore(STORE_ID, optionsp, (err, data) => {
+                console.info('TestDFX getKVStore begin')
+                if (err) {
+                    console.info('TestDFX getKVStore err = ' + err);
+                    reject(err);
+                }
+                console.info('TestDFX getKVStore data = ' + data);
+                globalThis.kvStore = data;
+                resolve(data);
+            });
+        });
+    })
+}
+
+//closeKvStore公共方法
+function publiccloseKvStore() {
+    console.log(`TestDFX closeKvStore `)
+    return new Promise(function (resolve, reject) {
+        globalThis.kvManager.closeKVStore(BUNDLE_NAME, STORE_ID, globalThis.kvStore, (err, data) => {
+            console.info('TestDFX closeKvStore begin')
+            if (err) {
+                console.info('TestDFX closeKvStore err = ' + err);
+                reject(err);
+            }
+            console.info('TestDFX closeKvStore data = ' + data);
+            globalThis.kvManager.deleteKVStore(BUNDLE_NAME, STORE_ID, (err, data) => {
+                console.info('TestDFX deleteKVStore begin')
+                if (err) {
+                    console.info('TestDFX deleteKVStore err = ' + err);
+                    reject(err);
+                }
+                console.info('TestDFX deleteKVStore data = ' + data);
+            });
+        });
+    })
+}
+
+//插入数据公共方法
+function publicput(kvStore,key,value){
+    console.log(`TestDFX put ${JSON.stringify(key,value)}`)
+    return new Promise(function(resolve, reject) {
+        globalThis.kvStore.put(key,value, function(err, data){
+            console.log("TestDFX put task =" + JSON.stringify(data));
+            if (err != undefined) {
+                console.log("TestDFX put err information: " + err );
+                reject(err);
+            }else{
+                resolve(data);
+            }
+        })
+    })
+}
+
+//查询插入数据公共方法
+function publicget(kvStore,key){
+    console.log(`TestDFX get ${JSON.stringify(key)}`)
+    return new Promise(function(resolve, reject) {
+        globalThis.kvStore.get(key, function(err, data){
+            console.log("TestDFX get task =" + JSON.stringify(data));
+            if (err != undefined) {
+                console.log("TestDFX get err information: " + err );
+                reject(err);
+            }else{
+                resolve(data);
+            }
+        })
+    })
+}
+
+//手动备份公共方法
+function publicbackup(kvStore,file){
+    console.log(`TestDFX backup ${JSON.stringify(file)}`)
+    return new Promise(function(resolve, reject) {
+        globalThis.kvStore.backup(file, function(err, data){
+            console.log("TestDFX backup task =" + data);
+            if (err != undefined) {
+                console.log("TestDFX backup err information: " + err );
+                reject(err);
+            }else{
+                resolve(data);
+            }
+        })
+    })
+}
+
+//删除公共方法
+function publicdeleteBackup(kvStore,files){
+    console.log(`TestDFX deleteBackup ${JSON.stringify(files)}`)
+    return new Promise(function(resolve, reject) {
+        globalThis.kvStore.deleteBackup(files, function(err, data){
+            console.log("TestDFX deleteBackup BackUpInfo =" + data);
+            if (err != undefined) {
+                console.log("TestDFX deleteBackup err information: " + err );
+                reject(err);
+            }else{
+                var devices =new Array();
+                devices = data;
+                globalThis.delresult = devices;
+                console.log("TestDFX deleteBackup pass ");
+                resolve(data);
+            }
+        })
+    })
+}
+
+//恢复到指定版本公共方法
+function publicrestoresp(kvStore,file){
+    console.log(`TestDFX restoresp ${JSON.stringify(file)}`)
+    return new Promise(function(resolve, reject) {
+        globalThis.kvStore.restore(file, function(err, data){
+            console.log("TestDFX restoresp task =" + JSON.stringify(data));
+            if (err != undefined) {
+                console.log("TestDFX restoresp err information: " + err );
+                reject(err);
+            }else{
+                console.log("TestDFX restoresp backupinfo information: " + JSON.stringify(data) );
+                resolve(data);
+            }
+        })
+    })
+}
+
+//恢复到最近的备份公共方法
+function publicrestore(kvStore){
+    console.log(`TestDFX restore `)
+    return new Promise(function(resolve, reject) {
+        globalThis.kvStore.restore(function(err,data){
+            console.log("TestDFX restore task =" + JSON.stringify(data));
+            if (err != undefined) {
+                console.log("TestDFX restore err information: " + err );
+                reject(err);
+            }else{
+                console.log("TestDFX restore backupinfo information: " + JSON.stringify(data) );
+                resolve(data);
+            }
+        })
+    })
+}
+
+
+export{publicgetKvStore,publicput,publicget,publicbackup,publicdeleteBackup,publicrestoresp,publicrestore,publiccloseKvStore}
\ No newline at end of file

distributeddatamgr/kvStoretest/kvStoreStagetest/entry/src/main/ets/test/kvStoreBackupPromisePublicFunction.test.ets

+/*
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {describe, it, expect} from "@ohos/hypium"
+import distributedData from '@ohos.data.distributedData';
+import deviceManager from '@ohos.distributedHardware.deviceManager';
+import prompt from '@system.prompt';
+
+let BUNDLE_NAME = 'ohos.acts.kvStoreStage';
+
+let STORE_ID = 'kvstoreBackupPromise';
+
+let mKVMgrConfig = {
+    userInfo: {
+        userId: '0',
+        userType: distributedData.UserType.SAME_USER_ID
+    },
+    bundleName: BUNDLE_NAME,
+    context : globalThis.abilityContext
+};
+
+//getKvStore公共方法
+function publicgetKvStore(optionsp){
+    console.log(`TestDFX getKvStore `)
+    return new Promise(function(resolve, reject) {
+        distributedData.createKVManager(mKVMgrConfig, (err, data) => {
+            console.info('TestDFX createKVManager begin')
+            if (err) {
+                console.info('TestDFX createKVManager err = ' + err );
+                reject(err);
+            }
+            console.info('TestDFX createKVManager data = ' + data);
+
+            //            this.log('create success: ' + JSON.stringify(data));
+            globalThis.kvManager = data;
+            data.getKVStore(STORE_ID, optionsp, (err, data) => {
+                console.info('TestDFX getKVStore begin')
+                if (err) {
+                    console.info('TestDFX getKVStore err = ' + err);
+                    reject(err);
+                }
+                console.info('TestDFX getKVStore data = ' + data);
+                globalThis.kvStore = data;
+                resolve(data);
+            });
+        });
+    })
+}
+
+//closeKvStore公共方法
+function publiccloseKvStore() {
+    console.log(`TestDFX closeKvStore `)
+    return new Promise(function (resolve, reject) {
+        globalThis.kvManager.closeKVStore(BUNDLE_NAME, STORE_ID, globalThis.kvStore, (err, data) => {
+            console.info('TestDFX closeKvStore begin')
+            if (err) {
+                console.info('TestDFX closeKvStore err = ' + err);
+                reject(err);
+            }
+            console.info('TestDFX closeKvStore data = ' + data);
+            globalThis.kvManager.deleteKVStore(BUNDLE_NAME, STORE_ID, (err, data) => {
+                console.info('TestDFX deleteKVStore begin')
+                if (err) {
+                    console.info('TestDFX deleteKVStore err = ' + err);
+                    reject(err);
+                }
+                console.info('TestDFX deleteKVStore data = ' + data);
+            });
+        });
+    })
+}
+
+//插入数据公共方法
+function publicput(kvStore,key,value){
+    console.log(`TestDFX put ${JSON.stringify(key,value)}`)
+    return new Promise(function(resolve, reject) {
+        globalThis.kvStore.put(key,value, function(err, data){
+            console.log("TestDFX put task =" + JSON.stringify(data));
+            if (err != undefined) {
+                console.log("TestDFX put err information: " + err );
+                reject(err);
+            }else{
+                resolve(data);
+            }
+        })
+    })
+}
+
+//查询插入数据公共方法
+function publicget(kvStore,key){
+    console.log(`TestDFX get ${JSON.stringify(key)}`)
+    return new Promise(function(resolve, reject) {
+        globalThis.kvStore.get(key, function(err, data){
+            console.log("TestDFX get task =" + JSON.stringify(data));
+            if (err != undefined) {
+                console.log("TestDFX get err information: " + err );
+                reject(err);
+            }else{
+                resolve(data);
+            }
+        })
+    })
+}
+
+//手动备份公共方法
+function publicbackup(kvStore,file){
+    console.log(`TestDFX backup ${JSON.stringify(file)}`)
+    return new Promise(function(resolve, reject) {
+        globalThis.kvStore.backup(file).then((data) => {
+            console.log("TestDFX backup task =" + data);
+            resolve(data);
+        }).catch((err) => {
+            console.log("TestDFX backup err information: " + err);
+            reject(err);
+        })
+    })
+}
+
+//删除公共方法
+function publicdeleteBackup(kvStore,files) {
+    console.log(`TestDFX deleteBackup ${JSON.stringify(files)}`)
+    return new Promise(function (resolve, reject) {
+        globalThis.kvStore.deleteBackup(files).then((data) => {
+            console.log("TestDFX deleteBackup BackUpInfo =" + data);
+            var devices = new Array();
+            devices = data;
+            globalThis.delresult = devices;
+            console.log("TestDFX deleteBackup pass ");
+            resolve(data);
+        }).catch((err) => {
+            console.log("test deleteBackup err information: " + err);
+            reject(err);
+        })
+    })
+}
+
+//恢复到指定版本公共方法
+function publicrestoresp(kvStore,file){
+    console.log(`TestDFX restoresp ${JSON.stringify(file)}`)
+    return new Promise(function(resolve, reject) {
+        globalThis.kvStore.restore(file).then((data) => {
+            console.log("TestDFX restoresp backupinfo information: " + JSON.stringify(data));
+            resolve(data);
+        }).catch((err) => {
+            console.log("TestDFX restoresp err information: " + err  );
+            reject(err);
+        })
+    })
+}
+
+//恢复到最近的备份公共方法
+function publicrestore(kvStore){
+    console.log(`TestDFX restore `)
+    return new Promise(function(resolve, reject) {
+        globalThis.kvStore.restore.then((data) => {
+            console.log("TestDFX restore backupinfo information: " + JSON.stringify(data) );
+            resolve(data);
+        }).catch((err) => {
+            console.log("TestDFX restore err information: " + err );
+            reject(err);
+        })
+    })
+}
+export{publicgetKvStore,publicput,publicget,publicbackup,publicdeleteBackup,publicrestoresp,publicrestore,publiccloseKvStore}
\ No newline at end of file

distributeddatamgr/kvStoretest/kvStoreStagetest/entry/src/main/module.json

+{
+  "module": {
+    "package": "ohos.acts.kvStoreStage",
+    "name": "entry",
+    "mainAbility": "ohos.acts.kvStoreStage.MainAbility",
+    "type": "entry",
+    "srcEntrance": "./ets/Application/AbilityStage.ts",
+    "description": "$string:entry_desc",
+    "mainElement": "MainAbility",
+    "deviceTypes": [
+      "phone"
+    ],
+    "deliveryWithInstall": true,
+    "installationFree": false,
+    "pages": "$profile:main_pages",
+    "uiSyntax": "ets",
+    "abilities": [
+      {
+        "name": "ohos.acts.kvStoreStage.MainAbility",
+        "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+        "description": "$string:MainAbility_desc",
+        "icon": "$media:icon",
+        "label": "$string:MainAbility_label",
+        "visible": true,
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ]
+      }
+    ]
+  }
+}

distributeddatamgr/kvStoretest/kvStoreStagetest/entry/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "entry_desc",
+      "value": "description"
+    },
+    {
+      "name": "MainAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "MainAbility_label",
+      "value": "ActsKvStoreStageTest"
+    }
+  ]
+}
\ No newline at end of file

distributeddatamgr/kvStoretest/kvStoreStagetest/entry/src/main/resources/base/profile/main_pages.json

+{
+  "src": [
+    "MainAbility/pages/index"
+  ]
+}

distributeddatamgr/kvStorejstest/hap/src/main/js/test/FieldNodeJsunit.test.js → distributeddatamgr/kvStoretest/kvStorejstest/hap/src/main/js/test/FieldNodeJsunit.test.js

@@ -169,7 +169,7 @@ describe('fieldNodeTest', function() {
      it('testtype001', 0, async function(done) {
         try {
             let node = new ddm.FieldNode('first');
-            node.type = ddm.type.STRING;
+            node.type = ddm.value.type.STRING;
             console.info('type = ' + node.type);
             expect(node.type === ddm.type.STRING).assertTrue()
         } catch (e) {

distributeddatamgr/kvStorejstest/hap/src/main/js/test/KvManagerCallbackJsunit.test.js → distributeddatamgr/kvStoretest/kvStorejstest/hap/src/main/js/test/KvManagerCallbackJsunit.test.js

@@ -887,6 +887,9 @@ describe('kvManagerCallbackTest', function () {
                 kvStore = store;
                 try {
                     await kvManager.getAllKVStoreId(TEST_BUNDLE_NAME, function (err, data) {
+                        console.info('testKVManagerGetAllKVStoreId002 getKVStore success');
+                        console.info('testKVManagerGetAllKVStoreId002 getkvmanager success: ' + kvManager)
+                        console.info('testKVManagerGetAllKVStoreId002 get kvstore: ' + store)
                         console.info('testKVManagerGetAllKVStoreId102 getAllKVStoreId success');
                         console.info('testKVManagerGetAllKVStoreId102 size = ' + data.length);
                         expect(1).assertEqual(data.length);