!8959 sidebar xts测试

Merge pull request !8959 from huangdong/master

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/AppScope/app.json

-{
-    "app": {
-        "bundleName": "com.example.sidebarcontainertest",
-    	"vendor": "example",
-        "versionCode": 1000000,
-        "versionName": "1.0.0",
-    	"icon": "$media:app_icon",
-        "label": "$string:app_name",
-        "distributedNotificationEnabled": true,
-        "keepAlive": true,
-        "singleUser": true,
-        "minAPIVersion": 10,
-        "targetAPIVersion": 10,
-        "car": {
-            "apiCompatibleVersion": 10,
-            "singleUser": false
-        }
-    }
-}
\ No newline at end of file

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/AppScope/resources/base/element/string.json

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

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/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("ActsSidebarTypeTest") {
-  hap_profile = "src/main/module.json"
-  js_build_mode = "debug"
-  deps = [
-    ":ace_ets_component_sidebarcontainertest_js_assets",
-    ":ace_ets_component_sidebarcontainertest_resources",
-  ]
-  ets2abc = true
-  certificate_profile = "signature/openharmony_sx.p7b"
-  hap_name = "ActsSidebarTypeTest"
-  part_name = "ace_engine"
-  subsystem_name = "arkui"
-}
-
-ohos_app_scope("ace_ets_component_sidebarcontainertest_profile") {
-  app_profile = "AppScope/app.json"
-  sources = [ "AppScope/resources" ]
-}
-
-ohos_js_assets("ace_ets_component_sidebarcontainertest_js_assets") {
-  source_dir = "src/main/ets"
-}
-
-ohos_resources("ace_ets_component_sidebarcontainertest_resources") {
-  sources = [ "src/main/resources" ]
-  deps = [ ":ace_ets_component_sidebarcontainertest_profile" ]
-  hap_profile = "src/main/module.json"
-}

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "600000",
-        "bundle-name": "com.example.sidebarcontainertest",
-        "module-name": "phone",
-        "shell-timeout": "600000",
-        "testcase-timeout": 240000
-    },
-    "kits": [{
-        "test-file-name": [
-            "ActsSidebarTypeTest.hap"
-        ],
-        "type": "AppInstallKit",
-        "cleanup-apps": true
-        },
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "power-shell wakeup",
-                "power-shell setmode 602"
-            ]
-        }
-    ]
-}
\ No newline at end of file

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/src/main/ets/TestAbility/TestAbility.ets

