!3570 长时任务xts用例修改

Merge pull request !3570 from 张鑫/master

resourceschedule/resourceschedule_standard/BUILD.gn

@@ -18,6 +18,7 @@ group("resourceschedule_standard") {
   if (is_standard_system) {
     deps = [
       "backgroundtaskmanager:resourceschedule_backgroundtaskmanager_js_test",
+      "continuoustaskrelyhap:ContinuousTaskRelyHap",
       "deviceusagestatisticsjsunit:resourceschedule_deviceusagestatisticsjsunit_js_test",
       "reminderagent:resourceschedule_reminderagent_js_test",
       "workscheduler:resourceschedule_workscheduler_js_test",

resourceschedule/resourceschedule_standard/backgroundtaskmanager/Test.json

@@ -13,6 +13,30 @@
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
+        },
+        {
+            "type": "ShellKit",
+            "run-command": [
+                "remount",
+                "mkdir /data/test"
+            ]
+        },
+        {
+            "type": "PushKit",
+            "push": [
+                "ContinuousTaskRelyHap.hap->/data/test/ContinuousTaskRelyHap.hap"
+            ]
+        },
+        {
+            "type": "ShellKit",
+            "run-command": [
+                "bm install -p /data/test/ContinuousTaskRelyHap.hap",
+                "aa start -a com.example.continuoustaskserver.MainAbility -b com.example.continuoustaskserver"
+            ],
+            "teardown-command": [
+                "bm uninstall -n com.example.continuoustaskserver",
+                "rm -rf data/test"
+            ]
         }
     ]
 }

resourceschedule/resourceschedule_standard/continuoustaskrelyhap/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_hap("ContinuousTaskRelyHap") {
+  hap_profile = "./entry/src/main/config.json"
+  hap_name = "ContinuousTaskRelyHap"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path =
+      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_js_service_assets",
+    ":hjs_demo_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/js/default"
+}
+ohos_js_assets("hjs_demo_js_service_assets") {
+  source_dir = "./entry/src/main/js/ServiceAbility"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}

resourceschedule/resourceschedule_standard/continuoustaskrelyhap/entry/src/main/config.json

+{
+  "app": {
+    "bundleName": "com.example.continuoustaskserver",
+    "vendor": "example",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 7,
+      "target": 7
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.example.continuoustaskserver",
+    "name": ".MyApplication",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": false
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "name": "com.example.continuoustaskserver.MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "label": "$string:app_name",
+        "type": "page",
+        "visible": true,
+        "launchType": "standard"
+      },
+      {
+        "backgroundModes": [
+          "location"
+        ],
+        "visible": true,
+        "srcPath": "ServiceAbility",
+        "name": ".ServiceAbility",
+        "icon": "$media:icon",
+        "srcLanguage": "js",
+        "description": "$string:description_serviceability",
+        "type": "service"
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ],
+    "reqPermissions": [
+      {
+        "name": "ohos.permission.KEEP_BACKGROUND_RUNNING"
+      }
+    ]
+  }
+}
\ No newline at end of file

resourceschedule/resourceschedule_standard/continuoustaskrelyhap/entry/src/main/js/ServiceAbility/service.js

