修改ffrt的xts模型

Signed-off-by: Nwangyulie <wanglieyu@126.com>

resourceschedule/resourceschedule_standard/ffrt/AppScope/app.json

-{
-  "app": {
-    "bundleName": "com.actsffrt.napitest",
-    "vendor": "example",
-    "versionCode": 1000000,
-    "versionName": "1.0.0",
-    "icon": "$media:app_icon",
-    "label": "$string:app_name"
-  },
-  "minAPIVersion": 9,
-  "targetAPIVersion": 9,
-  "car": {
-      "apiCompatibleVersion": 10,
-      "singleUser": false
-  }
-}

resourceschedule/resourceschedule_standard/ffrt/AppScope/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "MyApplication"
-    }
-  ]
-}

resourceschedule/resourceschedule_standard/ffrt/BUILD.gn

@@ -13,29 +13,28 @@
 
 import("//build/ohos.gni")
 import("//test/xts/tools/build/suite.gni")
-
 ohos_js_hap_suite("resourceschedule_ffrt_js_test") {
-  hap_profile = "./src/main/module.json"
+  hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":windowStage_js_assets",
-    ":windowStage_resources",
+    ":ace_third_ets_assets",
+    ":ace_third_ets_resources",
+    ":ace_third_ets_test_assets",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFfrtNativeTest"
   subsystem_name = "resourceschedule"
   part_name = "ffrt"
-  shared_libraries = [ "./src/main/cpp:ffrtndk" ]
+  shared_libraries = [ "./entry/src/main/cpp:ffrtndk" ]
 }
-ohos_app_scope("windowStage_app_profile") {
-  app_profile = "AppScope/app.json"
-  sources = [ "AppScope/resources" ]
+
+ohos_js_assets("ace_third_ets_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_js_assets("windowStage_js_assets") {
-  source_dir = "./src/main/ets"
+ohos_js_assets("ace_third_ets_test_assets") {
+  source_dir = "./entry/src/main/ets/TestAbility"
 }
-ohos_resources("windowStage_resources") {
-  sources = [ "./src/main/resources" ]
-  deps = [ ":windowStage_app_profile" ]
-  hap_profile = "./src/main/module.json"
+ohos_resources("ace_third_ets_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
 }

resourceschedule/resourceschedule_standard/ffrt/Test.json

@@ -2,11 +2,10 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "OHJSUnitTest",
-        "test-timeout": "180000",
+        "test-timeout": "600000",
         "bundle-name": "com.actsffrt.napitest",
-        "module-name": "entry_test",
-        "shell-timeout": "600000",
-        "testcase-timeout": 70000
+        "package-name": "com.actsffrt.napitest",
+        "shell-timeout": "600000"
     },
     "kits": [
         {
@@ -16,6 +15,5 @@
             "type": "AppInstallKit",
             "cleanup-apps": true
         }
-    ] 
+    ]
 }
-

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

