!2113 XTS测试套onShow改成onActive

Merge pull request !2113 from chengxingzhen/master

aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "300000",
         "package": "com.example.actsamscallbackfifthscene",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "300000",
         "package": "com.example.actsamscallbackfirstscene",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/default/pages/index/index.js

@@ -26,7 +26,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "300000",
         "package": "com.example.actsamscallbackfourthscene",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "300000",
         "package": "com.example.actsamscallbacksecondscene",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "300000",
         "package": "com.example.actsamscallbackthirdscene",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "120000",
         "package": "com.example.actsamstestfifthscene",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "120000",
         "package": "com.example.actsamstestfirstscene",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "120000",
         "package": "com.example.actsamstestsecondscene",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "120000",
         "package": "com.example.actsamstestthirdscene",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/abilitymanager/clearmissionscallback/Test.json

@@ -5,7 +5,7 @@
         "test-timeout": "120000",
         "package": "com.ohos.launcher",
         "abilityName": "com.ohos.launcherSed11.MainAbility",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/abilitymanager/clearmissionscallback/src/main/js/default/pages/index/index.js

@@ -14,6 +14,9 @@
  */
 import file from '@system.file'
 import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
+
+const injectRef = Object.getPrototypeOf(global) || global
+injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
 var once = true
 export default {
     data: {
@@ -22,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/abilitymanager/clearmissionspromise/Test.json

@@ -5,7 +5,7 @@
         "test-timeout": "120000",
         "package": "com.ohos.launcher",
         "abilityName": "com.ohos.launcherSed111.MainAbility",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/abilitymanager/clearmissionspromise/src/main/js/default/pages/index/index.js

@@ -14,6 +14,9 @@
  */
 import file from '@system.file'
 import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
+
+const injectRef = Object.getPrototypeOf(global) || global
+injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
 var once = true
 export default {
     data: {
@@ -22,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/actsabilitydistributetest/Test.json

@@ -4,7 +4,7 @@
         "type" : "JSUnitTest",
         "test-timeout": "180000",
         "package": "com.example.actsabilitydistributetest",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/actsabilitydistributetest/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "18000",
         "package": "com.amsst.amsMissionSnapshotTest",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.js

@@ -23,7 +23,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('====onShow finish====<')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/amsdatauriutils/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "180000",
         "package": "com.amsst.amsdatauriutils",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.js

@@ -23,7 +23,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('====onShow finish====<')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/amsmultiapp/MultiAppPage/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
 
         const core = Core.getInstance()

aafwk/aafwk_standard/amsmultiapp/MultiAppPageConnectService/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
 
         const core = Core.getInstance()

aafwk/aafwk_standard/amsmultiapp/MultiAppPagePermission/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
 
         const core = Core.getInstance()

aafwk/aafwk_standard/amsmultiapp/MultiAppPage_PSS/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
 
         const core = Core.getInstance()

aafwk/aafwk_standard/amsmultiapp/MultiAppPage_Page/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
 
         const core = Core.getInstance()

aafwk/aafwk_standard/amsmultiapp/MultiAppSimultaneousOnline/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
 
         const core = Core.getInstance()

aafwk/aafwk_standard/amsmultiapp/MultiAppSimultaneousOnline_test/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
 
         const core = Core.getInstance()

aafwk/aafwk_standard/amsmultiapp/MultiAppTermination/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
 
         const core = Core.getInstance()

aafwk/aafwk_standard/amsmultiapp/MultiAppTermination_test/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
 
         const core = Core.getInstance()

aafwk/aafwk_standard/amsmultiapp/amsmultiapptester/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
 
         const core = Core.getInstance()

aafwk/aafwk_standard/amsmultiapp/amsmultidataabilityclone/entry/src/main/js/default/pages/index/index.js

@@ -23,7 +23,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('====onShow finish====<')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/amsmultiapp/amsmultidataabilityself/entry/src/main/js/default/pages/index/index.js

@@ -23,7 +23,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('====onShow finish====<')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/amszipfileunzipfilest/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "120000",
         "package": "com.example.amsZipfileUnzipfileST",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default{
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/context/actscontexttest/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "500000",
         "package": "com.example.actscontext",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/context/actscontexttest/entry/src/main/js/default/pages/index/index.js

@@ -28,7 +28,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/featureability/actsfeatureabilitytest/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "180000",
         "package": "com.example.actsfeatureabilitytest",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/default/pages/index/index.js

@@ -27,7 +27,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (!once) {
             return;
         }
@@ -40,6 +40,7 @@ export default {
         core.addService('expect', expectExtend)
         core.init()
         const configService = core.getDefaultService('config')
+        this.timeout = 10000;
         configService.setConfig(this)
 
         require('../../../test/List.test')

aafwk/aafwk_standard/formmanager/formsystemtesthost/actsformfuzztest/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "420000",
         "package": "com.example.formfuzztest",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/formmanager/formsystemtesthost/actsformfuzztest/entry/src/main/js/default/pages/index/index.js

@@ -29,7 +29,7 @@ export default {
     onInit() {
         this.title = "FMS Fuzz Test";
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/formmanager/formsystemtesthost/actsformsoneandonetest/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "300000",
         "package": "com.example.formsoneandone",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/formmanager/formsystemtesthost/actsformsoneandonetest/entry/src/main/js/default/pages/index/index.js

@@ -29,7 +29,7 @@ export default {
     onInit() {
         this.title = "卡片配置信息查询 \n有权限、是系统应用";
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/formmanager/formsystemtesthost/actsformsoneandtwotest/Test.json

@@ -4,7 +4,7 @@
         "type": "JSUnitTest",
         "test-timeout": "120000",
         "package": "com.example.formsoneandtwo",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/formmanager/formsystemtesthost/actsformsoneandtwotest/entry/src/main/js/default/pages/index/index.js

@@ -29,7 +29,7 @@ export default {
     onInit() {
         this.title = "卡片配置信息查询 \n有权限、是系统应用";
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/formmanager/formsystemtesthost/actsformszeroandonetest/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "300000",
         "package": "com.example.formszeroandone",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/formmanager/formsystemtesthost/actsformszeroandonetest/entry/src/main/js/default/pages/index/index.js

@@ -29,7 +29,7 @@ export default {
     onInit() {
         this.title = "卡片配置信息查询 \n有权限、是系统应用";
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/formmanager/formsystemtesthost/actsformszerotest/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "300000",
         "package": "com.example.formszero",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/formmanager/formsystemtesthost/actsformszerotest/entry/src/main/js/default/pages/index/index.js

@@ -29,7 +29,7 @@ export default {
     onInit() {
         this.title = "卡片配置信息查询 \n有权限、是系统应用";
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/getactiveprocessinfos/getactiveprocessinfo/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "30000",
+        "test-timeout": "300000",
         "package": "com.example.getactiveprocessinfo",
-        "shell-timeout": "30000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

aafwk/aafwk_standard/getactiveprocessinfos/getactiveprocessinfo/entry/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default{
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         console.info('onShow finish')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({

aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/default/pages/index/index.js

@@ -28,7 +28,7 @@ export default {
     onInit() {
         this.title = this.$t('strings.world');
     },
-    onShow() {
+    onActive() {
         if (once) {
             once = false
             console.info('onShow finish')

aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/test/ActsGetWantAllTest.js

@@ -18,19 +18,7 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from
 
 describe('ActsGetWantTest', function () {
     beforeAll(async (done) => {
-        await featureAbility.startAbility(
-            {
-                want:
-                {
-                    deviceId: "",
-                    bundleName: "com.ohos.launcher",
-                    abilityName: "com.ohos.launcher.MainAbility",
-                    action: "action1",
-                    parameters:
-                        {},
-                },
-            },
-        );
+        console.info('ActsGetWantTest begin')
         done();
     })