元能力用例修改

Signed-off-by: Nchengxingzhen <chengxingzhen@huawei.com>

ability/ability_runtime/actssupportfunction/BUILD.gn

@@ -17,6 +17,7 @@ group("actssupportfunction") {
   testonly = true
   if (is_standard_system) {
     deps = [
+      "actsonandoffscreentest:ActsOnAndOffScreenTest",
       "actssupportfunctiontest:ActsSupportFunctionTest",
       "faonandoffscreen:FaOnAndOffScreen",
       "fasupportfunction:fasupportfunction",

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/AppScope/app.json

+{
+  "app": {
+    "bundleName": "com.example.actsonandoffscreentest",
+    "vendor": "huawei",
+    "versionCode": 1000000,
+    "versionName": "1.0.0",
+    "debug": false,
+    "icon": "$media:app_icon",
+    "label": "$string:app_name",
+    "description" : "$string:app_name",
+    "distributedNotificationEnabled": true,
+    "keepAlive" : true,
+    "singleUser": true,
+    "minAPIVersion": 9,
+    "targetAPIVersion": 9,
+    "car": {
+      "apiCompatibleVersion": 9,
+      "singleUser": false
+    }
+  }
+}

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/AppScope/resources/base/element/string.json

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

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/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("ActsOnAndOffScreenTest") {
+  hap_profile = "entry/src/main/module.json"
+  deps = [
+    ":actsonandoffscreentest_js_assets",
+    ":actsonandoffscreentest_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "signature/openharmony_sx.p7b"
+  hap_name = "ActsOnAndOffScreenTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
+}
+
+ohos_app_scope("actsonandoffscreentest_app_profile") {
+  app_profile = "AppScope/app.json"
+  sources = [ "AppScope/resources" ]
+}
+
+ohos_js_assets("actsonandoffscreentest_js_assets") {
+  source_dir = "entry/src/main/ets"
+}
+
+ohos_resources("actsonandoffscreentest_resources") {
+  sources = [ "entry/src/main/resources" ]
+  deps = [ ":actsonandoffscreentest_app_profile" ]
+  hap_profile = "entry/src/main/module.json"
+}

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/Test.json

+{
+    "description": "Configuration for aceceshi Tests",
+    "driver": {
+        "type": "OHJSUnitTest",
+        "test-timeout": "600000",
+        "bundle-name": "com.example.actsonandoffscreentest",
+        "module-name": "entry",
+        "shell-timeout": "600000",
+        "testcase-timeout":"30000"
+    },
+    "kits": [
+        {
+            "test-file-name": [
+                "ActsOnAndOffScreenTest.hap",
+                "FaOnAndOffScreen.hap",
+                "StageOnAndOffScreen.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}
+

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/Application/MyAbilityStage.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";
+
+var TAG0 = 'ActsOnAndOffScreenTest:MyAbilityStage:';
+export default class MyAbilityStage extends AbilityStage {
+    onCreate() {
+        console.log(TAG0 + "onCreate")
+    }
+}
\ No newline at end of file

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
+import { Hypium } from '@ohos/hypium';
+import testsuite from '../test/List.test';
+
+var TAG1 = 'ActsOnAndOffScreenTest:MainAbility:';
+export default class MainAbility extends Ability {
+    onCreate(want, launchParam) {
+        console.log(TAG1 + 'onCreate');
+
+        globalThis.abilityTestContext = this.context;
+        globalThis.abilityWant = want;
+        globalThis.abilityWant.parameters.timeout = 15000;
+        var abilityDelegator: any
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments: any
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.log('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+    }
+
+    onDestroy() {
+        console.log(TAG1 + 'onDestroy');
+    }
+
+    onWindowStageCreate(windowStage) {
+        console.log(TAG1 + 'onWindowStageCreate');
+
+        windowStage.loadContent("pages/index", (err, data) => {
+            if (err.code) {
+                console.log(TAG1 + 'Failed to load the content. Cause:' + JSON.stringify(err));
+                return;
+            }
+            console.log(TAG1 + 'Succeeded in loading the content. Data: ' + JSON.stringify(data));
+        });
+    }
+
+    onWindowStageDestroy() {
+        console.log(TAG1 + 'onWindowStageDestroy');
+    }
+
+    onForeground() {
+        console.log(TAG1 + 'onForeground');
+    }
+
+    onBackground() {
+        console.log(TAG1 + 'onBackground');
+    }
+};

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/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
+var TAG = "ActsOnAndOffScreenTest == "
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s it',
+        '-s level', '-s testType', '-s size', '-s timeout'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams = `${targetParams} ${key} ${parameters[key]}`
+        }
+    }
+    return targetParams.trim()
+}
+
+async function onAbilityCreateCallback() {
+    console.log(TAG + "onAbilityCreateCallback");
+}
+
+async function addAbilityMonitorCallback(err: any) {
+    console.log(TAG + "addAbilityMonitorCallback : " + JSON.stringify(err))
+}
+
+export default class OpenHarmonyTestRunner implements TestRunner {
+    constructor() {
+    }
+
+    onPrepare() {
+        console.log(TAG + "OpenHarmonyTestRunner OnPrepare ")
+    }
+
+    async onRun() {
+        console.log(TAG + 'OpenHarmonyTestRunner onRun run')
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        globalThis.abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var MainAbilityName = 'MainAbility'
+        let lMonitor = {
+            abilityName: MainAbilityName,
+            onAbilityCreate: onAbilityCreateCallback,
+        };
+        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
+        var cmd = 'aa start -d 0 -a MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
+        console.log(TAG + 'cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd,
+            (err: any, d: any) => {
+                console.log(TAG + 'executeShellCommand : err : ' + JSON.stringify(err));
+                console.log(TAG + 'executeShellCommand : data : ' + d.stdResult);
+                console.log(TAG + 'executeShellCommand : data : ' + d.exitCode);
+            })
+        console.log(TAG + 'OpenHarmonyTestRunner onRun end')
+    }
+};
\ No newline at end of file

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/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.
+ */
+@Entry
+@Component
+struct Index {
+  aboutToAppear() {
+    console.log('ActsOnAndOffScreenTest MainAbility index aboutToAppear')
+  }
+
+  @State message: string = 'Hello World ActsOnAndOffScreenTest 1'
+
+  build() {
+    Row() {
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}
\ No newline at end of file

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/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 onAndOffScreenTest from './OnAndOffScreenTest.test';
+
+export default function testsuite() {
+  onAndOffScreenTest();
+}
\ No newline at end of file

ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/ets/test/OnAndOffScreenTest.test.ets → ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/test/OnAndOffScreenTest.test.ets

@@ -30,8 +30,8 @@ export default function OnAndOffScreenTest() {
     async function slideScreen(TAG) {
       console.log(TAG + "slideScreen start");
       var driver = UiDriver.create();
-      await driver.swipe(100, 100, 500, 500);
-      driver.delayMs(500);
+      await driver.swipe(1000, 3000, 1000, 500, 1200);
+      await driver.delayMs(500);
       console.log(TAG + "slideScreen end");
     }
 
@@ -70,9 +70,9 @@ export default function OnAndOffScreenTest() {
     afterEach(async (done) => {
       console.log(TAG1 + "afterEach called");
       let cmd1 = "aa force-stop ohos.acts.aafwk.test.faonandoffscreen";
-      await executeShellCommand(cmd1, TAG);
+      await executeShellCommand(cmd1, TAG1);
       let cmd2 = "aa force-stop ohos.acts.aafwk.test.stageonandoffscreen";
-      await executeShellCommand(cmd2, TAG);
+      await executeShellCommand(cmd2, TAG1);
 
       setTimeout(() => {
         console.log(TAG1 + "afterEach end");

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/module.json

+{
+  "module": {
+    "name": "entry",
+    "type": "entry",
+    "srcEntrance": "./ets/Application/MyAbilityStage.ts",
+    "description": "$string:entry_desc",
+    "mainElement": "MainAbility",
+    "deviceTypes": [
+      "phone"
+    ],
+    "deliveryWithInstall": true,
+    "installationFree": false,
+    "pages": "$profile:main_pages",
+    "uiSyntax": "ets",
+    "abilities": [
+      {
+        "name": "MainAbility",
+        "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+        "description": "$string:MainAbility_desc",
+        "icon": "$media:icon",
+        "label": "$string:MainAbility_label",
+        "startWindowIcon": "$media:icon",
+        "startWindowBackground": "$color:white",
+        "visible": true,
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/resources/base/element/color.json

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

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/resources/base/element/string.json

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

ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/resources/base/profile/main_pages.json

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

ability/ability_runtime/actssupportfunction/actssupportfunctiontest/Test.json

@@ -15,9 +15,7 @@
 				"FaSupportFunction.hap",
                 "FaSupportFunctionTwo.hap",
                 "FaSupportFunctionThree.hap",
-				"StageSupportFunction.hap",
-                "FaOnAndOffScreen.hap",
-                "StageOnAndOffScreen.hap"
+				"StageSupportFunction.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/ets/test/FaSetDisplayOrientation.test.ets

@@ -22,7 +22,7 @@ export default function FaSetDisplayOrientationTest() {
   describe('FaSetDisplayOrientationTest', function () {
 
     let TAG = "";
-    let TAG1 = "SUB_AA_OpenHarmony == ";
+    let TAG1 = "SUB_AA_OpenHarmony == FaSetDisplayOrientationTest : ";
     let sleepTimeOne = 1000;
     let sleepTimeTwo = 2000;
     let abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator();
@@ -67,12 +67,12 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0200
+     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0500
      * @tc.name    : Verify getDisplayOrientation and setDisplayOrientation interfaces
      * @tc.desc    : Set the horizontal and vertical screen status of ability to UNSPECIFIED.
      */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_0200', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0200 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_0500', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0500 == ';
       console.log(TAG + "begin");
 
       let displayOrientationBefore = undefined;
@@ -131,12 +131,12 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0300
+     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0600
      * @tc.name    : Verify getDisplayOrientation and setDisplayOrientation interfaces
      * @tc.desc    : Set the horizontal and vertical screen status of ability to LANDSCAPE.
      */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_0300', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0300 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_0600', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0600 == ';
       console.log(TAG + "begin");
 
       let displayOrientationBefore = undefined;
@@ -198,12 +198,12 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0400
+     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0700
      * @tc.name    : Verify getDisplayOrientation and setDisplayOrientation interfaces
      * @tc.desc    : Set the horizontal and vertical screen status of ability to PORTRAIT.
      */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_0400', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0400 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_0700', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0700 == ';
       console.log(TAG + "begin");
 
       let displayOrientationBefore = undefined;
@@ -265,13 +265,13 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0500
+     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0800
      * @tc.name    : Verify getDisplayOrientation and setDisplayOrientation interfaces
      * @tc.desc    : The same applies to setting ability1 to LANDSCAPE, and ability1 starts ability2 and sets the status
                      of ability2 to FOLLOW_RECENT.
      */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_0500', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0500 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_0800', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0800 == ';
       console.log(TAG + "begin");
 
       let displayOrientationBefore1 = undefined;
@@ -349,13 +349,13 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0600
+     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0900
      * @tc.name    : Verify getDisplayOrientation and setDisplayOrientation interfaces
      * @tc.desc    : The same applies to setting ability1 to PORTRAIT, and ability1 starts ability2 and sets the status
                      of ability2 to FOLLOW_RECENT.
      */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_0600', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0600 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_0900', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0900 == ';
       console.log(TAG + "begin");
 
       let displayOrientationBefore1 = undefined;
@@ -433,13 +433,13 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0700
+     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1000
      * @tc.name    : Verify getDisplayOrientation and setDisplayOrientation interfaces
      * @tc.desc    : Different haps set ability1 to LANDSCAPE, and ability1 starts ability2 and sets the status of
                      ability2 to FOLLOW_RECENT.
      */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_0700', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0700 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_1000', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1000 == ';
       console.log(TAG + "begin");
 
       let displayOrientationBefore1 = undefined;
@@ -517,13 +517,13 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0800
+     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1100
      * @tc.name    : Verify getDisplayOrientation and setDisplayOrientation interfaces
      * @tc.desc    : Different haps set ability1 to PORTRAIT, and ability1 starts ability2 and sets the status of
                      ability2 to FOLLOW_RECENT.
      */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_0800', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0800 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_1100', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1100 == ';
       console.log(TAG + "begin");
 
       let displayOrientationBefore1 = undefined;
@@ -601,13 +601,13 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_0900
+     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1200
      * @tc.name    : Verify getDisplayOrientation and setDisplayOrientation interfaces
      * @tc.desc    : Different applications set ability1 to LANDSCAPE, and ability1 starts ability2 and sets the status
                      of ability2 to FOLLOW_RECENT.
      */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_0900', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_0900 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_1200', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1200 == ';
       console.log(TAG + "begin");
 
       let displayOrientationBefore1 = undefined;
@@ -685,13 +685,13 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1000
+     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1300
      * @tc.name    : Verify getDisplayOrientation and setDisplayOrientation interfaces
      * @tc.desc    : Different applications set ability1 to PORTRAIT, and ability1 starts ability2 and sets the status
                      of ability2 to FOLLOW_RECENT.
      */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_1000', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1000 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_1300', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1300 == ';
       console.log(TAG + "begin");
 
       let displayOrientationBefore1 = undefined;
@@ -773,12 +773,12 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1100
+     * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1400
      * @tc.name    : Verify setDisplayOrientation interfaces
      * @tc.desc    : SetDisplayOrientation input parameter is undefined.
      */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_1100', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1100 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_1400', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1400 == ';
       console.log(TAG + "begin");
 
       let status1 = undefined;
@@ -837,12 +837,12 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-    * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1200
+    * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1500
     * @tc.name    : Verify setDisplayOrientation interfaces
     * @tc.desc    : SetDisplayOrientation input parameter is -1.
     */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_1200', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1200 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_1500', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1500 == ';
       console.log(TAG + "begin");
 
       let status1 = undefined;
@@ -901,12 +901,12 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-    * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1300
+    * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1600
     * @tc.name    : Verify setDisplayOrientation interfaces
     * @tc.desc    : SetDisplayOrientation input parameter is a nonexistent enumeration value.
     */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_1300', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1300 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_1600', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1600 == ';
       console.log(TAG + "begin");
 
       let status1 = undefined;
@@ -965,12 +965,12 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-    * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1400
+    * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1700
     * @tc.name    : Verify setDisplayOrientation interfaces
     * @tc.desc    : SetDisplayOrientation input parameter is a value of string type.
     */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_1400', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1400 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_1700', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1700 == ';
       console.log(TAG + "begin");
 
       let status1 = undefined;
@@ -1029,12 +1029,12 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-    * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1500
+    * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1800
     * @tc.name    : Verify setDisplayOrientation interfaces
     * @tc.desc    : SetDisplayOrientation input parameter is of type array.
     */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_1500', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1500 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_1800', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1800 == ';
       console.log(TAG + "begin");
 
       let status1 = undefined;
@@ -1093,12 +1093,12 @@ export default function FaSetDisplayOrientationTest() {
     })
 
     /*
-    * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1600
+    * @tc.number  : SUB_AA_OpenHarmony_DisplayOrientation_1900
     * @tc.name    : Verify setDisplayOrientation interfaces
     * @tc.desc    : SetDisplayOrientation input parameter is of type json.
     */
-    it('SUB_AA_OpenHarmony_DisplayOrientation_1600', 0, async function (done) {
-      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1600 == ';
+    it('SUB_AA_OpenHarmony_DisplayOrientation_1900', 0, async function (done) {
+      TAG = 'SUB_AA_OpenHarmony_DisplayOrientation_1900 == ';
       console.log(TAG + "begin");
 
       let status1 = undefined;

ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/ets/test/FaShowOnLock.test.ets

@@ -22,7 +22,7 @@ export default function FaShowOnLockTest() {
   describe('FaShowOnLockTest', function () {
 
     let TAG = "";
-    let TAG1 = "SUB_AA_OpenHarmony == ";
+    let TAG1 = "SUB_AA_OpenHarmony == FaShowOnLockTest : ";
     let sleepTimeOne = 1000;
     let sleepTimeTwo = 2000;
     let abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator();

ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/ets/test/List.test.ets

@@ -15,11 +15,9 @@
 import abilityIsTerminatingTest from './AbilityIsTerminating.test';
 import faSetDisplayOrientation from './FaSetDisplayOrientation.test';
 import faShowOnLock from './FaShowOnLock.test';
-import onAndOffScreenTest from './OnAndOffScreenTest.test';
 
 export default function testsuite() {
   abilityIsTerminatingTest();
   faSetDisplayOrientation();
   faShowOnLock();
-  onAndOffScreenTest();
 }
\ No newline at end of file

ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/MainAbility2/MainAbility2.ts

@@ -16,12 +16,12 @@ import Ability from '@ohos.application.Ability'
 import commonEvent from '@ohos.commonEvent'
 
 async function onShowProcess() {
-    var abilityWant = globalThis.abilityWant;
+    var abilityWant = globalThis.abilityWant2;
 
     var commonEventPublishData = {
         parameters: {
-            displayId: globalThis.abilityWant.parameters['ohos.aafwk.param.displayId'],
-            windowMode: globalThis.abilityWant.parameters['ohos.aafwk.param.windowMode'],
+            displayId: abilityWant.parameters['ohos.aafwk.param.displayId'],
+            windowMode: abilityWant.parameters['ohos.aafwk.param.windowMode'],
         }
     };
    
@@ -29,7 +29,7 @@ async function onShowProcess() {
   
     commonEvent.publish("ACTS_TerminateSelf_CommonEvent", commonEventPublishData, () => {
         console.log('============>querytestsecond success==========>>')
-        globalThis.abilityContext.terminateSelf();
+        globalThis.abilityContext2.terminateSelf();
     });
     
 }
@@ -38,8 +38,8 @@ export default class MainAbility extends Ability {
     onCreate(want, launchParam) {
         // Ability is creating, initialize resources for this ability
         console.log("MainAbility2 onCreate")
-        globalThis.abilityWant = want;
-        console.log("AbilityMultiInstanceAppA abilityWant = " + JSON.stringify( globalThis.abilityWant));
+        globalThis.abilityWant2 = want;
+        console.log("AbilityMultiInstanceAppA abilityWant = " + JSON.stringify( globalThis.abilityWant2));
     }
 
     onDestroy() {
@@ -50,7 +50,7 @@ export default class MainAbility extends Ability {
     onWindowStageCreate(windowStage) {
         // Main window is created, set main page for this ability
         console.log("MainAbility2 onWindowStageCreate")
-        globalThis.abilityContext = this.context
+        globalThis.abilityContext2 = this.context
         windowStage.setUIContent(this.context, "MainAbility/pages/second/second", null)
     }
 

ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts

@@ -38,7 +38,7 @@ export default class ServiceAbility extends ServiceExtension {
                     abilityName: 'com.example.startabilityforresult.MainAbility2'
                 },
                 {
-                    windowMode: 2,
+                    windowMode: 0,
                     displayId: 10,
                 }).then(() => {
                 console.log("====>end startAbility====>success!")

ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/test/Ability.test.ets

@@ -225,7 +225,7 @@ export default function abilityTest() {
         if (data.event == "ACTS_TerminateSelf_CommonEvent") {
           clearTimeout(id);
           expect(data.parameters['displayId']).assertEqual(10);
-          expect(data.parameters['windowMode']).assertEqual(2);
+          expect(data.parameters['windowMode']).assertEqual(0);
           commonEvent.unsubscribe(subscriber, unSubscribeCallback)
           expect(data.event).assertEqual("ACTS_TerminateSelf_CommonEvent");