<yanglifeng5@huawei.com>

Signed-off-by: Nyanglifeng1217 <yanglifeng5@huawei.com>

distributeddatamgr/BUILD.gn

@@ -16,15 +16,16 @@ group("distributeddatamgr") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "appdatamgrjstest/hap:appdatamgr_js_test",
-      "distributeddataObjectjstest/hap:distributeddataObject_js_test",
-      "distributeddatamgrjstest/hap:distributeddatamgr_js_test",
-      "windowStage:windowStage",
+      "dataObjectjstest/hap:dataObject_js_test",
+      "dataShare:dataShare",
+      "kvStorejstest/hap:kvStore_js_test",
+      "preferencesjstest/hap:preferences_js_test",
+      "relationalStorejstest/hap:relationalstore_js_test",
     ]
   } else {
     deps = [
-      "appdatamgrtest/hap:appdatamgrfunctest_hap",
-      "distributeddatamgrtest/hap:distributeddatamgrfunctest_hap",
+      "kvStorejstest/hap:distributeddatamgrfunctest_hap",
+      "relationalStorejstest/hap:appdatamgrfunctest_hap",
       "searchtest/hap:searchfunctest_hap",
     ]
   }

distributeddatamgr/distributeddataObjectjstest/hap/BUILD.gn → distributeddatamgr/dataObjectjstest/hap/BUILD.gn