+/*
+ * 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 notification from '@ohos.notification';
+import featureAbility from '@ohos.ability.featureAbility';
+import wantAgent from '@ohos.wantAgent';
+import backgroundTaskManager from '@ohos.backgroundTaskManager';
+import particleAbility from '@ohos.ability.particleAbility';
+import commonEvent from '@ohos.commonEvent';
+
+const TAG = "BGMODE_TEST ";
+
+let event;
+
+let request = {
+    content: {
+        contentType: notification.ContentType.NOTIFICATION_CONTENT_BASIC_TEXT,
+        normal: {
+            title: "title",
+            text: "text"
+        }
+    },
+    id: 1
+};
+
+let wantAgentInfo = {
+    wants: [
+        {
+            bundleName: "com.example.continuoustaskserver",
+            abilityName: "com.example.continuoustaskserver.MainAbility"
+        }
+    ],
+    operationType: wantAgent.OperationType.START_ABILITY,
+    requestCode: 0,
+    wantAgentFlags: [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG]
+};
+
+function callback(err, data) {
+    if (err) {
+        console.error(TAG + " Operation failed");
+    } else {
+        console.info(TAG + " Operation succeed");
+        commonEvent.publish(event, (err) => {
+            if (err.code) {
+                console.error(TAG + "PublishCallBack failed");
+            } else {
+                console.info(TAG + "Publish succeed");
+            }
+        })
+    }
+}
+
+function startContinuousTaskUseApi7Callback() {
+    event = "startTaskUseApi7Callback";
+    particleAbility.startBackgroundRunning(1, request, callback);
+}
+
+function stopContinuousTaskUseApi7Callback() {
+    event = "stopTaskUseApi7Callback";
+    particleAbility.startBackgroundRunning(1, request).then(() => {
+        particleAbility.cancelBackgroundRunning(callback);
+    });
+}
+
+function startContinuousTaskUseApi8Callback() {
+    event = "startTaskUseApi8Callback";
+    wantAgent.getWantAgent(wantAgentInfo).then((data) => {
+        backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(),
+            backgroundTaskManager.BackgroundMode.LOCATION, data, callback);
+    });
+}
+
+function stopContinuousTaskUseApi8Callback() {
+    event = "stopTaskUseApi8Callback";
+    wantAgent.getWantAgent(wantAgentInfo).then((data) => {
+        return backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(),
+            backgroundTaskManager.BackgroundMode.LOCATION, data);
+    }).then(() => {
+        backgroundTaskManager.stopBackgroundRunning(featureAbility.getContext(), callback);
+    });
+}
+
+function startContinuousTaskUseApi7Promise() {
+    particleAbility.startBackgroundRunning(1, request).then(() => {
+        commonEvent.publish("startTaskUseApi7Promise", (err) => {
+            if (err.code) {
+                console.error(TAG + "PublishCallBack failed");
+            } else {
+                console.info(TAG + "Publish succeed");
+            }
+        });
+    });
+}
+
+function stopContinuousTaskUseApi7Promise() {
+    particleAbility.startBackgroundRunning(1, request).then(() => {
+        return particleAbility.cancelBackgroundRunning();
+    }).then(() => {
+        commonEvent.publish("stopTaskUseApi7Promise", (err) => {
+            if (err.code) {
+                console.error(TAG + "PublishCallBack failed");
+            } else {
+                console.info(TAG + "Publish succeed");
+            }
+        });
+    });
+}
+
+function startContinuousTaskUseApi8Promise() {
+    wantAgent.getWantAgent(wantAgentInfo).then((data) => {
+        return backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(),
+            backgroundTaskManager.BackgroundMode.LOCATION, data);
+    }).then(() => {
+        commonEvent.publish("startTaskUseApi8Promise", (err) => {
+            if (err.code) {
+                console.error(TAG + "PublishCallBack failed");
+            } else {
+                console.info(TAG + "Publish succeed");
+            }
+        });
+    });
+}
+
+function stopContinuousTaskUseApi8Promise() {
+    wantAgent.getWantAgent(wantAgentInfo).then((data) => {
+        return backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(),
+            backgroundTaskManager.BackgroundMode.LOCATION, data);
+    }).then(() => {
+        return backgroundTaskManager.stopBackgroundRunning(featureAbility.getContext());
+    }).then(() => {
+        commonEvent.publish("stopTaskUseApi8Promise", (err) => {
+            if (err.code) {
+                console.error(TAG + "PublishCallBack failed");
+            } else {
+                console.info(TAG + "Publish succeed");
+            }
+        })
+    })
+}
+
+function startContinuousTaskInvalidBgmode() {
+    wantAgent.getWantAgent(wantAgentInfo).then((data) => {
+        return backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(),
+            backgroundTaskManager.BackgroundMode.BLUETOOTH_INTERACTION, data);
+    }).catch(() => {
+        commonEvent.publish("startTaskInvalidBgmode", (err) => {
+            if (err.code) {
+                console.error(TAG + "PublishCallBack failed");
+            } else {
+                console.info(TAG + "Publish succeed");
+            }
+        });
+    });
+}
+
+function handleOption(want) {
+    switch (want.parameters.option) {
+        case "testcase1":
+            startContinuousTaskUseApi7Callback();
+            break;
+        case "testcase2":
+            stopContinuousTaskUseApi7Callback();
+            break;
+        case "testcase3":
+            startContinuousTaskUseApi8Callback();
+            break;
+        case "testcase4":
+            stopContinuousTaskUseApi8Callback();
+            break;
+        case "testcase5":
+            startContinuousTaskUseApi7Promise();
+            break;
+        case "testcase6":
+            stopContinuousTaskUseApi7Promise();
+            break;
+        case "testcase7":
+            startContinuousTaskUseApi8Promise();
+            break;
+        case "testcase8":
+            stopContinuousTaskUseApi8Promise();
+            break;
+        case "testcase9":
+            startContinuousTaskInvalidBgmode();
+            break;
+        default:
+            console.warn(TAG + 'Unknown option');
+            break;
+    }
+}
+
+export default {
+    onStart() {
+        console.info(TAG + 'ServiceAbility onStart');
+    },
+    onStop() {
+        console.info(TAG + 'ServiceAbility onStop');
+    },
+    onCommand(want, startId) {
+        console.info(TAG + 'ServiceAbility onCommand');
+        console.info(TAG + "Get onCommand want: " + JSON.stringify(want));
+        particleAbility.cancelBackgroundRunning();
+        backgroundTaskManager.stopBackgroundRunning(featureAbility.getContext());
+        handleOption(want);
+    },
+    onConnect(want) {
+        console.info(TAG + 'ServiceAbility onConnect');
+    },
+    onDisConnect(want) {
+        console.info(TAG + 'ServiceAbility onDisConnect');
+    },
+};
\ No newline at end of file

resourceschedule/resourceschedule_standard/continuoustaskrelyhap/entry/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');
+    }
+};

resourceschedule/resourceschedule_standard/continuoustaskrelyhap/entry/src/main/js/default/i18n/en-US.json

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

resourceschedule/resourceschedule_standard/continuoustaskrelyhap/entry/src/main/js/default/i18n/zh-CN.json

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

resourceschedule/resourceschedule_standard/continuoustaskrelyhap/entry/src/main/js/default/pages/index/index.css

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

resourceschedule/resourceschedule_standard/continuoustaskrelyhap/entry/src/main/js/default/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{title}}
+    </text>
+</div>

resourceschedule/resourceschedule_standard/continuoustaskrelyhap/entry/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.
+ */
+
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    },
+    onShow() {
+        console.info('onShow finish')
+    },
+    onReady() {
+        console.info('onReady');
+    },
+}
\ No newline at end of file

resourceschedule/resourceschedule_standard/continuoustaskrelyhap/entry/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "ContinuousTaskServer"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Phone_Empty Feature Ability"
+    },
+    {
+      "name": "description_serviceability",
+      "value": "hap sample empty service"
+    }
+  ]
+}
\ No newline at end of file