+{
+  "app": {
+    "bundleName": "com.actsffrt.napitest",
+    "vendor": "open",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 9,
+      "releaseType": "Release",
+      "target": 9
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.actsffrt.napitest",
+    "name": ".MyApplication",
+    "mainAbility": "com.actsffrt.napitest.MainAbility",
+
+    "deviceType": [
+      "default",
+      "tablet"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": false
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "orientation": "unspecified",
+        "visible": true,
+        "srcPath": "MainAbility",
+        "name": ".MainAbility",
+        "srcLanguage": "ets",
+        "icon": "$media:icon",
+        "description": "$string:description_mainability",
+        "formsEnabled": false,
+        "label": "$string:entry_MainAbility",
+        "type": "page",
+        "launchType": "standard"
+      },
+      {
+        "orientation": "unspecified",
+        "visible": true,
+        "srcPath": "TestAbility",
+        "name": ".TestAbility",
+        "srcLanguage": "ets",
+        "icon": "$media:icon",
+        "description": "$string:TestAbility_desc",
+        "formsEnabled": false,
+        "label": "$string:TestAbility_label",
+        "type": "page",
+        "launchType": "standard"
+      }
+    ],
+    "js": [
+      {
+        "mode": {
+          "syntax": "ets",
+          "type": "pageAbility"
+        },
+        "pages": [
+          "pages/index"
+        ],
+        "name": ".MainAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      },
+      {
+        "mode": {
+          "syntax": "ets",
+          "type": "pageAbility"
+        },
+        "pages": [
+          "pages/index"
+        ],
+        "name": ".TestAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file

resourceschedule/resourceschedule_standard/ffrt/src/main/cpp/BUILD.gn → resourceschedule/resourceschedule_standard/ffrt/entry/src/main/cpp/BUILD.gn

@@ -51,7 +51,6 @@ ohos_shared_library("ffrtndk") {
   
   deps = [
     "//foundation/resourceschedule/ffrt:ffrt_ndk",
-    "//foundation/resourceschedule/ffrt/interfaces/kits:libffrt_ndk",
   ]
 
   output_extension = "so"

resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/MainAbility/app.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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from 'hypium/index'
+import testsuite from '../test/List.test'
+
+export default {
+  onCreate() {
+    console.info('Application onCreate')
+    var abilityDelegator: any
+    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+    var abilityDelegatorArguments: any
+    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+    console.info('start run testcase!!!')
+    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+  },
+  onDestroy() {
+    console.info('Application onDestroy')
+  },
+}
\ No newline at end of file

resourceschedule/resourceschedule_standard/ffrt/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.
+ */
+
+@Entry
+@Component
+struct MyComponent {
+  aboutToAppear() {
+  }
+
+  build() {
+    Flex({
+      direction: FlexDirection.Column,
+      alignItems: ItemAlign.Center,
+      justifyContent: FlexAlign.Center
+    }) {
+      Text('BMS ETS TEST')
+        .fontSize(50)
+        .fontWeight(FontWeight.Bold)
+    }
+    .width('100%')
+    .height('100%')
+  }
+}
+

resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/TestAbility/app.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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from 'hypium/index'
+import testsuite from '../test/List.test'
+
+export default {
+  onCreate() {
+    console.info('Application onCreate')
+    var abilityDelegator: any
+    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+    var abilityDelegatorArguments: any
+    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+    console.info('start run testcase!!!')
+    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+  },
+  onDestroy() {
+    console.info('Application onDestroy')
+  },
+}
\ No newline at end of file

resourceschedule/resourceschedule_standard/ffrt/src/main/ets/TestAbility/pages/Index.ets → resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/TestAbility/pages/index.ets

-/*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+/**
+ * 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
@@ -12,14 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import hilog from '@ohos.hilog';
+import router from '@system.router';
 
 @Entry
 @Component
 struct Index {
   aboutToAppear() {
-    hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility index aboutToAppear');
+    console.info('TestAbility index aboutToAppear')
   }
+
  @State message: string = 'Hello World'
    build() {
          Row() {

resourceschedule/resourceschedule_standard/ffrt/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts → resourceschedule/resourceschedule_standard/ffrt/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

-/*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+/**
+ * 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
@@ -12,19 +12,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import hilog from '@ohos.hilog';
-import TestRunner from '@ohos.application.testRunner';
-import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
+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 itName',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s package'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams += ' ' + key + ' ' + parameters[key]
+        }
+    }
+    return targetParams.trim()
+}
+
 async function onAbilityCreateCallback() {
-    hilog.info(0x0000, 'testTag', '%{public}s', 'onAbilityCreateCallback');
+    console.log('onAbilityCreateCallback');
 }
 
 async function addAbilityMonitorCallback(err: any) {
-    hilog.info(0x0000, 'testTag', 'addAbilityMonitorCallback : %{public}s', JSON.stringify(err) ?? '');
+    console.info('addAbilityMonitorCallback : ' + JSON.stringify(err))
 }
 
 export default class OpenHarmonyTestRunner implements TestRunner {
@@ -32,32 +46,32 @@ export default class OpenHarmonyTestRunner implements TestRunner {
     }
 
     onPrepare() {
-        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare ');
+        console.info('OpenHarmonyTestRunner OnPrepare')
     }
 
-    async onRun() {
-        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run');
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
         abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
         abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
-        var testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility'
+
         let lMonitor = {
             abilityName: testAbilityName,
             onAbilityCreate: onAbilityCreateCallback,
         };
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.MainAbility'
         abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
-        var cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName
-        var debug = abilityDelegatorArguments.parameters['-D']
-        if (debug == 'true')
-        {
-            cmd += ' -D'
-        }
-        hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd);
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
+        console.info('cmd : '+cmd)
         abilityDelegator.executeShellCommand(cmd,
             (err: any, d: any) => {
-                hilog.info(0x0000, 'testTag', 'executeShellCommand : err : %{public}s', JSON.stringify(err) ?? '');
-                hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.stdResult ?? '');
-                hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.exitCode ?? '');
+                console.info('executeShellCommand : err : ' + JSON.stringify(err));
+                console.info('executeShellCommand : data : ' + d.stdResult);
+                console.info('executeShellCommand : data : ' + d.exitCode);
             })
-        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun end');
+        console.info('OpenHarmonyTestRunner onRun call abilityDelegator.getAppContext')
+        var context = abilityDelegator.getAppContext()
+        console.info('getAppContext : ' + JSON.stringify(context))
+        console.info('OpenHarmonyTestRunner onRun end')
     }
-}
\ No newline at end of file
+};
\ No newline at end of file

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

 {
   "string": [
     {
-      "name": "module_test_desc",
-      "value": "test ability description"
+      "name": "entry_MainAbility",
+      "value": "entry_MainAbility"
+    },
+    {
+      "name": "description_mainability",
+      "value": "ETS_Empty Ability"
     },
     {
       "name": "TestAbility_desc",
-      "value": "the test ability"
+      "value": "description"
     },
     {
       "name": "TestAbility_label",
-      "value": "test label"
+      "value": "label"
     }
   ]
 }
\ No newline at end of file

resourceschedule/resourceschedule_standard/ffrt/src/main/ets/TestAbility/TestAbility.ets

-/*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import UIAbility from '@ohos.app.ability.UIAbility';
-import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
-import hilog from '@ohos.hilog';
-import { Hypium } from '@ohos/hypium';
-import testsuite from '../test/List.test';
-import window from '@ohos.window';
-
-export default class TestAbility extends UIAbility {
-    onCreate(want, launchParam) {
-        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onCreate');
-        hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? '');
-        hilog.info(0x0000, 'testTag', '%{public}s', 'launchParam:'+ JSON.stringify(launchParam) ?? '');
-        var abilityDelegator: any
-        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
-        var abilityDelegatorArguments: any
-        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
-        hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!');
-        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
-    }
-
-    onDestroy() {
-        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onDestroy');
-    }
-
-    onWindowStageCreate(windowStage: window.WindowStage) {
-        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageCreate');
-        windowStage.loadContent('TestAbility/pages/Index', (err, data) => {
-            if (err.code) {
-                hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
-                return;
-            }
-            hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s',
-                JSON.stringify(data) ?? '');
-        });
-    }
-
-    onWindowStageDestroy() {
-        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageDestroy');
-    }
-
-    onForeground() {
-        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onForeground');
-    }
-
-    onBackground() {
-        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onBackground');
-    }
-}
\ No newline at end of file

resourceschedule/resourceschedule_standard/ffrt/src/main/module.json

-{
-  "module": {
-    "name": "entry_test",
-    "type": "feature",
-    "description": "$string:module_test_desc",
-    "mainElement": "TestAbility",
-    "deviceTypes": [
-      "phone"
-    ],
-    "deliveryWithInstall": true,
-    "installationFree": false,
-    "pages": "$profile:test_pages",
-    "abilities": [
-      {
-        "name": "TestAbility",
-        "srcEntry": "./ets/TestAbility/TestAbility.ets",
-        "description": "$string:TestAbility_desc",
-        "icon": "$media:icon",
-        "label": "$string:TestAbility_label",
-        "exported": true,
-        "startWindowIcon": "$media:icon",
-        "startWindowBackground": "$color:start_window_background",
-        "skills": [
-          {
-            "actions": [
-              "action.system.home"
-            ],
-            "entities": [
-              "entity.system.home"
-            ]
-          }
-        ]
-      }
-    ]
-  }
-}

resourceschedule/resourceschedule_standard/ffrt/src/main/resources/base/element/color.json

-{
-  "color": [
-    {
-      "name": "start_window_background",
-      "value": "#FFFFFF"
-    }
-  ]
-}
\ No newline at end of file

resourceschedule/resourceschedule_standard/ffrt/src/main/resources/base/profile/test_pages.json

-{
-  "src": [
-    "TestAbility/pages/Index"
-  ]
-}