@@ -13,21 +13,23 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("distributeddataObject_js_test") {
+ohos_js_hap_suite("dataObject_js_test") {
   hap_profile = "./src/main/config.json"
   deps = [
-    ":distributeddataObject_js_assets",
-    ":distributeddataObject_resources",
+    ":dataObject_js_assets",
+    ":dataObject_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsDistributedDataObjectJsTest"
+  hap_name = "ActsDataObjectJsTest"
+  subsystem_name = "distributeddatamgr"
+  part_name = "data_object"
 }
-ohos_js_assets("distributeddataObject_js_assets") {
+ohos_js_assets("dataObject_js_assets") {
   js2abc = true
   hap_profile = "./src/main/config.json"
   source_dir = "./src/main/js"
 }
-ohos_resources("distributeddataObject_resources") {
+ohos_resources("dataObject_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
 }

distributeddatamgr/distributeddataObjectjstest/hap/Test.json → distributeddatamgr/dataObjectjstest/hap/Test.json

@@ -4,13 +4,13 @@
         "type": "OHJSUnitTest",
         "test-timeout": "1200000",
         "shell-timeout": "1200000",
-        "bundle-name": "ohos.acts.distributeddataObject",
-        "package-name": "ohos.acts.distributeddataObject"
+        "bundle-name": "ohos.acts.dataObject",
+        "package-name": "ohos.acts.dataObject"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsDistributedDataObjectJsTest.hap"
+                "ActsDataObjectJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

distributeddatamgr/distributeddataObjectjstest/hap/src/main/config.json → distributeddatamgr/dataObjectjstest/hap/src/main/config.json

 {
     "app": {
-        "bundleName": "ohos.acts.distributeddataObject",
+        "bundleName": "ohos.acts.dataObject",
         "vendor": "example",
         "version": {
             "code": 1000000,
@@ -13,7 +13,7 @@
     },
     "deviceConfig": {},
     "module": {
-        "package": "ohos.acts.distributeddataObject",
+        "package": "ohos.acts.dataObject",
         "name": ".entry",
         "mainAbility": ".MainAbility",
         "deviceType": [

distributeddatamgr/windowStage/BUILD.gn → distributeddatamgr/dataShare/BUILD.gn

@@ -13,11 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-group("windowStage") {
+group("dataShare") {
   testonly = true
   if (is_standard_system) {
     deps = [
+      "dataShareKvtest:ActsDataShareKvTest",
       "dataShareRdbtest:ActsDataShareRdbTest",
+      "dataSharejstest/hap:dataShare_js_test",
+      "server/kvService:ActsKvServiceHap",
       "server/rdbService:ActsRdbServiceHap",
     ]
   }

distributeddatamgr/dataShare/dataShareKvtest/AppScope/app.json

+{
+  "app": {
+    "bundleName": "com.example.myapplication2",
+    "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/dataShare/dataShareKvtest/AppScope/resources/base/element/string.json

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

distributeddatamgr/dataShare/dataShareKvtest/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("ActsDataShareKvTest") {
+  hap_profile = "entry/src/main/module.json"
+  js_build_mode = "debug"
+  deps = [
+    ":dataShareKv_js_assets",
+    ":dataShareKv_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "signature/openharmony_sx.p7b"
+  hap_name = "ActsDataShareKvTest"
+  subsystem_name = "distributeddatamgr"
+  part_name = "data_share"
+}
+
+ohos_app_scope("dataShareKv_app_profile") {
+  app_profile = "AppScope/app.json"
+  sources = [ "AppScope/resources" ]
+}
+
+ohos_js_assets("dataShareKv_js_assets") {
+  source_dir = "entry/src/main/ets"
+}
+
+ohos_resources("dataShareKv_resources") {
+  sources = [ "entry/src/main/resources" ]
+  deps = [ ":dataShareKv_app_profile" ]
+  hap_profile = "entry/src/main/module.json"
+}

distributeddatamgr/dataShare/dataShareKvtest/Test.json

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

distributeddatamgr/dataShare/dataShareKvtest/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/dataShare/dataShareKvtest/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/dataShare/dataShareKvtest/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/dataShare/dataShareKvtest/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 com.example.myapplication2.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/dataShare/dataShareKvtest/entry/src/main/ets/test/List.test.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 DataShareSingleKvdb_Callback from "./DataShareSingleKvdb_Callback"
+import DataShareSingleKvdb_Promise from "./DataShareSingleKvdb_Promise"
+import DataSharePredicatesKvdb from "./DataSharePredicatesKvdb"
+import DataShareCombinationKvdb from "./DataShareCombinationKvdb"
+
+export default function testsuite() {
+
+  DataShareSingleKvdb_Callback()
+  DataShareSingleKvdb_Promise()
+  DataSharePredicatesKvdb()
+  DataShareCombinationKvdb()
+}
\ No newline at end of file

distributeddatamgr/dataShare/dataShareKvtest/entry/src/main/module.json

+{
+  "module": {
+    "package": "com.example.myapplication2",
+    "name": "entry",
+    "mainAbility": "com.example.myapplication2.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": "com.example.myapplication2.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/dataShare/dataShareKvtest/entry/src/main/resources/base/element/string.json

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

distributeddatamgr/windowStage/dataShareRdbtest/BUILD.gn → distributeddatamgr/dataShare/dataShareRdbtest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsDataShareRdbTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsDataShareRdbTest"
+  subsystem_name = "distributeddatamgr"
+  part_name = "data_share"
 }
 
 ohos_app_scope("dataShareRdb_app_profile") {

distributeddatamgr/dataShare/dataShareRdbtest/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/dataShare/dataShareRdbtest/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/windowStage/dataShareRdbtest/entry/src/main/ets/test/DataShareCombinationRdb.ets → distributeddatamgr/dataShare/dataShareRdbtest/entry/src/main/ets/test/DataShareCombinationRdb.ets

@@ -293,7 +293,7 @@ export default function DataShareCombinationRdb() {
     * @tc.size      : MediumTest
     * @tc.type      : Function
     * @tc.level     : Level 1
-    */
+*/
     it('DataShareNotifyChangeRdb0101', 1, async function (done) {
       try {
         let Count = 1;

distributeddatamgr/dataShare/dataShareRdbtest/entry/src/main/ets/test/DataSharePublicfunction_Callback.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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium"
+import dataShare from '@ohos.data.dataShare'
+import dataSharePredicates from '@ohos.data.dataSharePredicates'
+import DataShareResultSet from '@ohos.data.DataShareResultSet'
+
+//insert公共方法
+function publicinsert(helper, uri, DataShareValuesBucket) {
+  return new Promise(function (resolve, reject) {
+    helper.insert(uri, DataShareValuesBucket, (err, data) => {
+      console.info("[ttt] [TestDataShare]  publicinsert Callback=" + JSON.stringify(data));
+      globalThis.insertdata = data;
+      if (err) {
+        console.info("test insert err information: " + JSON.stringify(err));
+        reject(err);
+      } else {
+        resolve(data);
+      }
+    })
+  })
+}
+
+//delete公共方法
+async function publicdelete(helper, uri, DataSharePredicates) {
+  return new Promise(function (resolve, reject) {
+    console.info("[ttt] [DataShareTest] <<XTS>> 12345648564185645314");
+    helper.delete(uri, DataSharePredicates, (err, data) => {
+      console.info("[ttt] [TestDataShare] publicdelete Callback=" + JSON.stringify(data));
+      if (err) {
+        console.info("test delete err information: " + JSON.stringify(err));
+        reject(err);
+      } else {
+        resolve(data);
+      }
+    })
+  })
+}
+
+//query公共方法
+function publicquery(helper, uri, DataSharePredicates, columns) {
+  return new Promise(function (resolve, reject) {
+    helper.query(uri, DataSharePredicates, columns, (err, data) => {
+      console.info("[ttt] [TestDataShare]  publicquery Callback=" + JSON.stringify(data));
+      globalThis.ResultSet = data;
+      if (err) {
+        console.info("test query err information: " + JSON.stringify(err));
+        reject(err);
+      } else {
+        resolve(data);
+      }
+    })
+  })
+}
+
+//update公共方法
+function publicupdate(helper, uri, DataSharePredicates, DataShareValuesBucket) {
+  return new Promise(function (resolve, reject) {
+    helper.update(uri, DataSharePredicates, DataShareValuesBucket, (err, data) => {
+      console.info("[ttt] [TestDataShare]  publicupdate Callback=" + JSON.stringify(data));
+      if (err) {
+        console.info("test update err information: " + JSON.stringify(err));
+        reject(err);
+      } else {
+        resolve(data);
+      }
+    })
+  })
+}
+
+//batchInsert公共方法
+function publicbatchInsert(helper, uri, DataShareValuesBucket) {
+  return new Promise(function (resolve, reject) {
+    helper.batchInsert(uri, DataShareValuesBucket, (err, data) => {
+      console.info("[ttt] [TestDataShare]  publicbatchInsert Callback=" + JSON.stringify(data));
+      if (err) {
+        console.info("test batchInsert err information: " + JSON.stringify(err));
+        reject(err);
+      } else {
+        resolve(data);
+      }
+    })
+  })
+}
+
+//getType公共方法
+function publicgetType(helper, uri) {
+  return new Promise(function (resolve, reject) {
+    helper.getType(uri, (err, data) => {
+      console.info("[ttt] [TestDataShare]  publicgetType Callback=" + JSON.stringify(data));
+      if (err) {
+        console.info("test getType err information: " + JSON.stringify(err));
+        reject(err);
+      } else {
+        resolve(data);
+      }
+    })
+  })
+}
+
+//getFileTypes公共方法
+function publicgetFileTypes(helper, uri, mimeTypeFilter) {
+  return new Promise(function (resolve, reject) {
+    helper.getFileTypes(uri, mimeTypeFilter, (err, data) => {
+      console.info("[ttt] [TestDataShare]  publicgetFileTypes Callback=" + JSON.stringify(data));
+      if (err) {
+        console.info("test getFileTypes err information: " + JSON.stringify(err));
+        reject(err);
+      } else {
+        resolve(data);
+      }
+    })
+  })
+}
+
+//normalizeUri公共方法
+function publicnormalizeUri(helper, uri) {
+  return new Promise(function (resolve, reject) {
+    helper.normalizeUri(uri, (err, data) => {
+      console.info("[ttt] [TestDataShare]  publicnormalizeUri Callback=" + JSON.stringify(data));
+      if (err) {
+        console.info("test normalizeUri err information: " + JSON.stringify(err));
+        reject(err);
+      } else {
+        resolve(data);
+      }
+    })
+  })
+}
+
+//denormalizeUri公共方法
+function publicdenormalizeUri(helper, uri) {
+  return new Promise(function (resolve, reject) {
+    helper.denormalizeUri(uri, (err, data) => {
+      console.info("[ttt] [TestDataShare]  publicdenormalizeUri Callback=" + JSON.stringify(data));
+      if (err) {
+        console.info("test denormalizeUri err information: " + JSON.stringify(err));
+        reject(err);
+      } else {
+        resolve(data);
+      }
+    })
+  })
+}
+
+//denormalizeUri公共方法
+function publicopenFile(helper, uri, mode) {
+  return new Promise(function (resolve, reject) {
+    helper.denormalizeUri(uri, mode, (err, data) => {
+      console.info("[ttt] [TestDataShare]  publicopenFile Callback=" + JSON.stringify(data));
+      if (err) {
+        console.info("test openFile err information: " + JSON.stringify(err));
+        reject(err);
+      } else {
+        resolve(data);
+      }
+    })
+  })
+}
+
+export { publicinsert, publicdelete, publicquery, publicupdate, publicbatchInsert, publicgetType, publicgetFileTypes,
+  publicnormalizeUri, publicdenormalizeUri, publicopenFile
+}
\ No newline at end of file

distributeddatamgr/dataShare/dataShareRdbtest/entry/src/main/ets/test/DataSharePublicfunction_Promise.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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium"
+import dataShare from '@ohos.data.dataShare'
+import dataSharePredicates from '@ohos.data.dataSharePredicates'
+import DataShareResultSet from '@ohos.data.DataShareResultSet'
+
+//insert公共方法
+function publicinsert(helper, uri, DataShareValuesBucket) {
+  return new Promise(function (resolve, reject) {
+    helper.insert(uri, DataShareValuesBucket).then((data) => {
+      console.info("[ttt] [TestDataShare]  publicinsert Callback=" + JSON.stringify(data));
+      globalThis.insertdata = data;
+      resolve(data);
+    }).catch((err) => {
+      console.info("test insert err information: " + JSON.stringify(err));
+      reject(err);
+    })
+  })
+}
+
+//delete公共方法
+function publicdelete(helper, uri, DataSharePredicates) {
+  return new Promise(function (resolve, reject) {
+    helper.delete(uri, DataSharePredicates).then((data) => {
+      console.info("[ttt] [TestDataShare]  publicdelete Callback=" + JSON.stringify(data));
+      resolve(data);
+    }).catch((err) => {
+      console.info("test delete err information: " + JSON.stringify(err));
+      reject(err);
+    })
+  })
+}
+
+//query公共方法
+function publicquery(helper, uri, columns, DataSharePredicates) {
+  return new Promise(function (resolve, reject) {
+    helper.query(uri, columns, DataSharePredicates).then((data) => {
+      console.info("[ttt] [TestDataShare]  publicquery Callback=" + JSON.stringify(data));
+      globalThis.ResultSet = data;
+      resolve(data);
+    }).catch((err) => {
+      console.info("test query err information: " + JSON.stringify(err));
+      reject(err);
+    })
+  })
+}
+
+//update公共方法
+function publicupdate(helper, uri, DataShareValuesBucket, DataSharePredicates) {
+  return new Promise(function (resolve, reject) {
+    helper.update(uri, DataShareValuesBucket, DataSharePredicates).then((data) => {
+      console.info("[ttt] [TestDataShare]  publicupdate Callback=" + JSON.stringify(data));
+      resolve(data);
+    }).catch((err) => {
+      console.info("test update err information: " + JSON.stringify(err));
+      reject(err);
+    })
+  })
+}
+
+//batchInsert公共方法
+function publicbatchInsert(helper, uri, DataShareValuesBucket) {
+  return new Promise(function (resolve, reject) {
+    helper.batchInsert(uri, DataShareValuesBucket).then((data) => {
+      console.info("[ttt] [TestDataShare]  publicbatchInsert Callback=" + JSON.stringify(data));
+      resolve(data);
+    }).catch((err) => {
+      console.info("test batchInsert err information: " + JSON.stringify(err));
+      reject(err);
+    })
+  })
+}
+
+//getType公共方法
+function publicgetType(helper, uri) {
+  return new Promise(function (resolve, reject) {
+    helper.getType(uri).then((data) => {
+      console.info("[ttt] [TestDataShare]  publicgetType Callback=" + JSON.stringify(data));
+      resolve(data);
+    }).catch((err) => {
+      console.info("test getType err information: " + JSON.stringify(err));
+      reject(err);
+    })
+  })
+}
+
+//getFileTypes公共方法
+function publicgetFileTypes(helper, uri, mimeTypeFilter) {
+  return new Promise(function (resolve, reject) {
+    helper.getFileTypes(uri, mimeTypeFilter).then((data) => {
+      console.info("[ttt] [TestDataShare]  publicgetFileTypes Callback=" + JSON.stringify(data));
+      resolve(data);
+    }).catch((err) => {
+      console.info("test getFileTypes err information: " + JSON.stringify(err));
+      reject(err);
+    })
+  })
+}
+
+//normalizeUri公共方法
+function publicnormalizeUri(helper, uri) {
+  return new Promise(function (resolve, reject) {
+    helper.normalizeUri(uri).then((data) => {
+      console.info("[ttt] [TestDataShare]  publicnormalizeUri Callback=" + JSON.stringify(data));
+      resolve(data);
+    }).catch((err) => {
+      console.info("test normalizeUri err information: " + JSON.stringify(err));
+      reject(err);
+    })
+  })
+}
+
+//denormalizeUri公共方法
+function publicdenormalizeUri(helper, uri) {
+  return new Promise(function (resolve, reject) {
+    helper.denormalizeUri(uri).then((data) => {
+      console.info("[ttt] [TestDataShare]  publicdenormalizeUri Callback=" + JSON.stringify(data));
+      resolve(data);
+    }).catch((err) => {
+      console.info("test denormalizeUri err information: " + JSON.stringify(err));
+      reject(err);
+    })
+  })
+}
+
+//denormalizeUri公共方法
+function publicopenFile(helper, uri, mode) {
+  return new Promise(function (resolve, reject) {
+    helper.openFile(uri, mode).then((data) => {
+      console.info("[ttt] [TestDataShare]  publicopenFile Callback=" + JSON.stringify(data));
+      resolve(data);
+    }).catch((err) => {
+      console.info("test openFile err information: " + JSON.stringify(err));
+      reject(err);
+    })
+  })
+}
+
+export { publicinsert, publicdelete, publicquery, publicupdate, publicbatchInsert, publicgetType, publicgetFileTypes,
+  publicnormalizeUri, publicdenormalizeUri, publicopenFile
+}
\ No newline at end of file

distributeddatamgr/dataShare/dataShareRdbtest/entry/src/main/resources/base/profile/main_pages.json

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

distributeddatamgr/appdatamgrjstest/hap/BUILD.gn → distributeddatamgr/dataShare/dataSharejstest/hap/BUILD.gn

@@ -13,21 +13,23 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("appdatamgr_js_test") {
+ohos_js_hap_suite("dataShare_js_test") {
   hap_profile = "./src/main/config.json"
   deps = [
-    ":appdatamgr_js_assets",
-    ":appdatamgr_resources",
+    ":dataShare_js_assets",
+    ":dataShare_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAppdatamagrJsTest"
+  hap_name = "ActsDataShareJsTest"
+  subsystem_name = "distributeddatamgr"
+  part_name = "data_share"
 }
-ohos_js_assets("appdatamgr_js_assets") {
+ohos_js_assets("dataShare_js_assets") {
   js2abc = true
   hap_profile = "./src/main/config.json"
   source_dir = "./src/main/js"
 }
-ohos_resources("appdatamgr_resources") {
+ohos_resources("dataShare_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
 }

distributeddatamgr/appdatamgrjstest/hap/Test.json → distributeddatamgr/dataShare/dataSharejstest/hap/Test.json

@@ -4,13 +4,13 @@
         "type": "OHJSUnitTest",
         "test-timeout": "1000000",
         "shell-timeout": "1000000",
-        "bundle-name": "ohos.acts.appdatamgrjstest",
-        "package-name": "ohos.acts.appdatamgrjstest"
+        "bundle-name": "ohos.acts.dataSharejstest",
+        "package-name": "ohos.acts.dataSharejstest"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsAppdatamagrJsTest.hap"
+                "ActsDataShareJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

distributeddatamgr/appdatamgrjstest/hap/src/main/config.json → distributeddatamgr/dataShare/dataSharejstest/hap/src/main/config.json

 {
     "app": {
-        "bundleName": "ohos.acts.appdatamgrjstest",
+        "bundleName": "ohos.acts.dataSharejstest",
         "vendor": "example",
         "version": {
             "code": 1,
@@ -13,7 +13,7 @@
     },
     "deviceConfig": {},
     "module": {
-        "package": "ohos.acts.appdatamgrjstest",
+        "package": "ohos.acts.dataSharejstest",
         "name": ".entry",
         "deviceType": [
             "phone"

distributeddatamgr/dataShare/dataSharejstest/hap/src/main/js/test/List.test.js

+/*
+* 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 dataAbilityPredicatesTest from './DataAbilityPredicatesJsunit.test.js'
+import rdbStoreDataSharePredicatesTest from './RdbStoreDataShareJsunit.test.js'
+export default function testsuite() {
+dataAbilityPredicatesTest()
+rdbStoreDataSharePredicatesTest()
+}

distributeddatamgr/dataShare/server/kvService/AppScope/app.json

+{
+  "app": {
+    "bundleName": "com.samples.datasharekvtest",
+    "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/dataShare/server/kvService/AppScope/resources/base/element/string.json

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

distributeddatamgr/dataShare/server/kvService/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_hap_assist_suite("ActsKvServiceHap") {
+  hap_profile = "./entry/src/main/module.json"
+  hap_name = "ActsKvServiceHap"
+  subsystem_name = "distributeddatamgr"
+  part_name = "data_share"
+  js_build_mode = "debug"
+  deps = [
+    ":kvService_js_assets",
+    ":kvService_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+}
+ohos_app_scope("dataShareKv_app_profile") {
+  app_profile = "AppScope/app.json"
+  sources = [ "AppScope/resources" ]
+}
+
+ohos_js_assets("kvService_js_assets") {
+  source_dir = "./entry/src/main/ets"
+}
+
+ohos_resources("kvService_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  deps = [ ":dataShareKv_app_profile" ]
+  hap_profile = "./entry/src/main/module.json"
+}

distributeddatamgr/dataShare/server/kvService/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("[ttt] [DataShareTest] MyAbilityStage onCreate");
+    }
+}
\ No newline at end of file

distributeddatamgr/dataShare/server/kvService/entry/src/main/ets/DataShareExtAbility/DataShareExtAbility.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 Extension from '@ohos.application.DataShareExtensionAbility'
+import dataSharePredicates from '@ohos.data.dataSharePredicates'
+import distributedData from '@ohos.data.distributedData';
+import fileIo from '@ohos.fileio'
+
+
+let kvManager;
+let kvdbStore;
+let kvResultSet;
+let result;
+
+const BUNDLE_NAME = 'com.samples.datasharetest';
+const STORE_ID = 'storeId';
+
+
+export default class DataShareExtAbility extends Extension {
+    private rdbStore_;
+    private kvdbStore_;
+
+
+    onCreate(want,callback) {
+        console.info('[ttt] [DataShareTest] <<Provider>> DataShareExtAbility onCreate, want:' + want.abilityName);
+        let mKVMgrConfig = {
+            userInfo : {
+                userId : '0',
+                userType : distributedData.UserType.SAME_USER_ID
+            },
+            bundleName: BUNDLE_NAME,
+            context : this.context
+        }
+        var options = {
+            createIfMissing : true,
+            encrypt : false,
+            backup : false,
+            autoSync : true,
+            kvStoreType : distributedData.KVStoreType.SINGLE_VERSION,
+            schema : {},
+            securityLevel : distributedData.SecurityLevel.NO_LEVEL,
+        }
+        let name = new distributedData.FieldNode('name');
+        name.type = distributedData.ValueType.STRING;
+        name.nullable = false;
+        name.default = 'name';
+
+        let age = new distributedData.FieldNode('age');
+        age.type = distributedData.ValueType.INTEGER;
+        age.nullable = false;
+        age.default = '0';
+
+        let isStudent = new distributedData.FieldNode('isStudent');
+        isStudent.type = distributedData.ValueType.STRING;
+        isStudent.nullable = false;
+        isStudent.default = 'false';
+
+
+        let schema1 = new distributedData.Schema();
+        schema1.root.appendChild(name);
+        schema1.root.appendChild(age);
+        schema1.root.appendChild(isStudent);
+        schema1.indexes = ['$.name', "$.age", "$.isStudent"];
+        //            options.kvStoreType = distributedData.KVStoreType.DEVICE_COLLABORATION;
+        options.schema = schema1;
+        distributedData.createKVManager(mKVMgrConfig, function (err, manager) {
+            if (err) {
+                console.info("[ttt] [DataShareTest] <<Provider>> createKVManager err: "  + err);
+                return;
+            }
+            console.info("[ttt] [DataShareTest] <<Provider>> createKVManager success");
+            kvManager  = manager;
+            console.info('[ttt] [DataShareTest] <<Provider>> createKVManager kvManager = ' + kvManager);
+            kvManager.getKVStore(STORE_ID, options, function (err, store) {
+                if (err) {
+                    console.info("[ttt] [DataShareTest] <<Provider>> getKVStore err: "  + err);
+                    return;
+                }
+                console.info("[ttt] [DataShareTest] <<Provider>> getKVStore success");
+                kvdbStore = store;
+                console.info('[ttt] [DataShareTest] <<Provider>> createKVManager kvdbStore = ' + kvdbStore);
+            });
+            callback();
+        });
+        result = this.context.cacheDir + '/datashare.txt'
+        console.info('[ttt] [DataAbilityTest] <<Provider>> resultpath = ' + result);
+    }
+
+    getFileTypes(uri: string, mimeTypeFilter: string, callback) {
+        console.info('[ttt] [DataShareTest] <<Provider>> [getFileTypes] enter');
+        let ret = new Array("type01", "type02", "type03");
+        console.info('[ttt] [DataShareTest] <<Provider>> [getFileTypes] leave, ret:' + ret);
+        let err = {"code":2};
+        callback(err,ret);
+        return ret;
+    }
+
+    async insert(uri, value, callback) {
+        console.info('[ttt] [DataShareTest] <<Provider>> [insert] enterkvdb');
+        if (value == null) {
+            console.info('[ttt] [DataShareTest] <<Provider>> [insert] invalid valueBuckets');
+            return;
+        }
+        console.info('[ttt] [DataShareTest] <<Provider>> [insert] kvdb value = ' + JSON.stringify(value));
+        let vbArr = new Array();
+        let insertBucket = {"name":value.name, "age":value.age, "isStudent":String(value.isStudent)}
+        console.info('[ttt] [DataShareTest] <<Provider>> [insert] kvdb insertBucket = ' + JSON.stringify(insertBucket));
+        vbArr.push({
+                "key":"testkey0",
+                "value": JSON.stringify(insertBucket)
+            });
+
+        console.info('[ttt] [DataShareTest] <<Provider>> [insert] kvdb vbArr = ' + JSON.stringify(vbArr) + "?????????????");
+        kvdbStore.putBatch(vbArr,  function (err,data) {
+            if (err != undefined) {
+                console.info("[ttt] [DataShareTest] <<Provider>> [insert kvdb put] callback err: " + err);
+                if (callback != undefined) {
+                    callback(-1,-1);
+                }
+            }else{
+                if (callback != undefined) {
+                    callback(0,1);
+                }
+            }
+            console.info("[ttt] [DataShareTest] <<Provider>> [insert kvdb put] callback data:" + JSON.stringify(data));
+        });
+        console.info('[ttt] [DataShareTest] <<Provider>> [insert] leave');
+    }
+
+    update(uri, predicates, value, callback) {
+        console.info('[ttt] [DataShareTest] <<Provider>> [update] enter');
+        console.info('[ttt] [DataShareTest] <<Provider>> [update] value = ' + JSON.stringify(value));
+        console.info('[ttt] [DataShareTest] <<Provider>> [update] predicates = ' + predicates);
+
+        if (predicates == null || predicates == undefined) {
+            console.info('[ttt] [DataShareTest] <<Provider>> [update] invalid predicates');
+            return;
+        }
+        let vbArr = new Array();
+        let keyName = "testkey0";
+        let updateBucket = {"name":value.name, "age":value.age, "isStudent":String(value.isStudent)}
+//                let da = new dataShare.DataSharePredicates();
+//                da.notEqualTo("$.name", "789");
+//        kvdbStore.getResultSet(da, function (err, data) {
+//            if (err != undefined) {
+//                console.info("[ttt] [DataShareTest] <<Provider>> [query kvdb get] callback err: " + err);
+//                return;
+//            }
+//            console.info("[ttt] [DataShareTest] <<Provider>> [query kvdb get] callback data:" + JSON.stringify(data));
+//            if (callback != undefined) {
+//                callback(err, data);
+//            }
+//        })
+
+        console.info('[ttt] [DataShareTest] <<Provider>> [update] updateBucket = ' + JSON.stringify(updateBucket));
+        console.info('[ttt] [DataShareTest] <<Provider>> [update] keyName = ' + keyName);
+        vbArr.push({
+            "key": keyName,
+            "value": JSON.stringify(updateBucket)
+        });
+        console.info('[ttt] [DataShareTest] <<Provider>> [update] vbArr = ' + JSON.stringify(vbArr));
+
+
+
+        kvdbStore.putBatch(vbArr, function (err,data) {
+            if (err != undefined) {
+                console.info("[ttt] [DataShareTest] <<Provider>> [update kvdb put] callback err: " + JSON.stringify(err));
+                if (callback != undefined) {
+                    callback(-1,-1);
+                }
+            }else{
+                if (callback != undefined) {
+                    callback(0,1);
+                }
+            }
+            console.info("[ttt] [DataShareTest] <<Provider>> [update kvdb put] callback data:" + JSON.stringify(data));
+        });
+        console.info('[ttt] [DataShareTest] <<Provider>> [update] leave');
+    }
+
+    delete(uri, predicates, callback) {
+        console.info('[ttt] [DataShareTest] <<Provider>> [delete] enter');
+        if (predicates == null || predicates == undefined) {
+            console.info('[ttt] [DataShareTest] <<Provider>> [delete] invalid predicates');
+            return;
+        }
+        kvdbStore.delete(predicates, function(err, data) {
+            if (err != undefined) {
+                console.info("[ttt] [DataShareTest] <<Provider>> [delete kvdb] callback err: " + err);
+                if (callback != undefined) {
+                    callback(-1, -1);
+                }
+            }else {
+                console.info("[ttt] [DataShareTest] <<Provider>> [delete kvdb] callback data:" + JSON.stringify(data));
+                if (callback != undefined) {
+                    callback(0, 1);
+                }
+            }
+        });
+        console.info('[ttt] [DataShareTest] <<Provider>> [delete] leave');
+    }
+
+    query(uri, predicates, columns, callback) {
+        console.info('[ttt] [DataShareTest] <<Provider>> [query] enter');
+        if (predicates == null || predicates == undefined) {
+            console.info('[ttt] [DataShareTest] <<Provider>> [query] invalid predicates');
+        }
+        console.info("[ttt] [DataShareTest] <<Provider>> [query] getDADADADADADADA!!!")
+        if(kvResultSet != null || kvResultSet != undefined){
+            kvdbStore.closeResultSet(kvResultSet,function (err, data) {
+                if (err != undefined) {
+                    console.info("[ttt] [DataShareTest] <<Provider>> [query kvdb closeResultSet] callback err: " + err);
+                    return;
+                }
+                console.info("[ttt] [DataShareTest] <<Provider>> [query kvdb closeResultSet] callback data:" + JSON.stringify(data));
+            })
+        }
+        console.info("[ttt] [DataShareTest] <<Provider>> [RPF66666] " );
+//        let da = new dataSharePredicates.DataSharePredicates();
+//        da.notEqualTo("$.name", "789");
+//        da.limit(1, 0);
+//        var query = new distributedData.Query();
+//        query.notEqualTo("$.name", 3);
+//        query.limit(1, 0);
+        kvdbStore.getResultSet(predicates, function (err, data) {
+            if (err != undefined) {
+                console.info("[ttt] [DataShareTest] <<Provider>> [query kvdb get] callback err: " + err);
+                return;
+            }
+            kvResultSet = data;
+            console.info("[ttt] [DataShareTest] <<Provider>> [query kvdb get] getCount = " + kvResultSet.getCount())
+            console.info("[ttt] [DataShareTest] <<Provider>> [query kvdb get] callback data:" + JSON.stringify(data));
+            if (callback != undefined) {
+                callback(err, data);
+            }
+        })
+        console.info('[ttt] [DataShareTest] <<Provider>> [query] leave');
+    }
+
+    getType(uri: string,callback) {
+        console.info('[ttt] [DataShareTest] <<Provider>> [getType] enter');
+        let ret = "image";
+        console.info('[ttt] [DataShareTest] <<Provider>> [getType] leave, ret:' + ret);
+        let err = {"code":2};
+        callback(err,ret);
+        return ret;
+    }
+
+    batchInsert(uri, valueBuckets, callback) {
+        console.info('[ttt] [DataShareTest] <<Provider>> [batchInsert] enter');
+        if (valueBuckets == null || valueBuckets.length == undefined) {
+            console.info('[ttt] [DataShareTest] <<Provider>> [batchInsert] invalid valueBuckets');
+            return;
+        }
+        console.info('[ttt] [DataShareTest] <<Provider>> [batchInsert] valueBuckets.length:' + valueBuckets.length);
+
+        console.info('[ttt] [DataShareTest] <<Provider>> [batchInsert] valueBuckets.isStudent :' + JSON.stringify(valueBuckets[0].isStudent));
+
+        let vbArr = new Array();
+        let batchInsertBucket = new Array();
+        let num = 0;
+        for(let i = 0; i < valueBuckets.length; i++) {
+            console.info('[ttt] [DataShareTest] <<Provider>> [batchInsert] valueBuckets.boolean :' + JSON.stringify(valueBuckets[i].isStudent));
+            batchInsertBucket[i] = {"name":valueBuckets[i].name, "age":valueBuckets[i].age, "isStudent":String(valueBuckets[i].isStudent)}
+            vbArr.push({
+                "key":"testkey"+num,
+                "value": JSON.stringify(batchInsertBucket[i])
+            });
+            num++;
+        }
+
+
+        console.info('[ttt] [DataShareTest] <<Provider>> [batchInsert] valueBuckets :' + JSON.stringify(batchInsertBucket));
+        kvdbStore.putBatch(vbArr, function(err, data) {
+            if (err != undefined) {
+                console.info("[ttt] [DataShareTest] <<Provider>> [batchInsert kvdb] callback err: " + err);
+                if (callback != undefined) {
+                    callback(-1, -1);
+                }
+                return;
+            }else{
+                if (callback != undefined) {
+                    callback(0,1);
+                }
+            }
+            console.info("[ttt] [DataShareTest] <<Provider>> [batchInsert kvdb] callback data:" + JSON.stringify(data));
+
+        });
+        console.info('[ttt] [DataShareTest] <<Provider>> [batchInsert] leave');
+    }
+
+
+    openFile(uri: string, mode: string, callback) {
+        console.info('[ttt] [DataAbilityTest] <<Provider>> DataAbility openFile in');
+        fileIo.open(result, 0o2 | 0o100, 0o666, function(err, fd) {
+            if(err) {
+                console.info('[ttt] [DataAbilityTest] <<Provider>> OpenFile err = ' + err);
+                console.info('[ttt] [DataAbilityTest] <<Provider>> OpenFile err = ' + JSON.stringify(err));
+            }
+            console.log('[ttt] [DataAbilityTest] <<Provider>> EtsFileIo fd =' + fd);
+            let num = fileIo.writeSync(fd, "this is a boring test of DataShare");
+            console.info("[ttt] [DataAbillityTest] <<Provider>> WriteSync length = " + num);
+            console.info("[ttt] [DataAbillityTest] <<Provider>> WriteSync fd = " + fd);
+            callback(err,fd);
+        })
+    }
+
+    normalizeUri(uri: string,callback) {
+        console.info('[ttt] [DataShareTest] <<Provider>> [normalizeUri] enter');
+        let ret = "normalize+" + uri;
+        console.info('[ttt] [DataShareTest] <<Provider>> [normalizeUri] leave, ret:' + ret);
+        let err = {"code":2};
+        console.info('[ttt] [DataShareTest] <<Provider>> [normalizeUri] enter!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+        callback(err,ret);
+        console.info('[ttt] [DataShareTest] <<Provider>> [normalizeUri] leave!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+    }
+
+    denormalizeUri(uri: string,callback) {
+        console.info('[ttt] [DataShareTest] <<Provider>> [denormalizeUri] enter');
+        let ret = "denormalize+" + uri;
+        console.info('[ttt] [DataShareTest] <<Provider>> [denormalizeUri] leave, ret:' + ret);
+        let err = {"code":2};
+        callback(err,ret);
+        return ret;
+    }
+};
\ No newline at end of file

distributeddatamgr/dataShare/server/kvService/entry/src/main/ets/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 dataShare from '@ohos.data.dataShare'
+
+@Entry
+@Component
+struct Index {
+  @State message: string = "Main thread message filed"
+
+  build() {
+    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
+      Text('DataShare Extension Ability Test')
+        .fontSize(40)
+        .fontWeight(FontWeight.Bold)
+        .onClick(async () => {
+//          console.info('[ttt] [DataShareTest] <<UI>> dataSharePredicates build begin');
+//          let da =  new dataShare.DataSharePredicates();
+//          da.equalTo("name", "zhangsan");
+//          da.notEqualTo("name", "lisi");
+//          da.beginWrap();
+//          da.endWrap();
+//          da.or();
+//          da.and();
+//          da.contains("name", "zhang");
+//          da.beginsWith("name", "z");
+//          da.endsWith("name", "n");
+//          da.isNull("name");
+//          da.isNotNull("name");
+//          da.like("name", "zhang");
+//          da.unlike("name", "li");
+//          da.glob("name", "???");
+//          da.between("age", 18, 22);
+//          da.notBetween("age", 18, 22);
+//          da.greaterThan("age", 18);
+//          da.lessThan("age", 22);
+//          da.greaterThanOrEqualTo("age", 18);
+//          da.lessThanOrEqualTo("age", 22);
+//          da.orderByAsc("age");
+//          da.orderByDesc("age");
+//          da.distinct();
+//          da.limit(10, 5);
+//          da.groupBy(["name", "age"]);
+//          da.indexedBy("name");
+//          da.in("name", []);
+//          da.notIn("name", []);
+//          da.prefixKey("name");
+//          console.info('[ttt] [DataShareTest] <<UI>> dataSharePredicates = ' + JSON.stringify(da));
+//          console.info('[ttt] [DataShareTest] <<UI>> dataSharePredicates build end');
+        })
+
+      Text(`${this.message}`)
+        .fontSize(30)
+        .height('15%')
+        .width('100%')
+        .textAlign(TextAlign.Center)
+
+//      Row() {
+//        Button() {
+//            Text('ConnectServiceExtension')
+//              .fontSize(25)
+//              .fontWeight(FontWeight.Bold)
+//          }.type(ButtonType.Capsule)
+//          .margin({
+//            top: 20
+//          })
+//          .width('45%')
+//          .height('8%')
+//          .backgroundColor('#0ddffb')
+//          .onClick(async () => {
+//            console.info('[ttt] [DataShareTest] <<UI>> ConnectServiceExtension onclick enter')
+//            this.message = 'ConnectServiceExtension onclick'
+//            globalThis.connectServiceExtAbility()
+//            console.info('[ttt] [DataShareTest] <<UI>> ConnectServiceExtension onclick leave')
+//          })
+//
+//        Button() {
+//            Text('DisconnectServiceExtension')
+//              .fontSize(25)
+//              .fontWeight(FontWeight.Bold)
+//          }.type(ButtonType.Capsule)
+//          .margin({
+//            top: 20
+//          })
+//          .width('45%')
+//          .height('8%')
+//          .backgroundColor('#0ddffb')
+//          .onClick(async () => {
+//            console.info('[ttt] [DataShareTest] <<UI>> DisconnectServiceExtension onclick enter')
+//            this.message = 'DisconnectServiceExtension onclick'
+//            globalThis.disconnectServiceExtAbility()
+//            console.info('[ttt] [DataShareTest] <<UI>> DisconnectServiceExtension onclick leave')
+//          })
+//      }
+
+      Row() {
+        Button() {
+          Text('Connect')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> Connect onclick enter')
+          this.message = 'Connect onclick'
+          await globalThis.connectDataShareExtAbility()
+          console.info('[ttt] [DataShareTest] <<UI>> Connect onclick leave')
+        })
+
+        Button() {
+          Text('Disconnect')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> Disconnect onclick enter')
+          this.message = 'Disconnect onclick'
+          await globalThis.disconnectDataShareExtAbility()
+          console.info('[ttt] [DataShareTest] <<UI>> Disconnect onclick leave')
+        })
+      }
+
+      Row() {
+        Button() {
+          Text('On')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> On onclick enter')
+          this.message = '~ On onclick'
+          try {
+            await globalThis.on();
+          } catch (err) {
+            console.error('[ttt] [DataAbilityTest] Observer on catch(err)====>:' + err);
+          }
+          console.info('[ttt] [DataShareTest] <<UI>> On onclick leave')
+        })
+
+        Button() {
+          Text('Off')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> Off onclick enter')
+          this.message = '~ Off onclick'
+          try {
+            await globalThis.off();
+          } catch (err) {
+            console.error('[ttt] [DataAbilityTest] Observer Off catch(err)====>:' + err);
+          }
+          console.info('[ttt] [DataShareTest] <<UI>> Off onclick leave')
+        })
+
+//        Button() {
+//          Text('OpenFile')
+//            .fontSize(25)
+//            .fontWeight(FontWeight.Bold)
+//        }.type(ButtonType.Capsule)
+//        .margin({
+//          top: 20
+//        })
+//        .width('30%')
+//        .height('8%')
+//        .backgroundColor('#0ddffb')
+//        .onClick(async () => {
+//          console.info('[ttt] [DataShareTest] <<UI>> OpenFile onclick enter')
+//          this.message = 'OpenFile onclick'
+//          let ret = await globalThis.openFile()
+//          this.message += "\n\n Test Result: " + ret;
+//          console.info('[ttt] [DataShareTest] <<UI>> OpenFile onclick leave')
+//        })
+      }
+
+      Row() {
+        Button() {
+          Text('Query')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> Query onclick enter')
+          this.message = 'Query onclick'
+          let ret = await globalThis.query()
+          this.message += "\n\n Test Result: " + ret;
+          console.info('[ttt] [DataShareTest] <<UI>> Query onclick leave')
+        })
+
+        Button() {
+          Text('Insert')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> Insert onclick enter')
+          this.message = 'Insert onclick'
+          let ret = await globalThis.insert()
+          this.message += "\n\n Test Result: " + ret;
+          console.info('[ttt] [DataShareTest] <<UI>> Insert onclick leave')
+        })
+      }
+
+      Row() {
+        Button() {
+          Text('Update')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> Update onclick enter')
+          this.message = 'Update onclick'
+          let ret = await globalThis.update()
+          this.message += "\n\n Test Result: " + ret;
+          console.info('[ttt] [DataShareTest] <<UI>> Update onclick leave')
+        })
+
+        Button() {
+          Text('Delete')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> Delete onclick enter')
+          this.message = 'Delete onclick'
+          let ret = await globalThis.delete()
+          this.message += "\n\n Test Result: " + ret;
+          console.info('[ttt] [DataShareTest] <<UI>> Delete onclick leave')
+        })
+      }
+
+      Row() {
+        Button() {
+          Text('BatchInsert')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> BatchInsert onclick enter')
+          this.message = 'BatchInsert onclick'
+          let ret = await globalThis.batchInsert()
+          this.message += "\n\n Test Result: " + ret;
+          console.info('[ttt] [DataShareTest] <<UI>> BatchInsert onclick leave')
+        })
+
+        Button() {
+          Text('NotifyChange')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> NotifyChange onclick enter')
+          this.message = 'NotifyChange onclick'
+          await globalThis.notifyChange()
+          console.info('[ttt] [DataShareTest] <<UI>> NotifyChange onclick leave')
+        })
+      }
+
+      Row() {
+        Button() {
+          Text('GetType')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> GetType onclick enter')
+          this.message = 'GetType onclick'
+          let ret = await globalThis.getType()
+          this.message += "\n\n Test Result: " + ret;
+          console.info('[ttt] [DataShareTest] <<UI>> GetType onclick leave')
+        })
+
+        Button() {
+          Text('GetFileTypes')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> GetFileTypes onclick enter')
+          this.message = 'GetFileTypes onclick'
+          let ret = await globalThis.getFileTypes()
+          this.message += "\n\n Test Result: " + ret;
+          console.info('[ttt] [DataShareTest] <<UI>> GetFileTypes onclick leave')
+        })
+      }
+
+      Row() {
+        Button() {
+          Text('NormalizeUri')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> NormalizeUri onclick enter')
+          this.message = 'NormalizeUri onclick'
+          let ret = await globalThis.normalizeUri()
+          this.message += "\n\n Test Result: " + ret;
+          console.info('[ttt] [DataShareTest] <<UI>> NormalizeUri onclick leave')
+        })
+
+        Button() {
+          Text('DenormalizeUri')
+            .fontSize(25)
+            .fontWeight(FontWeight.Bold)
+        }.type(ButtonType.Capsule)
+        .margin({
+          top: 20
+        })
+        .width('45%')
+        .height('8%')
+        .backgroundColor('#0ddffb')
+        .onClick(async () => {
+          console.info('[ttt] [DataShareTest] <<UI>> DenormalizeUri onclick enter')
+          this.message = 'DenormalizeUri onclick'
+          let ret = await globalThis.denormalizeUri()
+          this.message += "\n\n Test Result: " + ret;
+          console.info('[ttt] [DataShareTest] <<UI>> DenormalizeUri onclick leave')
+        })
+      }
+    }
+    .width('100%')
+    .height('100%')
+  }
+}
\ No newline at end of file

distributeddatamgr/dataShare/server/kvService/entry/src/main/module.json

+{
+  "module": {
+    "name": "entry",
+    "type": "entry",
+    "srcEntrance": "./ets/Application/AbilityStage.ts",
+    "description": "$string:phone_entry_dsc",
+    "mainElement": "MainAbility",
+    "deviceTypes": [
+      "default"
+    ],
+    "deliveryWithInstall": true,
+    "installationFree": false,
+    "pages": "$profile:main_pages",
+    "uiSyntax": "ets",
+    "abilities": [
+      {
+        "name": "MainAbility",
+        "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+        "description": "$string:phone_entry_main",
+        "icon": "$media:icon",
+        "label": "$string:entry_label",
+        "visible": true,
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "startWindowIcon": "$media:icon",
+        "startWindowBackground": "$color:color_1"
+      }
+    ],
+    "extensionAbilities": [
+      {
+        "srcEntrance": "./ets/DataShareExtAbility/DataShareExtAbility.ts",
+        "name": "DataShareExtAbility",
+        "icon": "$media:icon",
+        "description": "$string:description_datashareextability",
+        "type": "dataShare",
+        "uri": "datashare://com.samples.datasharekvtest.DataShare",
+        "visible": true
+      }
+    ]
+  }
+}
\ No newline at end of file