diff --git a/graphic/BUILD.gn b/graphic/BUILD.gn index 31f7183c22622bd6702aacd92d55b290569c7a03..df3180a9a94c1e0b2981e6dfa65b52ce57916fc4 100755 --- a/graphic/BUILD.gn +++ b/graphic/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# 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 @@ -16,6 +16,7 @@ group("graphic") { testonly = true if (is_standard_system) { deps = [ + "crossplatform:crossplatform", "effectKit:EffectKitTest", "graphicColorSpace:ActsColorSpaceManagerTest", "graphicnapidrawingtest:ActsGraphicNapiDrawingTest", diff --git a/graphic/crossplatform/.idea/.gitignore b/graphic/crossplatform/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..26d33521af10bcc7fd8cea344038eaaeb78d0ef5 --- /dev/null +++ b/graphic/crossplatform/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/graphic/crossplatform/.idea/crossplatform.iml b/graphic/crossplatform/.idea/crossplatform.iml new file mode 100644 index 0000000000000000000000000000000000000000..d6ebd4805981b8400db3e3291c74a743fef9a824 --- /dev/null +++ b/graphic/crossplatform/.idea/crossplatform.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter.xml new file mode 100644 index 0000000000000000000000000000000000000000..34c36371abe13dc2b25a6aa3c5c74d899ad041d6 --- /dev/null +++ b/graphic/crossplatform/.idea/libraries/arkui_android_adapter.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter1.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter1.xml new file mode 100644 index 0000000000000000000000000000000000000000..53ec233c81c5300deb492843e530bed587dba50c --- /dev/null +++ b/graphic/crossplatform/.idea/libraries/arkui_android_adapter1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter2.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter2.xml new file mode 100644 index 0000000000000000000000000000000000000000..d2e0262f123b40345331449308d75d9d3abce9a9 --- /dev/null +++ b/graphic/crossplatform/.idea/libraries/arkui_android_adapter2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter3.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter3.xml new file mode 100644 index 0000000000000000000000000000000000000000..155627ed49c9f977a6f86137e6b309b37bf562ef --- /dev/null +++ b/graphic/crossplatform/.idea/libraries/arkui_android_adapter3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter4.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter4.xml new file mode 100644 index 0000000000000000000000000000000000000000..5e619b0ef7b23a5f84f9bfd9232e83d77b541879 --- /dev/null +++ b/graphic/crossplatform/.idea/libraries/arkui_android_adapter4.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter5.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter5.xml new file mode 100644 index 0000000000000000000000000000000000000000..7de8c0eb026b14103cc0db6f9b8946635debed50 --- /dev/null +++ b/graphic/crossplatform/.idea/libraries/arkui_android_adapter5.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/graphic/crossplatform/.idea/misc.xml b/graphic/crossplatform/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..639900d13c6182e452e33a3bd638e70a0146c785 --- /dev/null +++ b/graphic/crossplatform/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/graphic/crossplatform/.idea/modules.xml b/graphic/crossplatform/.idea/modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..cdb75f80a292a93d6e125b848a81374f201f525d --- /dev/null +++ b/graphic/crossplatform/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/graphic/crossplatform/.idea/vcs.xml b/graphic/crossplatform/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..b2bdec2d71b6a5ce4ae49efc37516809c50e4d5e --- /dev/null +++ b/graphic/crossplatform/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/graphic/crossplatform/BUILD.gn b/graphic/crossplatform/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..fb0ff95aa995684a3cc6c0c6df379c7d5e103c12 --- /dev/null +++ b/graphic/crossplatform/BUILD.gn @@ -0,0 +1,20 @@ +# 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("//test/xts/tools/build/suite.gni") + +group("crossplatform") { + testonly = true + if (is_standard_system) { + deps = [ "graphicDisplayetstest:Display_ets_test" ] + } +} diff --git a/graphic/crossplatform/graphicDisplayetstest/AppScope/app.json b/graphic/crossplatform/graphicDisplayetstest/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..7eda80e670291d90ab5738805e7fcd77a8cb1d4f --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/AppScope/app.json @@ -0,0 +1,16 @@ +{ + "app": { + "bundleName": "ohos.acts.graphic.crossplatform.Display.normal", + "vendor": "example", + "versionCode": 1000000, + "versionName": "1.0.0", + "icon": "$media:app_icon", + "label": "$string:app_name", + "minAPIVersion": 9, + "targetAPIVersion": 9, + "car": { + "apiCompatibleVersion": 9, + "singleUser": false + } + } +} diff --git a/graphic/crossplatform/graphicDisplayetstest/AppScope/resources/base/element/string.json b/graphic/crossplatform/graphicDisplayetstest/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..3811bc441fc0f128eb4d14c53ed463ffb8dc3811 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "app_name", + "value": "xtsDemo1" + } + ] +} diff --git a/graphic/crossplatform/graphicDisplayetstest/AppScope/resources/base/media/app_icon.png b/graphic/crossplatform/graphicDisplayetstest/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/graphic/crossplatform/graphicDisplayetstest/AppScope/resources/base/media/app_icon.png differ diff --git a/graphic/crossplatform/graphicDisplayetstest/BUILD.gn b/graphic/crossplatform/graphicDisplayetstest/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..f30508b114d5effe0884cba732037875a55411b7 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/BUILD.gn @@ -0,0 +1,37 @@ +import("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("Display_ets_test") { + hap_profile = "src/main/module.json" + deps = [ + ":windowStage_js_assets", + ":windowStage_resources", + ] + ets2abc = true + certificate_profile = "./signature/openharmony_sx.p7b" + + # hap_name: HAP的名字，可选，默认为目标名 + hap_name = "Display_ets_test" + subsystem_name = "graphic" + part_name = "ets_utils" +} +ohos_app_scope("windowStage_app_profile") { + # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用 + app_profile = "AppScope/app.json" + + # sources: 资源文件路径 + sources = [ "AppScope/resources" ] +} +ohos_js_assets("windowStage_js_assets") { + # source_dir: js或ets代码路径，兼容FA模型的单ability配置到ability目录 + source_dir = "src/main/ets" +} +ohos_resources("windowStage_resources") { + # sources: 资源文件路径 + sources = [ "src/main/resources" ] + + # deps: 当前目标的依赖 + deps = [ ":windowStage_app_profile" ] + + # hap_profile: HAP的config.json，Stage模型对应module.json + hap_profile = "src/main/module.json" +} diff --git a/graphic/crossplatform/graphicDisplayetstest/Test.json b/graphic/crossplatform/graphicDisplayetstest/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..44a3eafc6ed497dc0b1fd5ee3a5f3af45daf4008 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/Test.json @@ -0,0 +1,27 @@ +{ + "description": "Configuration for hjunit demo Tests", + // 指定设备执行的驱动 + "driver": { + "type": "OHJSUnitTest", + //test-timeout: 测试hap 整体执行用例的执行时长 + "test-timeout": "60000", + //shell-timeout: aa test 拉起命令执行时长 + "shell-timeout": "60000", + //bundle-name: 与HAP的app.json 中 bundleName 保持一致 + "bundle-name": "ohos.acts.graphic.crossplatform.Display.normal", + //module-name: 与HAP的module.json 中"module"字段的 name 保持一致 + "module-name": "entry_test" + //testcase-timeout: 测试hap 单条用例的执行时长 + //"testcase-timeout": 5000 + }, + // kit的作用主要是为了支撑测试执行活动，在测试前执行预制操作(Setup)，在测试后执行清理操作(Teardown) + "kits": [ + { + "test-file-name": [ + "ActsDemoStageTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} \ No newline at end of file diff --git a/graphic/crossplatform/graphicDisplayetstest/signature/openharmony_sx.p7b b/graphic/crossplatform/graphicDisplayetstest/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..4675860ed99f9a2eea2b4780d9de69f19e6a127b Binary files /dev/null and b/graphic/crossplatform/graphicDisplayetstest/signature/openharmony_sx.p7b differ diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/ets/TestAbility/TestAbility.ets b/graphic/crossplatform/graphicDisplayetstest/src/main/ets/TestAbility/TestAbility.ets new file mode 100644 index 0000000000000000000000000000000000000000..2d889f4fdf763010c29f1767b033420a5c7b8671 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/ets/TestAbility/TestAbility.ets @@ -0,0 +1,48 @@ +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 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/ets/TestAbility/pages/Index.ets b/graphic/crossplatform/graphicDisplayetstest/src/main/ets/TestAbility/pages/Index.ets new file mode 100644 index 0000000000000000000000000000000000000000..166366593a7e55ef17e6619f68a4c46214814858 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/ets/TestAbility/pages/Index.ets @@ -0,0 +1,34 @@ +import hilog from '@ohos.hilog'; + +@Entry +@Component +struct Index { + aboutToAppear() { + hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility index aboutToAppear'); + } + @State message: string = 'Hello World' + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(20) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .width('35%') + .height('5%') + .onClick(()=>{ + }) + } + .width('100%') + } + .height('100%') + } + } \ No newline at end of file diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/graphic/crossplatform/graphicDisplayetstest/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..92a16d84e8870da219c51d9f1342c79203c1f42d --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,49 @@ +import hilog from '@ohos.hilog'; +import TestRunner from '@ohos.application.testRunner'; +import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; + +var abilityDelegator = undefined +var abilityDelegatorArguments = undefined + +async function onAbilityCreateCallback() { + hilog.info(0x0000, 'testTag', '%{public}s', 'onAbilityCreateCallback'); +} + +async function addAbilityMonitorCallback(err: any) { + hilog.info(0x0000, 'testTag', 'addAbilityMonitorCallback : %{public}s', JSON.stringify(err) ?? ''); +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare '); + } + + async onRun() { + hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run'); + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.TestAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + 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); + 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 ?? ''); + }) + hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun end'); + } +} \ No newline at end of file diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/ets/test/Display.test.ets b/graphic/crossplatform/graphicDisplayetstest/src/main/ets/test/Display.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..534ee5f3a25c002dace6e5f0d196a94613ca6c81 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/ets/test/Display.test.ets @@ -0,0 +1,202 @@ +/* + * 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 app from '@system.app' +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium' +import window from '@ohos.window' +import display from '@ohos.display' + +export default function DisplayTest() { + describe('DisplayTest', function () { + + beforeAll(function () { + }) + beforeEach(function () { + }) + afterEach(function () { + }) + afterAll(function () { + }) + + /** + * @tc.number: TEST_GET_DEFAULT_DISPLAY_SYNC_001 + * @tc.name : testGetDefaultDisplaySync001 + * @tc.desc : To test the sync function of obtaining the default display. + * @tc.size : MediumTest + * @tc.type : Method + * @tc.level : Level 2 + */ + it('testGetDefaultDisplaySync001', 0, async function (done) { + console.info('displayTest getDefaultDisplaySyncTest1 begin'); + try { + var dsp = display.getDefaultDisplaySync(); + expect(dsp.id != null).assertTrue(); + expect(dsp.refreshRate != null).assertTrue(); + expect(dsp.width != null).assertTrue(); + expect(dsp.height != null).assertTrue(); + expect(dsp.rotation != null).assertTrue(); + expect(dsp.densityDPI != null).assertTrue(); + expect(dsp.name != null).assertTrue(); + expect(dsp.alive).assertTrue(); + expect(dsp.state != null).assertTrue(); + expect(dsp.densityPixels != null).assertTrue(); + expect(dsp.scaledDensity != null).assertTrue(); + expect(dsp.xDPI != null).assertTrue(); + expect(dsp.yDPI != null).assertTrue(); + done(); + } catch (err) { + console.error('getDefaultDisplaySyncTest1 error ' + JSON.stringify(err)); + expect().assertFail(); + done(); + } + }); + + /** + * @tc.number: TEST_RECT_LEFT_001 + * @tc.name : testRect_Left001 + * @tc.desc : To test value of RECT. + * @tc.size : MediumTest + * @tc.type : Field + * @tc.level : Level 1 + */ + it('testRect_Left001', 0, async function (done) { + try { + var rect = { + left : 20, + top : 40, + width : 100, + height : 200 + } + expect(rect.left).assertEqual(20); + done(); + } catch (err) { + console.error('test value of rect error :' + JSON.stringify(err)); + expect().assertFail(); + done(); + } + }); + + /** + * @tc.number: TEST_RECT_TOP_001 + * @tc.name : testRect_Top001 + * @tc.desc : To test value of RECT. + * @tc.size : MediumTest + * @tc.type : Field + * @tc.level : Level 1 + */ + it('testRect_Top001', 0, async function (done) { + try { + var rect = { + left : 20, + top : 40, + width : 100, + height : 200 + } + expect(rect.top).assertEqual(40); + done(); + } catch (err) { + console.error('test value of rect error :' + JSON.stringify(err)); + expect().assertFail(); + done(); + } + }); + + /** + * @tc.number: TEST_RECT_WIDTH_001 + * @tc.name : testRect_Width001 + * @tc.desc : To test value of RECT. + * @tc.size : MediumTest + * @tc.type : Field + * @tc.level : Level 1 + */ + it('testRect_Width001', 0, async function (done) { + try { + var rect = { + left : 20, + top : 40, + width : 100, + height : 200 + } + expect(rect.width).assertEqual(100); + done(); + } catch (err) { + console.error('test value of rect error :' + JSON.stringify(err)); + expect().assertFail(); + done(); + } + }); + + /** + * @tc.number: TEST_RECT_HEIGHT_001 + * @tc.name : testRect_Height001 + * @tc.desc : To test value of RECT. + * @tc.size : MediumTest + * @tc.type : Field + * @tc.level : Level 1 + */ + it('testRect_Height001', 0, async function (done) { + try { + var rect = { + left : 20, + top : 40, + width : 100, + height : 200 + } + expect(rect.height).assertEqual(200); + done(); + } catch (err) { + console.error('test value of rect error :' + JSON.stringify(err)); + expect().assertFail(); + done(); + } + }); + + /** + * @tc.number: TEST_DISPLAY_ORIENTATION_001 + * @tc.name : testDisplay_Orientation001 + * @tc.desc : To test value of Display. + * @tc.size : MediumTest + * @tc.type : Field + * @tc.level : Level 1 + */ + it('testDisplay_Orientation001', 0, async function (done) { + var dsp = display.getDefaultDisplaySync(); + expect(dsp.id != null).assertTrue(); + expect(dsp.width != null).assertTrue(); + expect(dsp.height != null).assertTrue(); + expect(dsp.orientation != null).assertTrue(); + done(); + }); + + /** + * @tc.number: TEST_ORIENTATION_001 + * @tc.name : testOrientation001 + * @tc.desc : To test value of Orientation. + * @tc.size : MediumTest + * @tc.type : Enum + * @tc.level : Level 0 + */ + it('testOrientation001', 0, async function (done) { + var dsp = display.getDefaultDisplaySync(); + expect(dsp.orientation == 0).assertTrue(); + expect(dsp.orientation != 1).assertTrue(); + expect(dsp.orientation != 2).assertTrue(); + expect(dsp.orientation != 3).assertTrue(); + done(); + }); + + + }) +} + diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/ets/test/List.test.ets b/graphic/crossplatform/graphicDisplayetstest/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..5528de9811d6810dc5834185292b5d1c3b56baf3 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/ets/test/List.test.ets @@ -0,0 +1,5 @@ +import DisplayTest from './Display.test' + +export default function testsuite() { + DisplayTest() +} \ No newline at end of file diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arkui_android_adapter.jar b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arkui_android_adapter.jar new file mode 100644 index 0000000000000000000000000000000000000000..304f6cc5c8ed284b4259f38aa5e230a428a6bbe9 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arkui_android_adapter.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7ce1f5258c382b6f64a6ae003febfc5e5e860c0c3414d89d05b5b0326d23b4a +size 246590 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libace_ndk.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libace_ndk.so new file mode 100644 index 0000000000000000000000000000000000000000..1e36b9d6bfc303f1bd016f7edd05e9168cf1240d --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libace_ndk.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e282dbd2e9f24e9a88b1d7619ca4b9da4b56be92019c1bb9e2b1624d05a275a +size 172496 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libace_plugin_util_android.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libace_plugin_util_android.so new file mode 100644 index 0000000000000000000000000000000000000000..f9dcc18146a62dde7a66c2b9049efc8bde74bcee --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libace_plugin_util_android.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4db9f57e6bacb440b0f86378c08681753ac1a4daba0516900d19572cfa6f5606 +size 237520 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapp_ability_abilitystage.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapp_ability_abilitystage.so new file mode 100644 index 0000000000000000000000000000000000000000..797d1847db731da4c229c696716b1baa18ad64c8 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapp_ability_abilitystage.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1462a1d69bec10eeb8b1aee944668b16c1b6ec2b28cd55550d04377d916f0f48 +size 138320 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapp_ability_uiability.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapp_ability_uiability.so new file mode 100644 index 0000000000000000000000000000000000000000..86c9a1609cad2bee8ab639ec7b0e0ef5210ac28e --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapp_ability_uiability.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8137bbdf26f6475af4ed9d5adf273225c901f32a59446eeb0521ec9ac3a0a007 +size 138720 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_abilitycontext.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_abilitycontext.so new file mode 100644 index 0000000000000000000000000000000000000000..bcf65849cdd2436f79d389c0a13ffe6f17e92b16 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_abilitycontext.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c3fbcdb446180e5de09e56c43664ec23b8de2099b73ae60ec6853e2ea7c9ccd +size 139208 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_abilitystagecontext.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_abilitystagecontext.so new file mode 100644 index 0000000000000000000000000000000000000000..a277e73ba5306c59626dbe56b3e689fb720f7115 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_abilitystagecontext.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28f66c9d34824f295efdfbf3fcf80c3c7d5e6846607e17c8b60f7249e0e47de2 +size 138696 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_applicationcontext.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_applicationcontext.so new file mode 100644 index 0000000000000000000000000000000000000000..3bec3ffd746900ba4f750464593af15f7f9fb545 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_applicationcontext.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b330faf52983f2f5d76bd0b605306f9514af44527b3e679137a668637cf52c00 +size 175480 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_context.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_context.so new file mode 100644 index 0000000000000000000000000000000000000000..a53a8e241a44f86c87d8cc0de39c7aaee5d8181e --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_context.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a7fab2522341c1d1a11e5a255726f917789c92e3d856c6be1b4199378f0113d +size 175104 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_windowstage.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_windowstage.so new file mode 100644 index 0000000000000000000000000000000000000000..c615670ca4768a8d90d01bdc01aeb2284e326ad7 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libapplication_windowstage.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab576235451a42a4b3fe9ae2317749ee3f2049fc6fbaf76cd8bb3065c49455e1 +size 138464 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libarkui_android.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libarkui_android.so new file mode 100644 index 0000000000000000000000000000000000000000..9c64ca87f2f65d016d0e2f3d753ba5e1c4edc8cb --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libarkui_android.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55452763f6e5f33f30cf90c8ee8534099de512b992b551073e0b90f00823314f +size 49733264 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libbridge.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libbridge.so new file mode 100644 index 0000000000000000000000000000000000000000..d9ca096eefbf8642aa949f5d0c654fb92dcc6ce6 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libbridge.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea1196c3c4e41c879f5a3eb29011ac293b94688a458196db0cfe2a62c31ec238 +size 186080 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libconfiguration.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libconfiguration.so new file mode 100644 index 0000000000000000000000000000000000000000..67c6325e6e54d2386a308659976af3be62ef9081 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libconfiguration.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea4cd898ef423ee4596dedc6496ac331247b9c49d18830fb08ac43be36b62f07 +size 172328 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libdevice.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libdevice.so new file mode 100644 index 0000000000000000000000000000000000000000..20a720a8404a2e90f3e104d066dc32e9c7ac1531 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libdevice.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f20ed0c27075f96aae1dd994de92ec25b7cafb18feb64416cdd7af7cb92ffc04 +size 175696 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libfont.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libfont.so new file mode 100644 index 0000000000000000000000000000000000000000..d337633f88a4b9ba2bd7fd038834b74deba0b796 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libfont.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba660386db224e63e419c904b1863b7e09d571660f8a79b0f7aa94303047789e +size 179320 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libgrid.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libgrid.so new file mode 100644 index 0000000000000000000000000000000000000000..368147266e16a49838f192ff13a2fd5dd21092b5 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libgrid.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:caca87ca854698481874659a0d9c742eaf5f78f6c1d4e051cd82fc50c94145da +size 176824 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libhmicui18n.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libhmicui18n.so new file mode 100644 index 0000000000000000000000000000000000000000..07d423c92fb0f0541d621a2897389bed6763c145 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libhmicui18n.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bb8f93e11522072007d6bcdab9f63025ecf024d295bc428a0f5e1e5f0f3de07 +size 3308064 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libhmicuuc.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libhmicuuc.so new file mode 100644 index 0000000000000000000000000000000000000000..b1573836bfab9777065619c9f8a23e6be4f05d17 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libhmicuuc.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8a2a9d95b47908e89fc478a230a4880dc0872b95ba59322f7db049e05b24496 +size 2152656 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libimage_utils.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libimage_utils.so new file mode 100644 index 0000000000000000000000000000000000000000..52efae0652b8e984bdb0a74e53deead2e58c21d2 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libimage_utils.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17b6dc129a3b8aa0d2bd501d887e703d18da09531c4f6d8aafff904e00610044 +size 65288 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libmeasure.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libmeasure.so new file mode 100644 index 0000000000000000000000000000000000000000..b0650d230c968c3373b9bd1469942cc2c08147ca --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libmeasure.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:352a5c520338632a9a48f128d3276349babe74bb6d45fae0604e5b5a0ea3068c +size 444360 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libmediaquery.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libmediaquery.so new file mode 100644 index 0000000000000000000000000000000000000000..608e177ac71c422c376b93ff5d7f61aba2bb9623 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libmediaquery.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16cebbdbe72b2101b438cbce9ac5a0e1308462d43723a3525a8c51a0fe14963e +size 198376 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libpluginmanager.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libpluginmanager.so new file mode 100644 index 0000000000000000000000000000000000000000..5d261b5a62ed053aa39c072e86b2e6380bf72927 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libpluginmanager.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ab9daa3c52043af9125fa00a110461cb52cfb2181f29fe4956785d4ce0d8bd0 +size 428184 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libprompt.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libprompt.so new file mode 100644 index 0000000000000000000000000000000000000000..d0faf44408219156752ab73b0d9c5c6de34535c3 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libprompt.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2bd611cd29ea40b6ea5627b88e60e484e6a3ba501b966d523211781e5c8fdb8 +size 461064 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libpromptaction.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libpromptaction.so new file mode 100644 index 0000000000000000000000000000000000000000..cfc0a1c80eb186f847f4736d59db9507359f2aaa --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libpromptaction.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8af69e4a0f727c8d007b444ee71d9adf0bff432df1f1bfe7bb7b325598e1e6fd +size 461040 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/librouter.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/librouter.so new file mode 100644 index 0000000000000000000000000000000000000000..41c71b441ab3c1e36507083a44162feb0278b25e --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/librouter.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5486a808ae708d789d7af0b9ddb45ec6347bc20b300ab1cc707fbc609b5f93c +size 463160 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libsec_shared.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libsec_shared.so new file mode 100644 index 0000000000000000000000000000000000000000..534c1e6e12805e7cfa5bd7e9ece89b9563b46c8e --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libsec_shared.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfa9d9b18d59845352d2372072bac1ca8ab50a8772f0a52a952ef8c9f53be1be +size 61920 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libutils.so b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libutils.so new file mode 100644 index 0000000000000000000000000000000000000000..f4260f4df198d61bf8de52317a6e21780270616a --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/libs/arm64-v8a/libutils.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5710815da7ea1193fa95becd3c7b1e8935e08054c2b9e9da16c60e746a9c387a +size 544000 diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/module.json b/graphic/crossplatform/graphicDisplayetstest/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..a4443e713ad997179d4e68fbe682c1969fa541a0 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/module.json @@ -0,0 +1,36 @@ +{ + "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" + ] + } + ] + } + ] + } +} diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/resources/base/element/color.json b/graphic/crossplatform/graphicDisplayetstest/src/main/resources/base/element/color.json new file mode 100644 index 0000000000000000000000000000000000000000..3c712962da3c2751c2b9ddb53559afcbd2b54a02 --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/resources/base/element/color.json @@ -0,0 +1,8 @@ +{ + "color": [ + { + "name": "start_window_background", + "value": "#FFFFFF" + } + ] +} \ No newline at end of file diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/resources/base/element/string.json b/graphic/crossplatform/graphicDisplayetstest/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..65d8fa5a7cf54aa3943dcd0214f58d1771bc1f6c --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/resources/base/element/string.json @@ -0,0 +1,16 @@ +{ + "string": [ + { + "name": "module_test_desc", + "value": "test ability description" + }, + { + "name": "TestAbility_desc", + "value": "the test ability" + }, + { + "name": "TestAbility_label", + "value": "test label" + } + ] +} \ No newline at end of file diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/resources/base/media/icon.png b/graphic/crossplatform/graphicDisplayetstest/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/graphic/crossplatform/graphicDisplayetstest/src/main/resources/base/media/icon.png differ diff --git a/graphic/crossplatform/graphicDisplayetstest/src/main/resources/base/profile/test_pages.json b/graphic/crossplatform/graphicDisplayetstest/src/main/resources/base/profile/test_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..77e90731b5a38d861663029b483df3d3ac9ec74b --- /dev/null +++ b/graphic/crossplatform/graphicDisplayetstest/src/main/resources/base/profile/test_pages.json @@ -0,0 +1,5 @@ +{ + "src": [ + "TestAbility/pages/Index" + ] +}