-/*
- * Copyright (c) 2023 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 hilog from '@ohos.hilog';
-import Ability from '@ohos.app.ability.UIAbility'
-import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import testsuite from '../test/List.test'
-import Window from '@ohos.window'
-
-export default class TestAbility extends Ability {
-    onCreate(want, launchParam) {
-        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-        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) ?? '');
-    }
-
-    onDestroy() {
-        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onDestroy');
-    }
-
-    onWindowStageCreate(windowStage: Window.WindowStage) {
-        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageCreate');
-        windowStage.loadContent('TestAbility/pages/Index', (err, data) => {
-            if (err.code) {
-                hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.ERROR);
-                hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
-                return;
-            }
-            hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-            hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s',
-                JSON.stringify(data) ?? '');
-        });
-    }
-
-    onWindowStageDestroy() {
-        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onWindowStageDestroy');
-    }
-
-    onForeground() {
-        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onForeground');
-    }
-
-    onBackground() {
-        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-        hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility onBackground');
-    }
-}

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

-/*
- * Copyright (c) 2023 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 hilog from '@ohos.hilog';
-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 it',
-    '-s level', '-s testType', '-s size', '-s timeout',
-    '-s dryRun'
-  ]);
-  let targetParams = '';
-  for (const key in parameters) {
-    if (keySet.has(key)) {
-      targetParams = `${targetParams} ${key} ${parameters[key]}`;
-    }
-  }
-  return targetParams.trim();
-}
-
-async function onAbilityCreateCallback() {
-  hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-  hilog.info(0x0000, 'testTag', '%{public}s', 'onAbilityCreateCallback');
-}
-
-async function addAbilityMonitorCallback(err): Promise<void> {
-  hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-  hilog.info(0x0000, 'testTag', 'addAbilityMonitorCallback : %{public}s', JSON.stringify(err) ?? '');
-}
-
-export default class OpenHarmonyTestRunner implements TestRunner {
-  constructor() {
-  }
-
-  onPrepare() {
-    hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-    hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare ');
-  }
-
-  async onRun() {
-    hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-    hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run');
-    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments();
-    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator();
-    let testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility';
-    let lMonitor = {
-      abilityName: testAbilityName,
-      onAbilityCreate: onAbilityCreateCallback,
-    };
-    abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback);
-    let cmd = 'aa start -d 0 -a TestAbility' + ' -b ' + abilityDelegatorArguments.bundleName;
-    cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters);
-    let debug = abilityDelegatorArguments.parameters['-D'];
-    if (debug == 'true') {
-      cmd += ' -D';
-    }
-    hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-    hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd);
-    abilityDelegator.executeShellCommand(cmd,
-      (err, d) => {
-        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-        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 ?? '');
-      });
-    hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun end');
-  }
-}
\ No newline at end of file

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/src/main/ets/test/List.test.ets

-/*
- * Copyright (c) 2023 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 sidebarTypeTest from './sidebar_type.test';
-
-export default function testsuite() {
-  sidebarTypeTest()
-}
\ No newline at end of file

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/src/main/module.json

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

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/src/main/resources/base/element/color.json

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

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/src/main/resources/base/element/float.json

-{
-  "float": [
-    {
-      "name": "textShadowRadius",
-      "value": "5.0"
-    },
-    {
-      "name": "textShadowOffset",
-      "value": "5.0"
-    }
-  ]
-}
\ No newline at end of file

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/src/main/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "module_test_desc",
-      "value": "test ability description"
-    },
-    {
-      "name": "TestAbility_desc",
-      "value": "the test ability"
-    },
-    {
-      "name": "TestAbility_label",
-      "value": "test label"
-    },
-    {
-      "name": "Divider_width",
-      "value": "10px"
-    },
-    {
-      "name": "Divider_startMargin",
-      "value": "5px"
-    },
-    {
-      "name": "Divider_endMargin",
-      "value": "5px"
-    },
-    {
-      "name": "textInput_Size_test",
-      "value": "4"
-    }
-  ]
-}
\ No newline at end of file

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/src/main/resources/base/profile/test_pages.json

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

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/src/main/ets/TestAbility/pages/Index.ets → arkui/ace_ets_component_completion/ace_ets_component_wholeCompletion/src/main/ets/TestAbility/pages/sidebarType.ets

@@ -12,15 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import events_emitter from '@ohos.events.emitter';
-import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
-import { Hypium } from '@ohos/hypium';
-import hilog from '@ohos.hilog';
-import testsuite from '../../test/List.test'
-
 @Entry
 @Component
-struct Index {
+struct sidebarType {
   @State strokeWidthStr: string = '10px'
   @State dividerColorStr: string  = '#000000'
   @State startMarginStr: string = '5px'
@@ -53,15 +47,6 @@ struct Index {
       }
     }
   }
-  aboutToAppear(){
-    var abilityDelegator: any
-    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
-    var abilityDelegatorArguments: any
-    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
-    hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
-    hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!');
-    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
-  }
 
   normalIcon : Resource = $r("app.media.icon")
   selectedIcon: Resource = $r("app.media.icon")

arkui/ace_ets_component_completion/ace_ets_component_wholeCompletion/src/main/ets/test/List.test.ets

@@ -31,6 +31,7 @@ import imageObscuredTest from './imageObscuredTest.test';
 import stageAnimatorTest from './stageAnimator.test';
 import textSpanFontTest from './textSpanFont.test';
 import gridScrollbarUpdateTest from './gridScrollbarUpdate.test';
+import sidebarTypeTest from './sidebarType.test';
 
 export default function testsuite() {
   stageFontTest()
@@ -51,4 +52,5 @@ export default function testsuite() {
   stageAnimatorTest()
   textSpanFontTest()
   gridScrollbarUpdateTest()
+  sidebarTypeTest()
 }
\ No newline at end of file

arkui/ace_ets_component_completion/ace_ets_component_sidebarcontainertest/src/main/ets/test/sidebar_type.test.ets → arkui/ace_ets_component_completion/ace_ets_component_wholeCompletion/src/main/ets/test/sidebarType.test.ets

@@ -12,34 +12,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import router from '@system.router';
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "@ohos/hypium"
 
 export default function sidebarTypeTest() {
-  describe('ActsSidebarTypeTest', function () {
-    // Defines a test suite. Two parameters are supported: test suite name and test suite function.
-    beforeAll(async function (done) {
+  describe('sidebarTypeTest', function () {
+    beforeEach(async function (done) {
       console.info("flex beforeEach start");
       let options = {
-        uri: 'testability/pages/Index',
+        uri: 'TestAbility/pages/sidebarType',
       }
       try {
         router.clear();
         let pages = router.getState();
-        console.info("get Index state success " + JSON.stringify(pages));
-        if (!("Index" == pages.name)) {
-          console.info("get Index state success " + JSON.stringify(pages.name));
+        console.info("get sidebarType state success " + JSON.stringify(pages));
+        if (!("sidebarType" == pages.name)) {
+          console.info("get sidebarType state success " + JSON.stringify(pages.name));
           let result = await router.push(options);
-          console.info("push Index page success " + JSON.stringify(result));
+          console.info("push sidebarType page success " + JSON.stringify(result));
         }
       } catch (err) {
-        console.error("push Index page error: " + err);
+        console.error("push sidebarType page error: " + err);
       }
       done()
-      // Presets an action, which is performed only once before all test cases of the test suite start.
-      // This API supports only one parameter: preset action function.
-    })
+    });
 
     it('ArkUX_SideBarContainer_1000', 0, async function (done) {
       console.info('ArkUX_SideBarContainer_1000 START');

arkui/ace_ets_component_completion/ace_ets_component_wholeCompletion/src/main/resources/base/profile/test_pages.json

@@ -19,6 +19,7 @@
     "TestAbility/pages/imageObscuredTest",
     "TestAbility/pages/stageAnimator",
     "TestAbility/pages/textSpanFont",
-    "TestAbility/pages/gridScrollBar"
+    "TestAbility/pages/gridScrollBar",
+    "TestAbility/pages/sidebarType"
   ]
 }
\ No newline at end of file