Merge branch 'master' of gitee.com:openharmony/xts_acts into 725

ability_lite/ability_posix/BUILD.gn

@@ -27,7 +27,7 @@ hcpptest_suite("ActsAbilityMgrTest") {
     "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle",
     "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
     "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
-    "//foundation/distributeddatamgr/appdatamgr/kv_store/interfaces/inner_api/kv_store:kv_store",
+    "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store:kv_store",
     "//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
   ]
   if (enable_ohos_appexecfwk_feature_ability == true) {

distributeddatamgr_lite/dbm_kv_store_hal/BUILD.gn

@@ -19,7 +19,7 @@ hctest_suite("ActsDbmKvStoreTest") {
 
   include_dirs = [
     "src",
-    "//foundation/distributeddatamgr/appdatamgr/kv_store/interfaces/innerkits/dbm_kv_store/include",
+    "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/dbm_kv_store/include",
     "//base/iot_hardware/peripheral/interfaces/kits",
   ]
   cflags = [ "-Wno-error" ]

distributeddatamgr_lite/kv_store_posix/BUILD.gn

@@ -19,11 +19,11 @@ hcpptest_suite("ActsKvStoreTest") {
 
   include_dirs = [
     "src",
-    "//foundation/distributeddatamgr/appdatamgr/kv_store/interfaces/inner_api/kv_store/include",
+    "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store/include",
     "//third_party/bounds_checking_function/include",
     "//utils/native/lite/include",
   ]
-  deps = [ "//foundation/distributeddatamgr/appdatamgr/kv_store/interfaces/inner_api/kv_store:kv_store" ]
+  deps = [ "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store:kv_store" ]
   cflags = [ "-Wno-error" ]
   ldflags = [
     "-lstdc++",

notification/ans_standard/actsnotificationshow/src/main/config.json

@@ -24,33 +24,6 @@
             "moduleName": "entry",
             "moduleType": "entry"
         },
-        "defPermissions": [
-            {
-                "availableScope": [],
-                "grantMode": "system_grant",
-                "name": "publish_event0800_permission"
-            },
-            {
-                "availableScope": [],
-                "grantMode": "system_grant",
-                "name": "publish_event0900_subscriberPermissions"
-            },
-            {
-                "availableScope": [],
-                "grantMode": "system_grant",
-                "name": "publish_event0900_publisherPermission"
-            },
-            {
-                "availableScope": [],
-                "grantMode": "system_grant",
-                "name": "publish_event1000_permission"
-            },
-            {
-                "availableScope": [],
-                "grantMode": "system_grant",
-                "name": "permission.COMMONEVENT_STICKY"
-            }
-        ],
         "reqPermissions": [
             {
                 "name": "publish_event0800_permission",

notification/ans_standard/publish_test/wantagent/wantagent1promise/src/main/js/test/WantAgent.test.js

@@ -19,14 +19,14 @@ var time = 1000
 var WantAgent;
 export default function ActsAnsWantAgentOneProTest() {
 describe('ActsAnsWantAgentOneProTest', function () {
-    console.info('----ActsWantAgentTest----');
+  console.info("----ActsWantAgentTest----");
 
   /*
    * @tc.number: ACTS_SetWant_0200
    * @tc.name: getWantAgent(OperationType.START_ABILITY)
    * @tc.desc: verify the function of getWantAgent(OperationType.START_ABILITY)
    */
-    it('ACTS_SetWant_0200', 0, async function (done) {
+  it("ACTS_SetWant_0200", 0, async function (done) {
     var agentInfo = {
       wants: [
         {
@@ -36,8 +36,7 @@ describe('ActsAnsWantAgentOneProTest', function () {
           entities: ["entity1"],
           type: "MIMETYPE",
           uri: "key={true,true,false}",
-                        parameters:
-                        {
+          parameters: {
             mykey0: 2222,
             mykey1: [1, 2, 3],
             mykey2: "[1, 2, 3]",
@@ -45,44 +44,104 @@ describe('ActsAnsWantAgentOneProTest', function () {
             mykey4: [false, true, false],
             mykey5: ["qqqqq", "wwwwww", "aaaaaaaaaaaaaaaaa"],
             mykey6: true,
+          },
+        },
+      ],
+      operationType: wantAgent.OperationType.START_ABILITY,
+      requestCode: 0,
+      wantAgentFlags: [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG],
+    };
+    console.info("----getWantAgent before----");
+    wantAgent.getWantAgent(agentInfo).then((data) => {
+      WantAgent = data;
+      console.info("----getWantAgent success!----");
+      console.info(JSON.stringify(data));
+      expect(typeof data).assertEqual("object");
+      var triggerInfo = {
+        code: 0,
+      };
+      wantAgent.trigger(WantAgent, triggerInfo, (err, data) => {
+        if (err.code == 0) {
+          console.info("----trigger success!----");
+          console.info("== trigger data  " + JSON.stringify(data));
+        } else {
+          console.info("----trigger failed!----");
+          console.info("== trigger data  " + JSON.stringify(data));
         }
+        done();
+      });
+      done();
+    });
+    setTimeout(function () {
+      console.debug("====>time out ACTS_SetWant_0200====>");
+    }, time);
+    console.info("----getWantAgent after----");
+  });
+
+  /*
+   * @tc.number: ACTS_SetWant_0300
+   * @tc.name: getWantAgent(OperationType.START_ABILITY)
+   * @tc.desc: verify the function of getWantAgent(OperationType.START_ABILITY)
+   */
+  it("ACTS_SetWant_0300", 0, async function (done) {
+    var agentInfo = {
+      wants: [
+        {
+          bundleName: "com.example.WantAgentTest1",
+          abilityName: "com.example.WantAgentTest1.MainAbility",
+          action: "action1",
+          entities: ["entity1"],
+          type: "MIMETYPE",
+          uri: "key={true,true,false}",
+          parameters: {
+            mykey0: 2222,
+            mykey1: [1, 2, 3],
+            mykey2: "[1, 2, 3]",
+            mykey3: "ssssssssssssssssssssssssss",
+            mykey4: [false, true, false],
+            mykey5: ["qqqqq", "wwwwww", "aaaaaaaaaaaaaaaaa"],
+            mykey6: true,
+          },
         },
       ],
       operationType: wantAgent.OperationType.START_ABILITY,
       requestCode: 0,
-            wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG]
+      wantAgentFlags: [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG],
+      extraInfo: {
+        key1:'test_extraInfo'
       }
-        console.info('----getWantAgent before----');
-        wantAgent.getWantAgent(agentInfo).then(
-            (data) => {
+    };
+    console.info("----getWantAgent before----");
+    wantAgent.getWantAgent(agentInfo).then((data) => {
       WantAgent = data;
-                console.info('----getWantAgent success!----');
+      console.info("----getWantAgent success!----");
       console.info(JSON.stringify(data));
-                expect(typeof(data)).assertEqual("object");
+      expect(typeof data).assertEqual("object");
       var triggerInfo = {
-                    code:0
+        code: 0,
+        want:WantAgent,
+        permission:'',
+        extraInfo: {
+            key1:'test_triggerInfo'
           }
-                 wantAgent.trigger(WantAgent, triggerInfo,
-                    (err, data) => {
+      };
+      wantAgent.trigger(WantAgent, triggerInfo, (err, data) => {
         if (err.code == 0) {
-                            console.info('----trigger success!----');
-                            console.info('== trigger data  ' + JSON.stringify(data) );
+          console.info("----trigger success!----");
+          console.info("== trigger data  " + JSON.stringify(data));
         } else {
-                            console.info('----trigger failed!----');
-                            console.info('== trigger data  ' + JSON.stringify(data) );
+          console.info("----trigger failed!----");
+          console.info("== trigger data  " + JSON.stringify(data));
         }
         done();
-                    }
-                );
+      });
       done();
-               
-            }
-        );
-	setTimeout(function(){
+    });
+    setTimeout(function () {
       console.debug("====>time out ACTS_SetWant_0200====>");
     }, time);
-        console.info('----getWantAgent after----');
-    })
+    console.info("----getWantAgent after----");
+  });
 })
 
 }

notification/ces_standard/subscribeandpublish/actssubscriberunordertest/src/main/js/test/ActsSubscriber_test_unorder.js

@@ -334,6 +334,7 @@ describe("ActsSubscriberTestUnorder", async function (done) {
     console.info("===============ActsSubscriberTestUnorder_0700==========================>");
     let commonEventSubscribeInfo = {
       events: ["publish_event0700"],
+      userId:100
     };
 
     let commonEventPublishData = {
@@ -357,6 +358,7 @@ describe("ActsSubscriberTestUnorder", async function (done) {
 
     Subscriber.createSubscriber(commonEventSubscribeInfo).then((data) => {
       console.info("===============ActsSubscriberTestUnorder_0700=========createSubscriber promise");
+      expect(commonEventSubscribeInfo.userId).assertEqual(100)
       commonEventSubscriber007 = data;
       data.getSubscribeInfo().then(() => {
         console.info("===============ActsSubscriberTestUnorder_0700=========getSubscribeInfo promise");

notification/ces_standard/subscribeandpublish/emittertest/src/main/js/test/EmitterTest.js

@@ -16,7 +16,7 @@ import emitter from '@ohos.events.emitter'
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'
 
 export default function EmitterTest() {
-describe('EmitterTest', function () {
+    describe('EmitterTest', function () {
         console.info("===========EmitterTest start====================>");
 
         var eventData = {
@@ -107,5 +107,49 @@ describe('EmitterTest', function () {
             done();
         })
 
-})
+        /*
+         * @tc.number    : EmitterEmitTest_0100
+         * @tc.name      : verify off : Check subscribe same off common ordered event
+         * @tc.desc      : Check the subscriber can receive event "EmitterOffTest" type of the interface (by Promise)
+         */
+        it('EmitterEmitTest_0100', 0, async function (done){
+            console.info("===========EmitterEmitTest_0100====================>");
+            var eventData2 = {
+                data: {
+                    "content": "c",
+                    "id": 2,
+                }};
+            var innerEventHigh = {
+                eventId: 3,
+                priority: emitter.EventPriority.HIGH
+            };
+            emitter.once(InnerEventLow, callback01);
+            emitter.emit(innerEventHigh, eventData2);
+            expect(emitter.EventPriority.HIGH).assertEqual(1)
+            done();
+        })
+
+        /*
+        * @tc.number    : EmitterEmitTest_0200
+        * @tc.name      : verify off : emitter.EventPriority.IDLE
+        * @tc.desc      : emitter.EventPriority.IDLE
+        */
+        it('EmitterEmitTest_0200', 0, async function (done){
+            console.info("===========EmitterEmitTest_0100====================>");
+            var eventData3 = {
+                data: {
+                    "content": "d",
+                    "id": 3,
+                }};
+            var innerEventIdle = {
+                eventId: 4,
+                priority: emitter.EventPriority.IDLE
+            };
+            emitter.once(innerEventIdle, callback01);
+            emitter.emit(InnerEventImmediate, eventData3);
+            expect(emitter.EventPriority.IDLE).assertEqual(3)
+            done();
+        })
+
+    })
 }

test_packages.gni

@@ -28,7 +28,6 @@ _all_test_packages = [
   "${ACTS_ROOT}/startup:startup",
   "${ACTS_ROOT}/sensors:sensor",
   "${ACTS_ROOT}/distributeddatamgr:distributeddatamgr",
-  "${ACTS_ROOT}/updater:update",
   "${ACTS_ROOT}/graphic:graphic",
   "${ACTS_ROOT}/arkui:arkui",
   "${ACTS_ROOT}/storage:storage",

updater/BUILD.gn

-# 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("//build/ohos_var.gni")
-
-group("update") {
-  testonly = true
-  if (is_standard_system) {
-    deps = [ "update_test:update_js_test" ]
-  }
-}

updater/update_test/BUILD.gn

-# 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("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("update_js_test") {
-  hap_profile = "./src/main/config.json"
-  deps = [
-    ":update_js_assets",
-    ":update_js_resources",
-  ]
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsUpdateJsTest"
-}
-ohos_js_assets("update_js_assets") {
-  source_dir = "./src/main/js/default"
-}
-ohos_resources("update_js_resources") {
-  sources = [ "./src/main/resources" ]
-  hap_profile = "./src/main/config.json"
-}

updater/update_test/Test.json

-{
-    "description": "Configuration for time js api Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "180000",
-        "package": "ohos.acts.upgrade",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsUpdateJsTest.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}

updater/update_test/src/main/config.json

-{
-  "app": {
-    "bundleName": "ohos.acts.upgrade",
-    "vendor": "example",
-    "version": {
-      "code": 1,
-      "name": "1.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 5
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "ohos.acts.upgrade",
-    "name": ".MyApplication",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry"
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "ohos.acts.upgrade.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
-        "type": "page",
-        "launchType": "standard",
-        "visible": true
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
-}

updater/update_test/src/main/js/default/app.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.
- */
-
-export default {
-    onCreate() {
-        console.info('AceApplication onCreate');
-    },
-    onDestroy() {
-        console.info('AceApplication onDestroy');
-    }
-};

updater/update_test/src/main/js/default/i18n/en-US.json

-{
-  "strings": {
-    "hello": "Hello",
-    "world": "World"
-  }
-}
\ No newline at end of file

updater/update_test/src/main/js/default/i18n/zh-CN.json

-{
-  "strings": {
-    "hello": "您好",
-    "world": "世界"
-  }
-}
\ No newline at end of file

updater/update_test/src/main/js/default/pages/index/index.css

-.container {
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-}
-
-.title {
-    font-size: 100px;
-}

updater/update_test/src/main/js/default/pages/index/index.hml

-<div class="container">
-    <text class="title">
-        {{ $t('strings.hello') }} {{ title }}
-    </text>
-</div>

updater/update_test/src/main/js/default/pages/index/index.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 {Core} from 'deccjsunit/lite'
-const core = Core.getInstance()
-core.init()
-require('../../test/List.test.js')
-core.execute()
-
-export default {
-    data: {
-        title: ""
-    },
-    onInit() {
-        this.title = this.$t('strings.world');
-    }
-}

updater/update_test/src/main/js/default/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.
- */
-
-require('./update.test.js')
\ No newline at end of file

updater/update_test/src/main/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "MyApplication0420"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Phone_Empty Feature Ability"
-    }
-  ]
-}
\ No newline at end of file