diff --git a/arkui/ace_ets_layout_test/.idea/.gitignore b/arkui/ace_ets_layout_test/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..eaf91e2ac647df635a09f01b8a2a254252aae8d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/arkui/ace_ets_layout_test/.idea/ace_ets_layout_test.iml b/arkui/ace_ets_layout_test/.idea/ace_ets_layout_test.iml new file mode 100644 index 0000000000000000000000000000000000000000..18ec59dd70c312989ec67b525207ca8514461e22 --- /dev/null +++ b/arkui/ace_ets_layout_test/.idea/ace_ets_layout_test.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/.idea/misc.xml b/arkui/ace_ets_layout_test/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..9715c221cd4910f4d04f53a751b4465092f72024 --- /dev/null +++ b/arkui/ace_ets_layout_test/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/.idea/modules.xml b/arkui/ace_ets_layout_test/.idea/modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..5b7ff1ed8c74ba1a86a37d4d60b5c9526389da58 --- /dev/null +++ b/arkui/ace_ets_layout_test/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/.idea/vcs.xml b/arkui/ace_ets_layout_test/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..c8ade07fc487eda1f0dbdde152279b3e86b9868f --- /dev/null +++ b/arkui/ace_ets_layout_test/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/BUILD.gn b/arkui/ace_ets_layout_test/BUILD.gn index e655f0f0a2c14ec44e67874493825d391f878e51..aae576786025cf322a0b7ee7b2536763be76bc53 100644 --- a/arkui/ace_ets_layout_test/BUILD.gn +++ b/arkui/ace_ets_layout_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 iSoftStone Information Technology (Group) 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 @@ -11,31 +11,26 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//test/xts/tools/build/suite.gni") +group("ActsAceEtsLayoutTest") { + testonly = true + if (is_standard_system) { + deps = [ + "ace_ets_layout_column_test:ActsAceEtsLayoutColumnTest", -ohos_js_hap_suite("ActsAceEtsLayoutTest") { - hap_profile = "entry/src/main/module.json" - js_build_mode = "debug" - deps = [ - ":ace_ets_component_flex_js_assets", - ":ace_ets_component_flex_resources", - ] - ets2abc = true - certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAceEtsLayoutTest" -} - -ohos_app_scope("ace_ets_component_flex_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} + #"ace_ets_layout_flex_test:ActsAceEtsLayoutFlexTest", + #"ace_ets_layout_grid_test:ActsAceEtsLayoutGridTest", + #"ace_ets_layout_gridCol_test:ActsAceEtsLayoutGridColTest", + "ace_ets_layout_gridRow_test:ActsAceEtsLayoutGridRowTest", -ohos_js_assets("ace_ets_component_flex_js_assets") { - source_dir = "entry/src/main/ets" -} + #"ace_ets_layout_list_test:ActsAceEtsLayoutListTest", + #"ace_ets_layout_relativeContainer_test:ActsAceEtsLayoutRelativeContainerTest", + "ace_ets_layout_row_test:ActsAceEtsLayoutRowTest", -ohos_resources("ace_ets_component_flex_resources") { - sources = [ "entry/src/main/resources" ] - deps = [ ":ace_ets_component_flex_app_profile" ] - hap_profile = "entry/src/main/module.json" + #"ace_ets_layout_scroll_test:ActsAceEtsLayoutScrollTest", + #"ace_ets_layout_stack_test:ActsAceEtsLayoutStackTest", + #"ace_ets_layout_swiper_test:ActsAceEtsLayoutSwiperTest", + #"ace_ets_layout_tabs_test:ActsAceEtsLayoutTabsTest", + # "ace_ets_layout_waterflow_test:ActsAceEtsLayoutWaterflowTest", + ] + } } diff --git a/arkui/ace_ets_layout_test/Test.json b/arkui/ace_ets_layout_test/Test.json deleted file mode 100644 index 55523bea9075edcb6a0b2b55e896dbc62a291f44..0000000000000000000000000000000000000000 --- a/arkui/ace_ets_layout_test/Test.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "OHJSUnitTest", - "test-timeout": "180000", - "bundle-name": "com.acts.arkui.layout.test", - "module-name": "phone", - "shell-timeout": "600000", - "testcase-timeout": 60000 - }, - "kits": [{ - "test-file-name": [ - "ActsAceEtsLayoutTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - }, { - "type": "ShellKit", - "run-command": [ - "power-shell wakeup", - "power-shell setmode 602" - ] - - }] -} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/AppScope/app.json similarity index 100% rename from arkui/ace_ets_layout_test/AppScope/app.json rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/AppScope/app.json diff --git a/arkui/ace_ets_layout_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/AppScope/resources/base/element/string.json similarity index 100% rename from arkui/ace_ets_layout_test/AppScope/resources/base/element/string.json rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/AppScope/resources/base/element/string.json diff --git a/arkui/ace_ets_layout_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/AppScope/resources/base/media/app_icon.png similarity index 100% rename from arkui/ace_ets_layout_test/AppScope/resources/base/media/app_icon.png rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/AppScope/resources/base/media/app_icon.png diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_column_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..fbc113c10a2c043c01fad67ccb8eaafecbf5f2f6 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutColumnTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_layout_column_test_js_assets", + ":ace_ets_layout_column_test_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutColumnTest" +} + +ohos_app_scope("ace_ets_layout_column_test_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_layout_column_test_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_ets_layout_column_test_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_ets_layout_column_test_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_column_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..e1cb56a5bd846ac4b230f2ef28322294f369b77e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutColumnTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/Application/AbilityStage.ts similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/Application/AbilityStage.ts rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/Application/AbilityStage.ts diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/MainAbility.ts similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/MainAbility.ts rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/MainAbility.ts diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/common/Common.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/common/Common.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/common/Common.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/common/MessageManager.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/common/MessageManager.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/common/MessageManager.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_AlignItems_ChangeParent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_AlignItems_ChangeParent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_AlignItems_ChangeParent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_AlignItems_ChangeParent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_JustifyContent_ChangeParent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_JustifyContent_ChangeParent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_JustifyContent_ChangeParent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_JustifyContent_ChangeParent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_MarPad_ChangeParent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_MarPad_ChangeParent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_MarPad_ChangeParent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_MarPad_ChangeParent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_Margin_ChangeParent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_Margin_ChangeParent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_Margin_ChangeParent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_Margin_ChangeParent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_Padding_ChangeParent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_Padding_ChangeParent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_Padding_ChangeParent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_Padding_ChangeParent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_WidthHeight_ChangeParent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_WidthHeight_ChangeParent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_WidthHeight_ChangeParent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/ParentComponentChanged/Column_WidthHeight_ChangeParent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/columnNesting/columnNesting_Space.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/columnNesting/columnNesting_Space.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/columnNesting/columnNesting_Space.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/columnNesting/columnNesting_Space.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/columnNesting/columnNesting_alignItems.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/columnNesting/columnNesting_alignItems.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/columnNesting/columnNesting_alignItems.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/columnNesting/columnNesting_alignItems.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/columnNesting/columnNesting_justifyContent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/columnNesting/columnNesting_justifyContent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/columnNesting/columnNesting_justifyContent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/columnNesting/columnNesting_justifyContent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/flexBasis/flexBasis_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/flexBasis/flexBasis_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/flexBasis/flexBasis_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/flexBasis/flexBasis_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/flexBasis/flexBasis_Type.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/flexBasis/flexBasis_Type.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/flexBasis/flexBasis_Type.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/flexBasis/flexBasis_Type.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/flexGrow/flexGrow_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/flexGrow/flexGrow_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/flexGrow/flexGrow_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/flexGrow/flexGrow_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/flexGrow/flexGrow_Part.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/flexGrow/flexGrow_Part.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/flexGrow/flexGrow_Part.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/flexGrow/flexGrow_Part.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/flexShrink/flexShrink_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/flexShrink/flexShrink_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/flexShrink/flexShrink_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/flexShrink/flexShrink_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/flexShrink/flexShrink_Part.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/flexShrink/flexShrink_Part.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/flexShrink/flexShrink_Part.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/flexShrink/flexShrink_Part.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_All.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_All.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_All.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_All.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_Part.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_Part.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_Part.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_Part.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_flexGrow.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_flexGrow.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_flexGrow.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_flexGrow.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_flexShrink.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_flexShrink.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_flexShrink.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/layoutWeight/layoutWeight_flexShrink.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/spaceChanged/Column_Space.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/spaceChanged/Column_Space.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/spaceChanged/Column_Space.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/spaceChanged/Column_Space.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/spaceChanged/Column_Space_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/spaceChanged/Column_Space_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/spaceChanged/Column_Space_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/spaceChanged/Column_Space_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/spaceChanged/Column_Space_String.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/spaceChanged/Column_Space_String.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/spaceChanged/Column_Space_String.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/spaceChanged/Column_Space_String.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetDisplayPriority_SubChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetDisplayPriority_SubChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetDisplayPriority_SubChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetDisplayPriority_SubChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetFlexShinkNone_SubChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetFlexShinkNone_SubChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetFlexShinkNone_SubChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetFlexShinkNone_SubChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetFlexShink_SubChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetFlexShink_SubChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetFlexShink_SubChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetFlexShink_SubChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetLayoutWeightNone_SubChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetLayoutWeightNone_SubChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetLayoutWeightNone_SubChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetLayoutWeightNone_SubChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetLayoutWeight_SubChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetLayoutWeight_SubChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetLayoutWeight_SubChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetLayoutWeight_SubChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChangeMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChangeMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChangeMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChangeMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChangePad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChangePad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChangePad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChangePad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetOffset_SubChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetOffset_SubChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetOffset_SubChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetOffset_SubChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChangeMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChangeMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChangeMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChangeMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChangePad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChangePad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChangePad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChangePad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChangeMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChangeMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChangeMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChangeMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChangePad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChangePad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChangePad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChangePad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPosition_SubChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPosition_SubChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPosition_SubChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetPosition_SubChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetVisibility_SubChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetVisibility_SubChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetVisibility_SubChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnSetVisibility_SubChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnWidthHeight_SubChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnWidthHeight_SubChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnWidthHeight_SubChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/Column/subcomponentChanged/ColumnWidthHeight_SubChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/index/index.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/index/index.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/MainAbility/pages/index/index.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/TestAbility/TestAbility.ts similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/TestAbility/TestAbility.ts rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/TestAbility/TestAbility.ts diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/TestAbility/pages/index.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/TestAbility/pages/index.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/TestAbility/pages/index.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_AlignItems_ChangeParent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_AlignItems_ChangeParent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_AlignItems_ChangeParent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_AlignItems_ChangeParent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_JustifyContent_ChangeParent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_JustifyContent_ChangeParent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_JustifyContent_ChangeParent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_JustifyContent_ChangeParent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_MarPad_ChangeParent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_MarPad_ChangeParent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_MarPad_ChangeParent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_MarPad_ChangeParent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_Margin_ChangeParent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_Margin_ChangeParent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_Margin_ChangeParent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_Margin_ChangeParent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_Padding_ChangeParent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_Padding_ChangeParent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_Padding_ChangeParent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_Padding_ChangeParent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_WidthHeight_ChangeParent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_WidthHeight_ChangeParent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_WidthHeight_ChangeParent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/ParentComponentChanged/Column_WidthHeight_ChangeParent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/columnNesting/columnNesting_Space.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/columnNesting/columnNesting_Space.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/columnNesting/columnNesting_Space.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/columnNesting/columnNesting_Space.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/columnNesting/columnNesting_alignItems.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/columnNesting/columnNesting_alignItems.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/columnNesting/columnNesting_alignItems.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/columnNesting/columnNesting_alignItems.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/columnNesting/columnNesting_justifyContent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/columnNesting/columnNesting_justifyContent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/columnNesting/columnNesting_justifyContent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/columnNesting/columnNesting_justifyContent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Type.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Type.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Type.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Type.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexGrow/flexGrow_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/flexGrow/flexGrow_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexGrow/flexGrow_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/flexGrow/flexGrow_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexGrow/flexGrow_Part.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/flexGrow/flexGrow_Part.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexGrow/flexGrow_Part.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/flexGrow/flexGrow_Part.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexShrink/flexShrink_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/flexShrink/flexShrink_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexShrink/flexShrink_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/flexShrink/flexShrink_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexShrink/flexShrink_Part.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/flexShrink/flexShrink_Part.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexShrink/flexShrink_Part.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/flexShrink/flexShrink_Part.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_All.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_All.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_All.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_All.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_Part.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_Part.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_Part.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_Part.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_flexGrow.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_flexGrow.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_flexGrow.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_flexGrow.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_flexShrink.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_flexShrink.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_flexShrink.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/layoutWeight/layoutWeight_flexShrink.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_String.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_String.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_String.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_String.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetDisplayPriority_SubChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetDisplayPriority_SubChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetDisplayPriority_SubChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetDisplayPriority_SubChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetFlexShinkNone_SubChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetFlexShinkNone_SubChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetFlexShinkNone_SubChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetFlexShinkNone_SubChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetFlexShink_SubChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetFlexShink_SubChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetFlexShink_SubChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetFlexShink_SubChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetLayoutWeightNone_SubChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetLayoutWeightNone_SubChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetLayoutWeightNone_SubChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetLayoutWeightNone_SubChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetLayoutWeight_SubChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetLayoutWeight_SubChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetLayoutWeight_SubChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetLayoutWeight_SubChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetMargin_SubChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetMargin_SubChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetMargin_SubChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetMargin_SubChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetMargin_SubChangeMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetMargin_SubChangeMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetMargin_SubChangeMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetMargin_SubChangeMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetMargin_SubChangePad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetMargin_SubChangePad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetMargin_SubChangePad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetMargin_SubChangePad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetOffset_SubChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetOffset_SubChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetOffset_SubChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetOffset_SubChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPaddingMargin_SubChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPaddingMargin_SubChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPaddingMargin_SubChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPaddingMargin_SubChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPaddingMargin_SubChangeMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPaddingMargin_SubChangeMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPaddingMargin_SubChangeMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPaddingMargin_SubChangeMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPaddingMargin_SubChangePad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPaddingMargin_SubChangePad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPaddingMargin_SubChangePad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPaddingMargin_SubChangePad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPadding_SubChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPadding_SubChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPadding_SubChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPadding_SubChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPadding_SubChangeMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPadding_SubChangeMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPadding_SubChangeMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPadding_SubChangeMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPadding_SubChangePad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPadding_SubChangePad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPadding_SubChangePad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPadding_SubChangePad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPosition_SubChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPosition_SubChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPosition_SubChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetPosition_SubChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetVisibility_SubChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetVisibility_SubChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetVisibility_SubChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetVisibility_SubChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnWidthHeight_SubChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnWidthHeight_SubChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnWidthHeight_SubChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnWidthHeight_SubChange.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..9fc5ad874334a163e1b438786cb91eecc36d1138 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 Column_Space from './Column/spaceChanged/Column_Space.test.ets'; + import Column_Space_String from './Column/spaceChanged/Column_Space_String.test.ets'; + import Column_Space_Default from './Column/spaceChanged/Column_Space_Default.test.ets'; + import layoutWeight_Part from './Column/layoutWeight/layoutWeight_Part.test'; + import layoutWeight_All from './Column/layoutWeight/layoutWeight_All.test'; + import layoutWeight_Default from './Column/layoutWeight/layoutWeight_Default.test.ets'; + import layoutWeight_flexGrow from './Column/layoutWeight/layoutWeight_flexGrow.test.ets'; + import layoutWeight_flexShrink from './Column/layoutWeight/layoutWeight_flexShrink.test.ets'; + import flexGrow_Part from './Column/flexGrow/flexGrow_Part.test.ets'; + import flexGrow_Default from './Column/flexGrow/flexGrow_Default.test.ets'; + import flexShrink_Part from './Column/flexShrink/flexShrink_Part.test.ets'; + import flexBasis_Type from './Column/flexBasis/flexBasis_Type.test.ets'; + import flexBasis_Default from './Column/flexBasis/flexBasis_Default.test.ets'; + import columnNesting_Space from './Column/columnNesting/columnNesting_Space.test.ets'; + import columnNesting_alignItems from './Column/columnNesting/columnNesting_alignItems.test.ets'; + import columnNesting_justifyContent from './Column/columnNesting/columnNesting_justifyContent.test.ets'; +import column_WidthHeight_ChangeParent from './Column/ParentComponentChanged/Column_WidthHeight_ChangeParent.test.ets'; +import column_Padding_ChangeParent from './Column/ParentComponentChanged/Column_Padding_ChangeParent.test.ets'; +import column_Margin_ChangeParent from './Column/ParentComponentChanged/Column_Margin_ChangeParent.test.ets'; +import column_MarPad_ChangeParent from './Column/ParentComponentChanged/Column_MarPad_ChangeParent.test.ets'; +import column_AlignItems_ChangeParent from './Column/ParentComponentChanged/Column_AlignItems_ChangeParent.test.ets'; +import column_JustifyContent_ChangeParent from './Column/ParentComponentChanged/Column_JustifyContent_ChangeParent.test.ets'; +import ColumnWidthHeight_SubChange from './Column/subComponentChanged/ColumnWidthHeight_SubChange.test.ets'; +import ColumnSetPadding_SubChange from './Column/subComponentChanged/ColumnSetPadding_SubChange.test.ets'; +import ColumnSetPadding_SubChangeMar from './Column/subComponentChanged/ColumnSetPadding_SubChangeMar.test.ets'; +import ColumnSetPadding_SubChangePad from './Column/subComponentChanged/ColumnSetPadding_SubChangePad.test.ets'; +import ColumnSetMargin_SubChange from './Column/subComponentChanged/ColumnSetMargin_SubChange.test.ets'; +import ColumnSetMargin_SubChangeMar from './Column/subComponentChanged/ColumnSetMargin_SubChangeMar.test.ets'; +import ColumnSetMargin_SubChangePad from './Column/subComponentChanged/ColumnSetMargin_SubChangePad.test.ets'; +import ColumnSetPaddingMargin_SubChange from './Column/subComponentChanged/ColumnSetPaddingMargin_SubChange.test.ets'; +import ColumnSetPaddingMargin_SubChangeMar from './Column/subComponentChanged/ColumnSetPaddingMargin_SubChangeMar.test.ets'; +import ColumnSetPaddingMargin_SubChangePad from './Column/subComponentChanged/ColumnSetPaddingMargin_SubChangePad.test.ets'; +import ColumnSetPosition_SubChange from './Column/subComponentChanged/ColumnSetPosition_SubChange.test.ets'; +import ColumnSetOffset_SubChange from './Column/subComponentChanged/ColumnSetOffset_SubChange.test.ets'; +import ColumnSetDisplayPriority_SubChange from './Column/subComponentChanged/ColumnSetDisplayPriority_SubChange.test.ets'; +import ColumnSetLayoutWeight_SubChange from './Column/subComponentChanged/ColumnSetLayoutWeight_SubChange.test.ets'; +import ColumnSetLayoutWeightNone_SubChange from './Column/subComponentChanged/ColumnSetLayoutWeightNone_SubChange.test.ets'; +import ColumnSetFlexShink_SubChange from './Column/subComponentChanged/ColumnSetFlexShink_SubChange.test.ets'; +import ColumnSetFlexShinkNone_SubChange from './Column/subComponentChanged/ColumnSetFlexShinkNone_SubChange.test.ets'; +import ColumnSetVisibility_SubChange from './Column/subComponentChanged/ColumnSetVisibility_SubChange.test.ets'; + +export default function testsuite() { + + Column_Space() + Column_Space_String() + Column_Space_Default() + layoutWeight_Part() + layoutWeight_All() + layoutWeight_Default() + layoutWeight_flexGrow() + layoutWeight_flexShrink() + flexGrow_Part() + flexGrow_Default() + flexShrink_Part() + flexBasis_Type() + flexBasis_Default() + columnNesting_Space() + columnNesting_alignItems() + columnNesting_justifyContent() + column_WidthHeight_ChangeParent() + column_Padding_ChangeParent() + column_Margin_ChangeParent() + column_MarPad_ChangeParent() + column_AlignItems_ChangeParent() + column_JustifyContent_ChangeParent() + ColumnWidthHeight_SubChange() + ColumnSetPadding_SubChange() + ColumnSetPadding_SubChangeMar() + ColumnSetPadding_SubChangePad() + ColumnSetMargin_SubChange() + ColumnSetMargin_SubChangeMar() + ColumnSetMargin_SubChangePad() + ColumnSetPaddingMargin_SubChange() + ColumnSetPaddingMargin_SubChangeMar() + ColumnSetPaddingMargin_SubChangePad() + ColumnSetPosition_SubChange() + ColumnSetOffset_SubChange() + ColumnSetDisplayPriority_SubChange() + ColumnSetLayoutWeight_SubChange() + ColumnSetLayoutWeightNone_SubChange() + ColumnSetFlexShink_SubChange() + ColumnSetFlexShinkNone_SubChange() + ColumnSetVisibility_SubChange() +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/module.json similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/module.json rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/module.json diff --git a/arkui/ace_ets_layout_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/resources/base/element/float.json similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/resources/base/element/float.json rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/resources/base/element/float.json diff --git a/arkui/ace_ets_layout_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/resources/base/element/string.json similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/resources/base/element/string.json rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/resources/base/element/string.json diff --git a/arkui/ace_ets_layout_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/resources/base/media/icon.png similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/resources/base/media/icon.png rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/resources/base/media/icon.png diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..c7cd7db993e915a93df0bc0ed9f1ae494a8a29fe --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,47 @@ +{ + "src": [ + "MainAbility/pages/index/index", + "MainAbility/pages/Column/columnNesting/columnNesting_alignItems", + "MainAbility/pages/Column/columnNesting/columnNesting_justifyContent", + "MainAbility/pages/Column/columnNesting/columnNesting_Space", + "MainAbility/pages/Column/flexBasis/flexBasis_Default", + "MainAbility/pages/Column/flexBasis/flexBasis_Type", + "MainAbility/pages/Column/flexGrow/flexGrow_Default", + "MainAbility/pages/Column/flexGrow/flexGrow_Part", + "MainAbility/pages/Column/flexShrink/flexShrink_Default", + "MainAbility/pages/Column/flexShrink/flexShrink_Part", + "MainAbility/pages/Column/layoutWeight/layoutWeight_All", + "MainAbility/pages/Column/layoutWeight/layoutWeight_Default", + "MainAbility/pages/Column/layoutWeight/layoutWeight_flexGrow", + "MainAbility/pages/Column/layoutWeight/layoutWeight_flexShrink", + "MainAbility/pages/Column/layoutWeight/layoutWeight_Part", + "MainAbility/pages/Column/ParentComponentChanged/Column_AlignItems_ChangeParent", + "MainAbility/pages/Column/ParentComponentChanged/Column_JustifyContent_ChangeParent", + "MainAbility/pages/Column/ParentComponentChanged/Column_Margin_ChangeParent", + "MainAbility/pages/Column/ParentComponentChanged/Column_MarPad_ChangeParent", + "MainAbility/pages/Column/ParentComponentChanged/Column_Padding_ChangeParent", + "MainAbility/pages/Column/ParentComponentChanged/Column_WidthHeight_ChangeParent", + "MainAbility/pages/Column/spaceChanged/Column_Space", + "MainAbility/pages/Column/spaceChanged/Column_Space_Default", + "MainAbility/pages/Column/spaceChanged/Column_Space_String", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetDisplayPriority_SubChange", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetFlexShinkNone_SubChange", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetFlexShink_SubChange", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetLayoutWeightNone_SubChange", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetLayoutWeight_SubChange", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChange", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChangeMar", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChangePad", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetOffset_SubChange", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChange", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChangeMar", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChangePad", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChange", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChangeMar", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChangePad", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetPosition_SubChange", + "MainAbility/pages/Column/subcomponentChanged/ColumnSetVisibility_SubChange", + "MainAbility/pages/Column/subcomponentChanged/ColumnWidthHeight_SubChange" + + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_column_test/signature/openharmony_sx.p7b similarity index 100% rename from arkui/ace_ets_layout_test/signature/openharmony_sx.p7b rename to arkui/ace_ets_layout_test/ace_ets_layout_column_test/signature/openharmony_sx.p7b diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..19c8848dfb41d2ca5e060525eb8180d538bc635c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.acts.arkui.layout.test", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "description": "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ee69f9a861d9dc269ed6638735d52674583498e1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ohosProject" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..49e2c636b08ca7eeea6d0bd9d9ac0cc63eee0531 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutFlexTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_layout_flex_js_assets", + ":ace_ets_layout_flex_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutFlexTest" +} + +ohos_app_scope("ace_ets_layout_flex_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_layout_flex_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_ets_layout_flex_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_ets_layout_flex_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..5e588decc64e4045f0693187e547a394baedeac0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutFlexTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..b0e0206ea9fb5ce94ef140d69510b6280969dd8e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,9 @@ +import AbilityStage from "@ohos.app.ability.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + globalThis.stageOnCreateRun = 1; + globalThis.stageContext = this.context; + } +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..0594e6e62c917b6aa681057bf10f26aff9d2abe5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,40 @@ +import Ability from '@ohos.app.ability.UIAbility' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +export default class MainAbility extends Ability { + onCreate(want,launchParam){ + // Ability is creating, initialize resources for this ability + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) + let AtManager = abilityAccessCtrl.createAtManager() + AtManager.requestPermissionsFromUser(this.context,[ + "ohos.permission.CAPTURE_SCREEN"]).then(() => {}) + globalThis.windowStage = windowStage + globalThis.abilityContext = this.context + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) + } + + onWindowStageDestroy() { + //Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/common/Common.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc98d34214f4aea48824806a09c6385b9d82dde5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/common/Common.ets @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ + +export default class CommonFunc { + static rect_left; + static rect_top; + static rect_right; + static rect_bottom; + static rect_value; + + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + + static getComponentRect(key) { + let strJson = getInspectorByKey(key); + let obj = JSON.parse(strJson); + console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); + let rectInfo = JSON.parse('[' + obj.$rect + ']'); + this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0]; + this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1]; + this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0]; + this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1]; + this.rect_value = { + "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom + }; + console.info(JSON.stringify(this.rect_value)); + return this.rect_value; + } +} + diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/common/MessageManager.ets new file mode 100644 index 0000000000000000000000000000000000000000..97dd36af2da2f6a3ce332ee8212fd1e722fff166 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/common/MessageManager.ets @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ +export interface Callback { + (message:any):void +} + +export class MessageManager { + callback:Callback + callbacks:Map = new Map() + + constructor() { + + } + + registerCallback(callback:Callback , type?:string) { + if (type == undefined) { + console.error('registerCallback callback set') + this.callback = callback + return + } + this.callbacks.set(type,callback) + } + + notify(message:any, type?:string) { + if (type == undefined) { + this.callback(message) + return + } + + let tmpCallback:Callback = this.callbacks.get(type) + if (tmpCallback === undefined) { + console.error('callbacks has no callback for type ' + type) + return + } + tmpCallback(message) + } + + clear() { + this.callbacks.clear() + this.callback = null + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_DisplayPriority.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_DisplayPriority.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_DisplayPriority.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_DisplayPriority.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMarPad_TextMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMarPad_TextMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMarPad_TextMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMarPad_TextMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMar_TextMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMar_TextMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMar_TextMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMar_TextMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexPad_TextMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexPad_TextMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexPad_TextMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexPad_TextMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_LayoutWeight.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_LayoutWeight.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_LayoutWeight.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_LayoutWeight.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Position.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Position.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Position.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Position.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_TextSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_TextSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_TextSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_TextSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Visibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Visibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Visibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Visibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_DisplayPriority.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_DisplayPriority.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_DisplayPriority.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_DisplayPriority.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexMarPad_TextMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexMarPad_TextMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexMarPad_TextMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexMarPad_TextMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexMar_TextMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexMar_TextMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexMar_TextMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexMar_TextMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexPad_TextMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexPad_TextMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexPad_TextMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexPad_TextMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_LayoutWeight.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_LayoutWeight.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_LayoutWeight.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_LayoutWeight.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Position.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Position.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Position.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Position.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_TextSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_TextSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_TextSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_TextSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Visibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Visibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Visibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Visibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildDisplayPriority.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildDisplayPriority.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildDisplayPriority.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildDisplayPriority.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildLayoutWeight.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildLayoutWeight.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildLayoutWeight.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildLayoutWeight.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildPosition.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildPosition.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildPosition.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildPosition.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContentFlex_Center.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContentFlex_Center.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContentFlex_Center.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContentFlex_Center.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Margin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Margin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Margin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Margin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Offset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Offset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Offset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Offset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Visibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Visibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Visibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Visibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_fixed.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_fixed.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_fixed.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_fixed.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin_padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin_padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin_padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin_padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContentFlex_End.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContentFlex_End.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContentFlex_End.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContentFlex_End.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Margin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Margin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Margin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Margin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Offset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Offset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Offset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Offset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Visibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Visibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Visibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Visibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_fixed.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_fixed.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_fixed.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_fixed.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin_padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin_padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin_padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin_padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlex.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlex.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlex.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlex.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Margin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Margin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Margin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Margin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Offset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Offset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Offset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Offset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Visibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Visibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Visibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Visibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_fixed.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_fixed.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_fixed.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_fixed.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin_padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin_padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin_padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin_padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContentFlex_Start.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContentFlex_Start.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContentFlex_Start.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContentFlex_Start.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin_padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin_padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin_padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin_padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Margin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Margin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Margin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Margin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Offset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Offset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Offset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Offset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Visibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Visibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Visibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Visibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_fixed.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_fixed.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_fixed.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_fixed.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexAlignSelf.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexAlignSelf.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexAlignSelf.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexAlignSelf.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexBase.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexBase.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexBase.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexBase.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexExceed.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexExceed.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexExceed.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexExceed.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexHeightModify.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexHeightModify.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexHeightModify.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexHeightModify.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexTextMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexTextMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexTextMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexTextMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexAlignSelf.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexAlignSelf.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexAlignSelf.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexAlignSelf.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexBase.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexBase.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexBase.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexBase.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexExceed.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexExceed.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexExceed.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexExceed.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexHeightModify.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexHeightModify.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexHeightModify.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexHeightModify.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexTextMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexTextMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexTextMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexTextMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexAlignSelf.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexAlignSelf.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexAlignSelf.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexAlignSelf.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexBase.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexBase.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexBase.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexBase.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexExceed.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexExceed.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexExceed.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexExceed.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexHeightModify.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexHeightModify.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexHeightModify.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexHeightModify.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexTextMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexTextMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexTextMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexTextMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexAlignSelf.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexAlignSelf.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexAlignSelf.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexAlignSelf.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexBase.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexBase.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexBase.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexBase.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexExceed.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexExceed.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexExceed.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexExceed.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexHeightModify.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexHeightModify.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexHeightModify.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexHeightModify.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexTextMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexTextMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexTextMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexTextMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexAlignSelf.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexAlignSelf.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexAlignSelf.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexAlignSelf.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexBase.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexBase.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexBase.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexBase.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexExceed.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexExceed.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexExceed.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexExceed.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexHeightModify.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexHeightModify.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexHeightModify.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexHeightModify.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexTextMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexTextMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexTextMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexTextMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexAlignSelf.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexAlignSelf.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexAlignSelf.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexAlignSelf.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexBase.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexBase.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexBase.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexBase.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexExceed.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexExceed.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexExceed.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexExceed.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexHeightModify.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexHeightModify.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexHeightModify.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexHeightModify.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexTextMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexTextMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexTextMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexTextMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAlign.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAlign.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAlign.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAlign.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAllSpace.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAllSpace.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAllSpace.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAllSpace.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneWidth.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneWidth.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneWidth.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneWidth.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_NoSpace.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_NoSpace.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_NoSpace.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_NoSpace.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAlign.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAlign.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAlign.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAlign.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAllSpace.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAllSpace.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAllSpace.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAllSpace.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddLayoutWeight.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddLayoutWeight.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddLayoutWeight.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddLayoutWeight.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneWidth.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneWidth.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneWidth.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneWidth.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_NoSpace.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_NoSpace.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_NoSpace.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_NoSpace.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChild.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChild.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChild.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChild.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentItemAlignEnd.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentItemAlignEnd.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentItemAlignEnd.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentItemAlignEnd.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirst.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirst.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirst.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirst.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirstWidth.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirstWidth.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirstWidth.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirstWidth.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentMarginFirst.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentMarginFirst.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentMarginFirst.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentMarginFirst.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChild.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChild.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChild.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChild.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentItemAlignEnd.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentItemAlignEnd.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentItemAlignEnd.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentItemAlignEnd.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirst.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirst.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirst.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirst.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirstWidth.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirstWidth.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirstWidth.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirstWidth.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentMarginFirst.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentMarginFirst.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentMarginFirst.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentMarginFirst.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAlign.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAlign.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAlign.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAlign.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAllSpace.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAllSpace.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAllSpace.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAllSpace.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddLayoutWeight.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddLayoutWeight.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddLayoutWeight.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddLayoutWeight.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneWidth.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneWidth.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneWidth.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneWidth.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_NoSpace.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_NoSpace.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_NoSpace.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_NoSpace.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..5c372e0c20209b661a274129b184c2ed9741a7d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +@Entry +@Component +struct Index { + + aboutToAppear(){ + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5841ae7bffea3a0b5e3c6d7d78aec80a9010f1e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..4bf893f776d7c265fb40e3ec5c91f3eb2e338dcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('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/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9529e19be5455dcc8c817ef5acb3a773dd543d06 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 + +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() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.acts.arkui.layout.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_DisplayPriority.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_DisplayPriority.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_DisplayPriority.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_DisplayPriority.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMarPad_TextMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMarPad_TextMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMarPad_TextMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMarPad_TextMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMar_TextMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMar_TextMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMar_TextMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMar_TextMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexPad_TextMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexPad_TextMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexPad_TextMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexPad_TextMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_FlexSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_LayoutWeight.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_LayoutWeight.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_LayoutWeight.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_LayoutWeight.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_Padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_Padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_Padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_Padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_Position.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_Position.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_Position.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_Position.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_TextSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_TextSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_TextSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_TextSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_Visibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_Visibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_Visibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/NoWrap/Flex_NoWrap_Visibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_DisplayPriority.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_DisplayPriority.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_DisplayPriority.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_DisplayPriority.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexMarPad_TextMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexMarPad_TextMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexMarPad_TextMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexMarPad_TextMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexMar_TextMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexMar_TextMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexMar_TextMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexMar_TextMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexPad_TextMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexPad_TextMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexPad_TextMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexPad_TextMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_FlexSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_LayoutWeight.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_LayoutWeight.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_LayoutWeight.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_LayoutWeight.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_Padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_Padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_Padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_Padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_Position.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_Position.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_Position.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_Position.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_TextSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_TextSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_TextSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_TextSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_Visibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_Visibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_Visibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/Wrap/Flex_Wrap_Visibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildDisplayPriority.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildDisplayPriority.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildDisplayPriority.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildDisplayPriority.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildLayoutWeight.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildLayoutWeight.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildLayoutWeight.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildLayoutWeight.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildPosition.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildPosition.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildPosition.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildPosition.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildVisibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildVisibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildVisibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildVisibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentPadding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentPadding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentPadding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentPadding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentPadding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentPadding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentPadding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentPadding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContentFlex_Center.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContentFlex_Center.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContentFlex_Center.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContentFlex_Center.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Margin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Margin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Margin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Margin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Offset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Offset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Offset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Offset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Visibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Visibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Visibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Visibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_fixed.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_fixed.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_fixed.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_Center_FlexP_fixed.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin_padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin_padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin_padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin_padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_FlexAlign_Center_padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_FlexAlign_Center_padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_FlexAlign_Center_padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Center/AlignContent_FlexAlign_Center_padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContentFlex_End.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContentFlex_End.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContentFlex_End.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContentFlex_End.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Margin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Margin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Margin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Margin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Offset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Offset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Offset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Offset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Visibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Visibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Visibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Visibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_fixed.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_fixed.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_fixed.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_End_FlexP_fixed.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin_padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin_padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin_padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin_padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_FlexAlign_End_padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_FlexAlign_End_padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_FlexAlign_End_padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/End/AlignContent_FlexAlign_End_padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextOffset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextOffset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextOffset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextOffset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextVisibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextVisibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextVisibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextVisibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextOffset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextOffset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextOffset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextOffset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextVisibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextVisibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextVisibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextVisibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Margin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Margin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Margin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Margin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Offset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Offset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Offset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Offset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Visibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Visibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Visibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Visibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_fixed.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_fixed.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_fixed.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContentFlexP_fixed.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin_padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin_padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin_padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin_padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContentFlex_Start.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContentFlex_Start.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContentFlex_Start.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContentFlex_Start.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin_padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin_padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin_padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin_padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_FlexAlign_Start_padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_FlexAlign_Start_padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_FlexAlign_Start_padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_FlexAlign_Start_padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Margin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Margin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Margin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Margin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Offset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Offset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Offset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Offset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Visibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Visibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Visibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Visibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_fixed.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_fixed.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_fixed.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignContent/Start/AlignContent_Start_FlexP_fixed.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexAlignSelfJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexAlignSelfJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexAlignSelfJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexAlignSelfJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexBaseJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexBaseJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexBaseJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexBaseJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexExceedJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexExceedJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexExceedJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexExceedJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexHeightModifyJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexHeightModifyJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexHeightModifyJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexHeightModifyJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexMarginJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexMarginJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexMarginJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexMarginJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexOffsetJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexOffsetJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexOffsetJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexOffsetJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexPaddingJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexPaddingJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexPaddingJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexPaddingJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexTextMarginJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexTextMarginJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexTextMarginJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexTextMarginJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexVisibilityJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexVisibilityJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexVisibilityJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexVisibilityJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexAlignSelfJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexAlignSelfJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexAlignSelfJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexAlignSelfJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexBaseJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexBaseJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexBaseJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexBaseJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexExceedJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexExceedJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexExceedJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexExceedJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexHeightModifyJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexHeightModifyJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexHeightModifyJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexHeightModifyJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexMarginJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexMarginJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexMarginJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexMarginJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexOffsetJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexOffsetJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexOffsetJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexOffsetJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexPaddingJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexPaddingJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexPaddingJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexPaddingJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexTextMarginJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexTextMarginJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexTextMarginJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexTextMarginJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexVisibilityJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexVisibilityJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexVisibilityJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Baseline/FlexVisibilityJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexAlignSelfJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexAlignSelfJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexAlignSelfJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexAlignSelfJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexBaseJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexBaseJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexBaseJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexBaseJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexExceedJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexExceedJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexExceedJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexExceedJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexHeightModifyJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexHeightModifyJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexHeightModifyJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexHeightModifyJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexMarginJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexMarginJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexMarginJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexMarginJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexOffsetJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexOffsetJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexOffsetJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexOffsetJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexPaddingJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexPaddingJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexPaddingJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexPaddingJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexTextMarginJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexTextMarginJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexTextMarginJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexTextMarginJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexVisibilityJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexVisibilityJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexVisibilityJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Center/FlexVisibilityJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexAlignSelfJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexAlignSelfJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexAlignSelfJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexAlignSelfJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexBaseJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexBaseJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexBaseJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexBaseJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexExceedJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexExceedJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexExceedJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexExceedJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexHeightModifyJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexHeightModifyJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexHeightModifyJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexHeightModifyJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexMarginJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexMarginJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexMarginJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexMarginJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexOffsetJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexOffsetJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexOffsetJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexOffsetJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexPaddingJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexPaddingJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexPaddingJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexPaddingJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexTextMarginJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexTextMarginJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexTextMarginJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexTextMarginJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexVisibilityJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexVisibilityJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexVisibilityJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_End/FlexVisibilityJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexAlignSelfJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexAlignSelfJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexAlignSelfJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexAlignSelfJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexBaseJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexBaseJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexBaseJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexBaseJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexExceedJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexExceedJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexExceedJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexExceedJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexHeightModifyJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexHeightModifyJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexHeightModifyJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexHeightModifyJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexMarginJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexMarginJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexMarginJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexMarginJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexOffsetJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexOffsetJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexOffsetJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexOffsetJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexPaddingJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexPaddingJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexPaddingJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexPaddingJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexTextMarginJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexTextMarginJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexTextMarginJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexTextMarginJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexVisibilityJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexVisibilityJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexVisibilityJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Start/FlexVisibilityJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexAlignSelfJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexAlignSelfJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexAlignSelfJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexAlignSelfJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexBaseJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexBaseJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexBaseJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexBaseJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexExceedJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexExceedJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexExceedJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexExceedJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexHeightModifyJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexHeightModifyJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexHeightModifyJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexHeightModifyJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexMarginJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexMarginJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexMarginJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexMarginJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexOffsetJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexOffsetJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexOffsetJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexOffsetJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexPaddingJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexPaddingJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexPaddingJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexPaddingJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexTextMarginJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexTextMarginJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexTextMarginJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexTextMarginJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexVisibilityJsunit.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexVisibilityJsunit.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexVisibilityJsunit.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexVisibilityJsunit.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddAlign.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddAlign.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddAlign.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddAlign.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddAllSpace.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddAllSpace.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddAllSpace.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddAllSpace.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOffset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOffset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOffset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOffset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOneMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOneMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOneMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOneMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOneWidth.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOneWidth.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOneWidth.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOneWidth.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddPadding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddPadding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddPadding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddPadding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddVisibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddVisibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddVisibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddVisibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_NoSpace.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_NoSpace.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_NoSpace.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_NoSpace.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddAlign.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddAlign.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddAlign.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddAlign.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddAllSpace.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddAllSpace.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddAllSpace.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddAllSpace.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddLayoutWeight.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddLayoutWeight.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddLayoutWeight.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddLayoutWeight.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddOffset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddOffset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddOffset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddOffset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddOneMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddOneMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddOneMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddOneMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddOneWidth.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddOneWidth.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddOneWidth.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddOneWidth.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddPadding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddPadding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddPadding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddPadding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddVisibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddVisibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddVisibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_AddVisibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_NoSpace.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_NoSpace.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_NoSpace.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/End/AlignEnd_NoSpace.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChild.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChild.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChild.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChild.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentItemAlignEnd.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentItemAlignEnd.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentItemAlignEnd.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentItemAlignEnd.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentPadding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentPadding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentPadding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentPadding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirst.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirst.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirst.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirst.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirstWidth.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirstWidth.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirstWidth.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirstWidth.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentMarginFirst.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentMarginFirst.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentMarginFirst.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentMarginFirst.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentVisibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentVisibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentVisibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentVisibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChild.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChild.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChild.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChild.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentItemAlignEnd.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentItemAlignEnd.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentItemAlignEnd.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentItemAlignEnd.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentPadding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentPadding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentPadding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentPadding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirst.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirst.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirst.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirst.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirstWidth.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirstWidth.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirstWidth.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirstWidth.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentMarginFirst.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentMarginFirst.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentMarginFirst.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentMarginFirst.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentVisibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentVisibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentVisibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentVisibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddAlign.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddAlign.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddAlign.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddAlign.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddAllSpace.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddAllSpace.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddAllSpace.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddAllSpace.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddLayoutWeight.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddLayoutWeight.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddLayoutWeight.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddLayoutWeight.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOffset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOffset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOffset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOffset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOneMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOneMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOneMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOneMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOneWidth.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOneWidth.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOneWidth.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOneWidth.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddPadding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddPadding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddPadding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddPadding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddVisibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddVisibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddVisibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddVisibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_NoSpace.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_NoSpace.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_NoSpace.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_NoSpace.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..977e0a27a43fc76560b60323163fb6ebf2c67a9a --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,402 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 flexBase_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexBaseJsunit.test.ets'; + import flexPadding_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexPaddingJsunit.test.ets'; + import flexMargin_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexMarginJsunit.test.ets'; + import flexExceed_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexExceedJsunit.test.ets'; + import flexHeightModify_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexHeightModifyJsunit.test.ets'; + import flexOffset_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexOffsetJsunit.test.ets'; + import flexVisibility_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexVisibilityJsunit.test.ets'; + import flexAlignSelf_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexAlignSelfJsunit.test.ets'; + import flexTextMargin_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexTextMarginJsunit.test.ets'; +import flexBase_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexBaseJsunit.test.ets'; +import flexPadding_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexPaddingJsunit.test.ets'; +import flexMargin_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexMarginJsunit.test.ets'; +import flexExceed_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexExceedJsunit.test.ets'; +import flexHeightModify_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexHeightModifyJsunit.test.ets'; +import flexOffset_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexOffsetJsunit.test.ets'; +import flexVisibility_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexVisibilityJsunit.test.ets'; +import flexAlignSelf_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexAlignSelfJsunit.test.ets'; +import flexTextMargin_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexTextMarginJsunit.test.ets'; +import flexBase_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexBaseJsunit.test.ets'; +import flexPadding_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexPaddingJsunit.test.ets'; +import flexMargin_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexMarginJsunit.test.ets'; +import flexExceed_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexExceedJsunit.test.ets'; +import flexHeightModify_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexHeightModifyJsunit.test.ets'; +import flexOffset_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexOffsetJsunit.test.ets'; +import flexVisibility_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexVisibilityJsunit.test.ets'; +import flexAlignSelf_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexAlignSelfJsunit.test.ets'; +import flexTextMargin_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexTextMarginJsunit.test.ets'; +import flexBase_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexBaseJsunit.test.ets'; +import flexPadding_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexPaddingJsunit.test.ets'; +import flexMargin_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexMarginJsunit.test.ets'; +import flexExceed_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexExceedJsunit.test.ets'; +import flexHeightModify_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexHeightModifyJsunit.test.ets'; +import flexOffset_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexOffsetJsunit.test.ets'; +import flexVisibility_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexVisibilityJsunit.test.ets'; +import flexAlignSelf_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexAlignSelfJsunit.test.ets'; +import flexTextMargin_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexTextMarginJsunit.test.ets'; +import flexBase_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexBaseJsunit.test.ets'; +import flexPadding_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexPaddingJsunit.test.ets'; +import flexMargin_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexMarginJsunit.test.ets'; +import flexExceed_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexExceedJsunit.test.ets'; +import flexHeightModify_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexHeightModifyJsunit.test.ets'; +import flexOffset_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexOffsetJsunit.test.ets'; +import flexVisibility_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexVisibilityJsunit.test.ets'; +import flexAlignSelf_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexAlignSelfJsunit.test.ets'; +import flexTextMargin_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexTextMarginJsunit.test.ets'; +import flexBase_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexBaseJsunit.test.ets'; +import flexPadding_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexPaddingJsunit.test.ets'; +import flexMargin_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexMarginJsunit.test.ets'; +import flexExceed_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexExceedJsunit.test.ets'; +import flexHeightModify_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexHeightModifyJsunit.test.ets'; +import flexOffset_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexOffsetJsunit.test.ets'; +import flexVisibility_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexVisibilityJsunit.test.ets'; +import flexAlignSelf_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexAlignSelfJsunit.test.ets'; +import flexTextMargin_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexTextMarginJsunit.test.ets'; + import AlignSpaceEvenly_NoSpace from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace.test.ets'; + import AlignSpaceEvenly_AddPadding from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding.test.ets'; + import AlignSpaceEvenly_AddMargin from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin.test.ets'; + import AlignSpaceEvenly_AddAllSpace from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace.test.ets'; + import AlignSpaceEvenly_AddAlign from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign.test.ets'; + import AlignSpaceEvenly_AddOffset from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.test.ets'; + import AlignSpaceEvenly_AddVisibility from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility.test.ets'; + import AlignSpaceEvenly_AddLayoutWeight from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight.test.ets'; + import AlignSpaceEvenly_AddOneWidth from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth.test.ets'; + import AlignSpaceEvenly_AddOneMargin from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin.test.ets'; + import AlignStart_NoSpace from './Flex/justifyContent/Start/AlignStart_NoSpace.test.ets'; + import AlignStart_AddPadding from './Flex/justifyContent/Start/AlignStart_AddPadding.test.ets'; + import AlignStart_AddMargin from './Flex/justifyContent/Start/AlignStart_AddMargin.test.ets'; + import AlignStart_AddAllSpace from './Flex/justifyContent/Start/AlignStart_AddAllSpace.test.ets'; + import AlignStart_AddAlign from './Flex/justifyContent/Start/AlignStart_AddAlign.test.ets'; + import AlignStart_AddOffset from './Flex/justifyContent/Start/AlignStart_AddOffset.test.ets'; + import AlignStart_AddVisibility from './Flex/justifyContent/Start/AlignStart_AddVisibility.test.ets'; + import AlignStart_AddLayoutWeight from './Flex/justifyContent/Start/AlignStart_AddLayoutWeight.test.ets'; + import AlignStart_AddOneWidth from './Flex/justifyContent/Start/AlignStart_AddOneWidth.test.ets'; + import AlignStart_AddOneMargin from './Flex/justifyContent/Start/AlignStart_AddOneMargin.test.ets'; + import AlignCenter_NoSpace from './Flex/justifyContent/Center/AlignCenter_NoSpace.test.ets'; + import AlignCenter_AddPadding from './Flex/justifyContent/Center/AlignCenter_AddPadding.test.ets'; + import AlignCenter_AddMargin from './Flex/justifyContent/Center/AlignCenter_AddMargin.test.ets'; + import AlignCenter_AddAllSpace from './Flex/justifyContent/Center/AlignCenter_AddAllSpace.test.ets'; + import AlignCenter_AddAlign from './Flex/justifyContent/Center/AlignCenter_AddAlign.test.ets'; + import AlignCenter_AddOffset from './Flex/justifyContent/Center/AlignCenter_AddOffset.test.ets'; + import AlignCenter_AddVisibility from './Flex/justifyContent/Center/AlignCenter_AddVisibility.test.ets'; + import AlignCenter_AddLayoutWeight from './Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.test.ets'; + import AlignCenter_AddOneWidth from './Flex/justifyContent/Center/AlignCenter_AddOneWidth.test.ets'; + import AlignCenter_AddOneMargin from './Flex/justifyContent/Center/AlignCenter_AddOneMargin.test.ets'; + import AlignEnd_NoSpace from './Flex/justifyContent/End/AlignEnd_NoSpace.test.ets'; + import AlignEnd_AddPadding from './Flex/justifyContent/End/AlignEnd_AddPadding.test.ets'; + import AlignEnd_AddMargin from './Flex/justifyContent/End/AlignEnd_AddMargin.test.ets'; + import AlignEnd_AddAllSpace from './Flex/justifyContent/End/AlignEnd_AddAllSpace.test.ets'; + import AlignEnd_AddAlign from './Flex/justifyContent/End/AlignEnd_AddAlign.test.ets'; + import AlignEnd_AddOffset from './Flex/justifyContent/End/AlignEnd_AddOffset.test.ets'; + import AlignEnd_AddVisibility from './Flex/justifyContent/End/AlignEnd_AddVisibility.test.ets'; + import AlignEnd_AddLayoutWeight from './Flex/justifyContent/End/AlignEnd_AddLayoutWeight.test.ets'; + import AlignEnd_AddOneWidth from './Flex/justifyContent/End/AlignEnd_AddOneWidth.test.ets'; + import AlignEnd_AddOneMargin from './Flex/justifyContent/End/AlignEnd_AddOneMargin.test.ets'; + import flex_AlignContent_SpaceBetween_FlexSizeTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexSize.test'; + import flex_AlignContent_SpaceBetween_FlexPadTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexPad.test'; + import flex_AlignContent_SpaceBetween_FlexMarTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexMar.test'; + import flex_AlignContent_SpaceBetween_FlexMarPadTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexMarPad.test'; + import flex_AlignContent_SpaceBetween_TextSizeTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextSize.test'; + import flex_AlignContent_SpaceBetween_TextMarTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextMar.test'; + import flex_AlignContent_SpaceBetween_TextOffsetTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextOffset.test'; + import flex_AlignContent_SpaceBetween_TextVisibilityTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextVisibility.test'; + import flex_AlignContent_SpaceAround_FlexSizeTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize.test'; + import flex_AlignContent_SpaceAround_FlexPadTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad.test'; + import flex_AlignContent_SpaceAround_FlexMarTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMar.test'; + import flex_AlignContent_SpaceAround_FlexMarPadTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMarPad.test'; + import flex_AlignContent_SpaceAround_TextSizeTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextSize.test'; + import flex_AlignContent_SpaceAround_TextMarTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextMar.test'; + import flex_AlignContent_SpaceAround_TextOffsetTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextOffset.test'; + import flex_AlignContent_SpaceAround_TextVisibilityTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextVisibility.test'; +import flexWrapReverse_notFixedParent from './Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParent.test.ets'; +import flexWrapReverse_notFixedParentPadding from './Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentPadding.test.ets'; +import flexWrapReverse_notFixedParentMargin from './Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentMargin.test.ets'; +import flexWrapReverse_fixedParent from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParent.test.ets'; +import flexWrapReverse_fixedParentPadding from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentPadding.test.ets'; +import flexWrapReverse_fixedParentMargin from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMargin.test.ets'; +import flexWrapReverse_fixedParentMarPad from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMarPad.test.ets'; +import flexWrapReverse_fixedParentChildVisibility from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildVisibility.test.ets'; +import flexWrapReverse_fixedParentChildPosition from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildPosition.test.ets'; +import flexWrapReverse_fixedParentChildLayoutWeight from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildLayoutWeight.test.ets'; +import flexWrapReverse_fixedParentChildDisplayPriority from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildDisplayPriority.test.ets'; +import flexAlign_SpaceBetween_fixedChild from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChild.test.ets'; +import flexAlign_SpaceBetween_fixedChildParentPadding from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentPadding.test.ets'; +import flexAlign_SpaceBetween_fixedChildParentMargin from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMargin.test.ets'; +import flexAlign_SpaceBetween_fixedChildParentMarPad from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMarPad.test.ets'; +import flexAlign_SpaceBetween_fixedChildParentItemAlignEnd from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentItemAlignEnd.test.ets'; +import flexAlign_SpaceBetween_fixedParent from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParent.test.ets'; +import flexAlign_SpaceBetween_fixedParentVisibility from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentVisibility.test.ets'; +import flexAlign_SpaceBetween_fixedParentChangeFirst from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirst.test.ets'; +import flexAlign_SpaceBetween_fixedParentChangeFirstWidth from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirstWidth.test.ets'; +import flexAlign_SpaceBetween_fixedParentMarginFirst from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentMarginFirst.test.ets'; +import flexAlign_SpaceAround_fixedChild from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChild.test.ets'; +import flexAlign_SpaceAround_fixedChildParentPadding from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentPadding.test.ets'; +import flexAlign_SpaceAround_fixedChildParentMargin from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMargin.test.ets'; +import flexAlign_SpaceAround_fixedChildParentMarPad from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMarPad.test.ets'; +import flexAlign_SpaceAround_fixedChildParentItemAlignEnd from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentItemAlignEnd.test.ets'; +import flexAlign_SpaceAround_fixedParent from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParent.test.ets'; +import flexAlign_SpaceAround_fixedParentVisibility from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentVisibility.test.ets'; +import flexAlign_SpaceAround_fixedParentChangeFirst from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirst.test.ets'; +import flexAlign_SpaceAround_fixedParentChangeFirstWidth from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirstWidth.test.ets'; +import flexAlign_SpaceAround_fixedParentMarginFirst from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentMarginFirst.test.ets'; +import flex_NoWrap_FlexSizeTest from './Flex/Wrap/NoWrap/Flex_NoWrap_FlexSize.test'; +import flex_NoWrap_PaddingTest from './Flex/Wrap/NoWrap/Flex_NoWrap_Padding.test'; +import flex_NoWrap_TextSizeTest from './Flex/Wrap/NoWrap/Flex_NoWrap_TextSize.test'; +import flex_NoWrap_FlexPad_TextMarPadTest from "./Flex/Wrap/NoWrap/Flex_NoWrap_FlexPad_TextMarPad.test"; +import flex_NoWrap_FlexMar_TextMarPadTest from "./Flex/Wrap/NoWrap/Flex_NoWrap_FlexMar_TextMarPad.test"; +import flex_NoWrap_FlexMarPad_TextMarPadTest from "./Flex/Wrap/NoWrap/Flex_NoWrap_FlexMarPad_TextMarPad.test"; +import flex_NoWrap_VisibilityTest from './Flex/Wrap/NoWrap/Flex_NoWrap_Visibility.test'; +import flex_NoWrap_LayoutWeightTest from './Flex/Wrap/NoWrap/Flex_NoWrap_LayoutWeight.test'; +import flex_NoWrap_DisplayPriorityTest from './Flex/Wrap/NoWrap/Flex_NoWrap_DisplayPriority.test'; +import flex_NoWrap_PositionTest from './Flex/Wrap/NoWrap/Flex_NoWrap_Position.test'; +import flex_Wrap_FlexSizeTest from './Flex/Wrap/Wrap/Flex_Wrap_FlexSize.test'; +import flex_Wrap_TextSizeTest from './Flex/Wrap/Wrap/Flex_Wrap_TextSize.test'; +import flex_Wrap_PaddingTest from './Flex/Wrap/Wrap/Flex_Wrap_Padding.test'; +import flex_Wrap_FlexPad_TextMarPadTest from "./Flex/Wrap/Wrap/Flex_Wrap_FlexPad_TextMarPad.test"; +import flex_Wrap_FlexMar_TextMarPadTest from "./Flex/Wrap/Wrap/Flex_Wrap_FlexMar_TextMarPad.test"; +import flex_Wrap_FlexMarPad_TextMarPadTest from "./Flex/Wrap/Wrap/Flex_Wrap_FlexMarPad_TextMarPad.test"; +import flex_Wrap_VisibilityTest from './Flex/Wrap/Wrap/Flex_Wrap_Visibility.test'; +import flex_Wrap_PositionTest from './Flex/Wrap/Wrap/Flex_Wrap_Position.test'; +import flex_Wrap_LayoutWeightTest from './Flex/Wrap/Wrap/Flex_Wrap_LayoutWeight.test'; +import flex_Wrap_DisplayPriorityTest from './Flex/Wrap/Wrap/Flex_Wrap_DisplayPriority.test'; +import AlignContentFlex_Start from './Flex/alignContent/Start/AlignContentFlex_Start.test.ets'; +import AlignContent_FlexAlign_Start_Margin from './Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin.test.ets'; +import AlignContent_FlexAlign_Start_Margin_padding from './Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin_padding.test.ets'; +import AlignContent_FlexAlign_Start_padding from './Flex/alignContent/Start/AlignContent_FlexAlign_Start_padding.test.ets'; +import AlignContent_Start_FlexP_fixed from './Flex/alignContent/Start/AlignContent_Start_FlexP_fixed.test.ets'; +import AlignContent_Start_FlexP_Fixed_Margin from './Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Margin.test.ets'; +import AlignContent_Start_FlexP_Fixed_Offset from './Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Offset.test.ets'; +import AlignContent_Start_FlexP_Fixed_Visibility from './Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Visibility.test.ets'; +import AlignContentFlexJsunit from './Flex/alignContent/SpaceEvenly/AlignContentFlexJsunit.test.ets'; +import AlignContentFlexP_fixed from './Flex/alignContent/SpaceEvenly/AlignContentFlexP_fixed.test.ets'; +import AlignContentFlexP_Fixed_Margin from './Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Margin.test.ets'; +import AlignContentFlexP_Fixed_Offset from './Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Offset.test.ets'; +import AlignContentFlexP_Fixed_Visibility from './Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Visibility.test.ets'; +import AlignContent_FlexAlign_SpaceEvenly_Margin from './Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin.test.ets'; +import AlignContent_FlexAlign_SpaceEvenly_Margin_padding from './Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin_padding.test.ets'; +import AlignContent_FlexAlign_SpaceEvenly_padding from './Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_padding.test.ets'; +import AlignContentFlex_End from './Flex/alignContent/End/AlignContentFlex_End.test.ets'; +import AlignContent_End_FlexP_fixed from './Flex/alignContent/End/AlignContent_End_FlexP_fixed.test.ets'; +import AlignContent_End_FlexP_Fixed_Margin from './Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Margin.test.ets'; +import AlignContent_End_FlexP_Fixed_Offset from './Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Offset.test.ets'; +import AlignContent_End_FlexP_Fixed_Visibility from './Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Visibility.test.ets'; +import AlignContent_FlexAlign_End_Margin from './Flex/alignContent/End/AlignContent_FlexAlign_End_Margin.test.ets'; +import AlignContent_FlexAlign_End_Margin_padding from './Flex/alignContent/End/AlignContent_FlexAlign_End_Margin_padding.test.ets'; +import AlignContent_FlexAlign_End_padding from './Flex/alignContent/End/AlignContent_FlexAlign_End_padding.test.ets'; +import AlignContentFlex_Center from './Flex/alignContent/Center/AlignContentFlex_Center.test.ets'; +import AlignContent_Center_FlexP_fixed from './Flex/alignContent/Center/AlignContent_Center_FlexP_fixed.test.ets'; +import AlignContent_Center_FlexP_Fixed_Margin from './Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Margin.test.ets'; +import AlignContent_Center_FlexP_Fixed_Offset from './Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Offset.test.ets'; +import AlignContent_Center_FlexP_Fixed_Visibility from './Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Visibility.test.ets'; +import AlignContent_FlexAlign_Center_Margin from './Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin.test.ets'; +import AlignContent_FlexAlign_Center_Margin_padding from './Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin_padding.test.ets'; +import AlignContent_FlexAlign_Center_padding from './Flex/alignContent/Center/AlignContent_FlexAlign_Center_padding.test.ets'; +export default function testsuite() { + flexBase_AutoJsunit() + flexPadding_AutoJsunit() + flexMargin_AutoJsunit() + flexExceed_AutoJsunit() + flexHeightModify_AutoJsunit() + flexOffset_AutoJsunit() + flexVisibility_AutoJsunit() + flexAlignSelf_AutoJsunit() + flexTextMargin_AutoJsunit() +flexBase_StartJsunit() +flexPadding_StartJsunit() +flexMargin_StartJsunit() +flexExceed_StartJsunit() +flexHeightModify_StartJsunit() +flexOffset_StartJsunit() +flexVisibility_StartJsunit() +flexAlignSelf_StartJsunit() +flexTextMargin_StartJsunit() +flexBase_CenterJsunit() +flexPadding_CenterJsunit() +flexMargin_CenterJsunit() +flexExceed_CenterJsunit() +flexHeightModify_CenterJsunit() +flexOffset_CenterJsunit() +flexVisibility_CenterJsunit() +flexAlignSelf_CenterJsunit() +flexTextMargin_CenterJsunit() +flexBase_EndJsunit() +flexPadding_EndJsunit() +flexMargin_EndJsunit() +flexExceed_EndJsunit() +flexHeightModify_EndJsunit() +flexOffset_EndJsunit() +flexVisibility_EndJsunit() +flexAlignSelf_EndJsunit() +flexTextMargin_EndJsunit() +flexBase_StretchJsunit() +flexPadding_StretchJsunit() +flexMargin_StretchJsunit() +flexExceed_StretchJsunit() +flexHeightModify_StretchJsunit() +flexOffset_StretchJsunit() +flexVisibility_StretchJsunit() +flexAlignSelf_StretchJsunit() +flexTextMargin_StretchJsunit() +flexBase_BaselineJsunit() +flexPadding_BaselineJsunit() +flexMargin_BaselineJsunit() +flexExceed_BaselineJsunit() +flexHeightModify_BaselineJsunit() +flexOffset_BaselineJsunit() +flexVisibility_BaselineJsunit() +flexAlignSelf_BaselineJsunit() +flexTextMargin_BaselineJsunit() + AlignSpaceEvenly_NoSpace() + AlignSpaceEvenly_AddPadding() + AlignSpaceEvenly_AddMargin() + AlignSpaceEvenly_AddAllSpace() + AlignSpaceEvenly_AddAlign() + AlignSpaceEvenly_AddOffset() + AlignSpaceEvenly_AddVisibility() + AlignSpaceEvenly_AddLayoutWeight() + AlignSpaceEvenly_AddOneWidth() + AlignSpaceEvenly_AddOneMargin() + AlignStart_NoSpace() + AlignStart_AddPadding() + AlignStart_AddMargin() + AlignStart_AddAllSpace() + AlignStart_AddAlign() + AlignStart_AddOffset() + AlignStart_AddVisibility() + AlignStart_AddLayoutWeight() + AlignStart_AddOneWidth() + AlignStart_AddOneMargin() + AlignCenter_NoSpace() + AlignCenter_AddPadding() + AlignCenter_AddMargin() + AlignCenter_AddAllSpace() + AlignCenter_AddAlign() + AlignCenter_AddOffset() + AlignCenter_AddVisibility() + AlignCenter_AddLayoutWeight() + AlignCenter_AddOneWidth() + AlignCenter_AddOneMargin() + AlignEnd_NoSpace() + AlignEnd_AddPadding() + AlignEnd_AddMargin() + AlignEnd_AddAllSpace() + AlignEnd_AddAlign() + AlignEnd_AddOffset() + AlignEnd_AddVisibility() + AlignEnd_AddLayoutWeight() + AlignEnd_AddOneWidth() + AlignEnd_AddOneMargin() + flex_AlignContent_SpaceBetween_FlexSizeTest(); + flex_AlignContent_SpaceBetween_FlexPadTest(); + flex_AlignContent_SpaceBetween_FlexMarTest(); + flex_AlignContent_SpaceBetween_FlexMarPadTest(); + flex_AlignContent_SpaceBetween_TextSizeTest(); + flex_AlignContent_SpaceBetween_TextMarTest(); + flex_AlignContent_SpaceBetween_TextOffsetTest(); + flex_AlignContent_SpaceBetween_TextVisibilityTest(); + flex_AlignContent_SpaceAround_FlexSizeTest(); + flex_AlignContent_SpaceAround_FlexPadTest(); + flex_AlignContent_SpaceAround_FlexMarTest(); + flex_AlignContent_SpaceAround_FlexMarPadTest(); + flex_AlignContent_SpaceAround_TextSizeTest(); + flex_AlignContent_SpaceAround_TextMarTest(); + flex_AlignContent_SpaceAround_TextOffsetTest(); + flex_AlignContent_SpaceAround_TextVisibilityTest(); + flexWrapReverse_notFixedParent() + flexWrapReverse_notFixedParentPadding() + flexWrapReverse_notFixedParentMargin() + flexWrapReverse_fixedParent() + flexWrapReverse_fixedParentPadding() + flexWrapReverse_fixedParentMargin() + flexWrapReverse_fixedParentMarPad() + flexWrapReverse_fixedParentChildVisibility() + flexWrapReverse_fixedParentChildPosition() + flexWrapReverse_fixedParentChildLayoutWeight() + flexWrapReverse_fixedParentChildDisplayPriority() + flexAlign_SpaceBetween_fixedChild() + flexAlign_SpaceBetween_fixedChildParentPadding() + flexAlign_SpaceBetween_fixedChildParentMargin() + flexAlign_SpaceBetween_fixedChildParentMarPad() + flexAlign_SpaceBetween_fixedChildParentItemAlignEnd() + flexAlign_SpaceBetween_fixedParent() + flexAlign_SpaceBetween_fixedParentVisibility() + flexAlign_SpaceBetween_fixedParentChangeFirst() + flexAlign_SpaceBetween_fixedParentChangeFirstWidth() + flexAlign_SpaceBetween_fixedParentMarginFirst() + flexAlign_SpaceAround_fixedChild() + flexAlign_SpaceAround_fixedChildParentPadding() + flexAlign_SpaceAround_fixedChildParentMargin() + flexAlign_SpaceAround_fixedChildParentMarPad() + flexAlign_SpaceAround_fixedChildParentItemAlignEnd() + flexAlign_SpaceAround_fixedParent() + flexAlign_SpaceAround_fixedParentVisibility() + flexAlign_SpaceAround_fixedParentChangeFirst() + flexAlign_SpaceAround_fixedParentChangeFirstWidth() + flexAlign_SpaceAround_fixedParentMarginFirst() + flex_NoWrap_FlexSizeTest(); + flex_NoWrap_PaddingTest(); + flex_NoWrap_TextSizeTest(); + flex_NoWrap_FlexPad_TextMarPadTest(); + flex_NoWrap_FlexMar_TextMarPadTest(); + flex_NoWrap_FlexMarPad_TextMarPadTest(); + flex_NoWrap_VisibilityTest(); + flex_NoWrap_LayoutWeightTest(); + flex_NoWrap_DisplayPriorityTest(); + flex_NoWrap_PositionTest(); + flex_Wrap_FlexSizeTest(); + flex_Wrap_PaddingTest(); + flex_Wrap_TextSizeTest(); + flex_Wrap_FlexPad_TextMarPadTest(); + flex_Wrap_FlexMar_TextMarPadTest(); + flex_Wrap_FlexMarPad_TextMarPadTest(); + flex_Wrap_VisibilityTest(); + flex_Wrap_PositionTest(); + flex_Wrap_LayoutWeightTest(); + flex_Wrap_DisplayPriorityTest(); + AlignContentFlex_Start(); + AlignContent_FlexAlign_Start_Margin(); + AlignContent_FlexAlign_Start_Margin_padding(); + AlignContent_FlexAlign_Start_padding(); + AlignContent_Start_FlexP_fixed(); + AlignContent_Start_FlexP_Fixed_Margin(); + AlignContent_Start_FlexP_Fixed_Offset(); + AlignContent_Start_FlexP_Fixed_Visibility(); + AlignContentFlexJsunit(); + AlignContentFlexP_fixed(); + AlignContentFlexP_Fixed_Margin(); + AlignContentFlexP_Fixed_Offset(); + AlignContentFlexP_Fixed_Visibility(); + AlignContent_FlexAlign_SpaceEvenly_Margin(); + AlignContent_FlexAlign_SpaceEvenly_Margin_padding(); + AlignContent_FlexAlign_SpaceEvenly_padding(); + AlignContentFlex_End(); + AlignContent_End_FlexP_fixed(); + AlignContent_End_FlexP_Fixed_Margin(); + AlignContent_End_FlexP_Fixed_Offset(); + AlignContent_End_FlexP_Fixed_Visibility(); + AlignContent_FlexAlign_End_Margin(); + AlignContent_FlexAlign_End_Margin_padding(); + AlignContent_FlexAlign_End_padding(); + AlignContentFlex_Center(); + AlignContent_Center_FlexP_fixed(); + AlignContent_Center_FlexP_Fixed_Margin(); + AlignContent_Center_FlexP_Fixed_Offset(); + AlignContent_Center_FlexP_Fixed_Visibility(); + AlignContent_FlexAlign_Center_Margin(); + AlignContent_FlexAlign_Center_Margin_padding(); + AlignContent_FlexAlign_Center_padding(); +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..52d6a700be21c25233a6d60567e3b453b3ec981e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/module.json @@ -0,0 +1,59 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.acts.arkui.layout.test.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.INTERNET" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.CAMERA" + } + ] + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..c08965e27e91133fd0611cbfb303cb1e37c955f0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/resources/base/element/float.json @@ -0,0 +1,8 @@ +{ + "float": [ + { + "name": "float_1", + "value": "10vp" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2977b612ec4595b13eaaffe3e8fc578e83c42d48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "phone_entry_dsc", + "value": "i am an entry for phone" + }, + { + "name": "phone_entry_main", + "value": "the phone entry ability" + }, + { + "name": "entry_label", + "value": "ActsContextTest" + }, + { + "name": "form_description", + "value": "my form" + }, + { + "name": "serviceability_description", + "value": "my whether" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "app_name", + "value": "Demo" + } + ] +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..521e8e32b15404576b0f6017d773f2b9c88ddb48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,200 @@ +{ + "src": [ + "MainAbility/pages/index/index", + + "MainAbility/pages/Flex/alignContent/Center/AlignContentFlex_Center", + "MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_fixed", + "MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Margin", + "MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Offset", + "MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Visibility", + "MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin", + "MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin_padding", + "MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_padding", + "MainAbility/pages/Flex/alignContent/End/AlignContentFlex_End", + "MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_fixed", + "MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Margin", + "MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Offset", + "MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Visibility", + "MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin", + "MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin_padding", + "MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_padding", + "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMar", + "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMarPad", + "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad", + "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize", + "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextMar", + "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextOffset", + "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextSize", + "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextVisibility", + "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexMar", + "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexMarPad", + "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexPad", + "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexSize", + "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextMar", + "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextOffset", + "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextSize", + "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextVisibility", + "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlex", + "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_fixed", + "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Margin", + "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Offset", + "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Visibility", + "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin", + "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin_padding", + "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_padding", + "MainAbility/pages/Flex/alignContent/Start/AlignContentFlex_Start", + "MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin", + "MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin_padding", + "MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_padding", + "MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_fixed", + "MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Margin", + "MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Offset", + "MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Visibility", + "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexAlignSelf", + "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexBase", + "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexExceed", + "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexHeightModify", + "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexMargin", + "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexOffset", + "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexPadding", + "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexTextMargin", + "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexVisibility", + "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexAlignSelf", + "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexBase", + "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexExceed", + "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexHeightModify", + "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexMargin", + "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexOffset", + "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexPadding", + "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexTextMargin", + "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexVisibility", + "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexAlignSelf", + "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexBase", + "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexExceed", + "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexHeightModify", + "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexMargin", + "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexOffset", + "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexPadding", + "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexTextMargin", + "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexVisibility", + "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexAlignSelf", + "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexBase", + "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexExceed", + "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexHeightModify", + "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexMargin", + "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexOffset", + "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexPadding", + "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexTextMargin", + "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexVisibility", + "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexAlignSelf", + "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexBase", + "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexExceed", + "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexHeightModify", + "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexMargin", + "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexOffset", + "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexPadding", + "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexTextMargin", + "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexVisibility", + "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexAlignSelf", + "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexBase", + "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexExceed", + "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexHeightModify", + "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexMargin", + "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexOffset", + "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexPadding", + "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexTextMargin", + "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexVisibility", + "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAlign", + "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAllSpace", + "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight", + "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddMargin", + "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOffset", + "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneMargin", + "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneWidth", + "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddPadding", + "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddVisibility", + "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_NoSpace", + "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAlign", + "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAllSpace", + "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddLayoutWeight", + "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddMargin", + "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOffset", + "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneMargin", + "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneWidth", + "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddPadding", + "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddVisibility", + "MainAbility/pages/Flex/justifyContent/End/AlignEnd_NoSpace", + "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChild", + "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentItemAlignEnd", + "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMargin", + "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMarPad", + "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentPadding", + "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParent", + "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirst", + "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirstWidth", + "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentMarginFirst", + "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentVisibility", + "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChild", + "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentItemAlignEnd", + "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMargin", + "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMarPad", + "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentPadding", + "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParent", + "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirst", + "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirstWidth", + "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentMarginFirst", + "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentVisibility", + "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign", + "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace", + "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight", + "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin", + "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset", + "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin", + "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth", + "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding", + "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility", + "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace", + "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAlign", + "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAllSpace", + "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddLayoutWeight", + "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddMargin", + "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOffset", + "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneMargin", + "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneWidth", + "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddPadding", + "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddVisibility", + "MainAbility/pages/Flex/justifyContent/Start/AlignStart_NoSpace", + "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_DisplayPriority", + "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMarPad_TextMarPad", + "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMar_TextMarPad", + "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexPad_TextMarPad", + "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexSize", + "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_LayoutWeight", + "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Padding", + "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Position", + "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_TextSize", + "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Visibility", + "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_DisplayPriority", + "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexMarPad_TextMarPad", + "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexMar_TextMarPad", + "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexPad_TextMarPad", + "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexSize", + "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_LayoutWeight", + "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Padding", + "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Position", + "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_TextSize", + "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Visibility", + "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParent", + "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildDisplayPriority", + "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildLayoutWeight", + "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildPosition", + "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildVisibility", + "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMargin", + "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMarPad", + "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentPadding", + "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParent", + "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentMargin", + "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentPadding" + + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_flex_test/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..19c8848dfb41d2ca5e060525eb8180d538bc635c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.acts.arkui.layout.test", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "description": "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ee69f9a861d9dc269ed6638735d52674583498e1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ohosProject" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..28cbce0d03aabcb8c25f6e672d94edc545718a99 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutGridColTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_component_gridCol_js_assets", + ":ace_ets_component_gridCol_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutGridColTest" +} + +ohos_app_scope("ace_ets_component_gridCol_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_component_gridCol_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_ets_component_gridCol_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_ets_component_gridCol_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..d83bc2a222fdaf0c1a268056bfc8a378015c7e4b --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutGridColTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..b0e0206ea9fb5ce94ef140d69510b6280969dd8e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,9 @@ +import AbilityStage from "@ohos.app.ability.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + globalThis.stageOnCreateRun = 1; + globalThis.stageContext = this.context; + } +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..0594e6e62c917b6aa681057bf10f26aff9d2abe5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,40 @@ +import Ability from '@ohos.app.ability.UIAbility' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +export default class MainAbility extends Ability { + onCreate(want,launchParam){ + // Ability is creating, initialize resources for this ability + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) + let AtManager = abilityAccessCtrl.createAtManager() + AtManager.requestPermissionsFromUser(this.context,[ + "ohos.permission.CAPTURE_SCREEN"]).then(() => {}) + globalThis.windowStage = windowStage + globalThis.abilityContext = this.context + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) + } + + onWindowStageDestroy() { + //Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/common/Common.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc98d34214f4aea48824806a09c6385b9d82dde5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/common/Common.ets @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ + +export default class CommonFunc { + static rect_left; + static rect_top; + static rect_right; + static rect_bottom; + static rect_value; + + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + + static getComponentRect(key) { + let strJson = getInspectorByKey(key); + let obj = JSON.parse(strJson); + console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); + let rectInfo = JSON.parse('[' + obj.$rect + ']'); + this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0]; + this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1]; + this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0]; + this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1]; + this.rect_value = { + "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom + }; + console.info(JSON.stringify(this.rect_value)); + return this.rect_value; + } +} + diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/common/MessageManager.ets new file mode 100644 index 0000000000000000000000000000000000000000..97dd36af2da2f6a3ce332ee8212fd1e722fff166 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/common/MessageManager.ets @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ +export interface Callback { + (message:any):void +} + +export class MessageManager { + callback:Callback + callbacks:Map = new Map() + + constructor() { + + } + + registerCallback(callback:Callback , type?:string) { + if (type == undefined) { + console.error('registerCallback callback set') + this.callback = callback + return + } + this.callbacks.set(type,callback) + } + + notify(message:any, type?:string) { + if (type == undefined) { + this.callback(message) + return + } + + let tmpCallback:Callback = this.callbacks.get(type) + if (tmpCallback === undefined) { + console.error('callbacks has no callback for type ' + type) + return + } + tmpCallback(message) + } + + clear() { + this.callbacks.clear() + this.callback = null + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_GridColColumnOption.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_GridColColumnOption.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_GridColColumnOption.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_GridColColumnOption.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Number.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Number.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Number.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Number.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_GridColColumnOption.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_GridColColumnOption.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_GridColColumnOption.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_GridColColumnOption.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Number.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Number.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Number.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Number.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_GridColColumnOption.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_GridColColumnOption.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_GridColColumnOption.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_GridColColumnOption.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Number.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Number.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Number.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Number.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..5c372e0c20209b661a274129b184c2ed9741a7d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +@Entry +@Component +struct Index { + + aboutToAppear(){ + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5841ae7bffea3a0b5e3c6d7d78aec80a9010f1e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..4bf893f776d7c265fb40e3ec5c91f3eb2e338dcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('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/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9529e19be5455dcc8c817ef5acb3a773dd543d06 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 + +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() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.acts.arkui.layout.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_GridColColumnOption.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_GridColColumnOption.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_GridColColumnOption.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_GridColColumnOption.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Number.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Number.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Number.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Number.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_GridColColumnOption.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_GridColColumnOption.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_GridColColumnOption.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_GridColColumnOption.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Number.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Number.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Number.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Number.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_GridColColumnOption.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_GridColColumnOption.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_GridColColumnOption.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_GridColColumnOption.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Number.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Number.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Number.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Number.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..232bb540de64572d3a295ca89a40a892f3d300e0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 Grid_Col_Span_Default from './Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Default.test.ets'; + import Grid_Col_Span_Number from './Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Number.test.ets'; + import Grid_Col_Span_GridColColumnOption from './Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_GridColColumnOption.test.ets'; + import Grid_Col_Order_Default from './Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Default.test.ets'; + import Grid_Col_Order_Number from './Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Number.test.ets'; + import Grid_Col_Order_GridColColumnOption from './Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_GridColColumnOption.test.ets'; + import Grid_Col_Offset_Default from './Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Default.test.ets'; + import Grid_Col_Offset_Number from './Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Number.test.ets'; + import Grid_Col_Offset_GridColColumnOption from './Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_GridColColumnOption.test.ets'; + + + +export default function testsuite() { + + Grid_Col_Span_Default() + Grid_Col_Span_Number() + Grid_Col_Span_GridColColumnOption() + Grid_Col_Order_Default() + Grid_Col_Order_Number() + Grid_Col_Order_GridColColumnOption() + Grid_Col_Offset_Default() + Grid_Col_Offset_Number() + Grid_Col_Offset_GridColColumnOption() + +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..52d6a700be21c25233a6d60567e3b453b3ec981e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/module.json @@ -0,0 +1,59 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.acts.arkui.layout.test.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.INTERNET" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.CAMERA" + } + ] + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..c08965e27e91133fd0611cbfb303cb1e37c955f0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/resources/base/element/float.json @@ -0,0 +1,8 @@ +{ + "float": [ + { + "name": "float_1", + "value": "10vp" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2977b612ec4595b13eaaffe3e8fc578e83c42d48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "phone_entry_dsc", + "value": "i am an entry for phone" + }, + { + "name": "phone_entry_main", + "value": "the phone entry ability" + }, + { + "name": "entry_label", + "value": "ActsContextTest" + }, + { + "name": "form_description", + "value": "my form" + }, + { + "name": "serviceability_description", + "value": "my whether" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "app_name", + "value": "Demo" + } + ] +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..b6e39d7ef38c6f58853b267746ca7c3b70994220 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,15 @@ +{ + "src": [ + "MainAbility/pages/index/index", + + "MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Default", + "MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Number", + "MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_GridColColumnOption", + "MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Default", + "MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Number", + "MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_GridColColumnOption", + "MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Default", + "MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Number", + "MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_GridColColumnOption" + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_gridCol_test/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..19c8848dfb41d2ca5e060525eb8180d538bc635c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.acts.arkui.layout.test", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "description": "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ee69f9a861d9dc269ed6638735d52674583498e1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ohosProject" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..582c1713c296212148e9e6534210e3e49c635ba9 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutGridRowTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_component_gridRow_js_assets", + ":ace_ets_component_gridRow_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutGridRowTest" +} + +ohos_app_scope("ace_ets_component_gridRow_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_component_gridRow_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_ets_component_gridRow_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_ets_component_gridRow_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..5758f87d1e7f83c4b3f0075a2828a98295e811d6 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutGridRowTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..b0e0206ea9fb5ce94ef140d69510b6280969dd8e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,9 @@ +import AbilityStage from "@ohos.app.ability.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + globalThis.stageOnCreateRun = 1; + globalThis.stageContext = this.context; + } +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..0594e6e62c917b6aa681057bf10f26aff9d2abe5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,40 @@ +import Ability from '@ohos.app.ability.UIAbility' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +export default class MainAbility extends Ability { + onCreate(want,launchParam){ + // Ability is creating, initialize resources for this ability + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) + let AtManager = abilityAccessCtrl.createAtManager() + AtManager.requestPermissionsFromUser(this.context,[ + "ohos.permission.CAPTURE_SCREEN"]).then(() => {}) + globalThis.windowStage = windowStage + globalThis.abilityContext = this.context + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) + } + + onWindowStageDestroy() { + //Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/common/Common.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc98d34214f4aea48824806a09c6385b9d82dde5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/common/Common.ets @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ + +export default class CommonFunc { + static rect_left; + static rect_top; + static rect_right; + static rect_bottom; + static rect_value; + + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + + static getComponentRect(key) { + let strJson = getInspectorByKey(key); + let obj = JSON.parse(strJson); + console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); + let rectInfo = JSON.parse('[' + obj.$rect + ']'); + this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0]; + this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1]; + this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0]; + this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1]; + this.rect_value = { + "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom + }; + console.info(JSON.stringify(this.rect_value)); + return this.rect_value; + } +} + diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/common/MessageManager.ets new file mode 100644 index 0000000000000000000000000000000000000000..97dd36af2da2f6a3ce332ee8212fd1e722fff166 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/common/MessageManager.ets @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ +export interface Callback { + (message:any):void +} + +export class MessageManager { + callback:Callback + callbacks:Map = new Map() + + constructor() { + + } + + registerCallback(callback:Callback , type?:string) { + if (type == undefined) { + console.error('registerCallback callback set') + this.callback = callback + return + } + this.callbacks.set(type,callback) + } + + notify(message:any, type?:string) { + if (type == undefined) { + this.callback(message) + return + } + + let tmpCallback:Callback = this.callbacks.get(type) + if (tmpCallback === undefined) { + console.error('callbacks has no callback for type ' + type) + return + } + tmpCallback(message) + } + + clear() { + this.callbacks.clear() + this.callback = null + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Change.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Change.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Change.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Change.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Component.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Component.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Component.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Component.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Incremental.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Incremental.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Incremental.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Incremental.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Negative.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Negative.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Negative.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Negative.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Quantity.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Quantity.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Quantity.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Quantity.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Window.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Window.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Window.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Window.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Option.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Option.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Option.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Option.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Gutter.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Gutter.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Gutter.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Gutter.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Length_String.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Length_String.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Length_String.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Length_String.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_SizeOption.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_SizeOption.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_SizeOption.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_SizeOption.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/onBreakpointChange/onBreakpointChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/onBreakpointChange/onBreakpointChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/onBreakpointChange/onBreakpointChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/onBreakpointChange/onBreakpointChange.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..5c372e0c20209b661a274129b184c2ed9741a7d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +@Entry +@Component +struct Index { + + aboutToAppear(){ + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5841ae7bffea3a0b5e3c6d7d78aec80a9010f1e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..4bf893f776d7c265fb40e3ec5c91f3eb2e338dcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('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/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9529e19be5455dcc8c817ef5acb3a773dd543d06 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 + +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() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.acts.arkui.layout.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Change.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Change.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Change.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Change.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Component.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Component.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Component.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Component.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Incremental.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Incremental.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Incremental.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Incremental.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Negative.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Negative.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Negative.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Negative.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Quantity.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Quantity.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Quantity.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Quantity.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Window.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Window.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Window.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Window.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Option.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Option.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Option.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Option.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Gutter.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Gutter.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Gutter.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Gutter.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Length_String.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Length_String.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Length_String.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Length_String.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_SizeOption.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_SizeOption.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_SizeOption.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_SizeOption.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/onBreakpointChange/onBreakpointChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/onBreakpointChange/onBreakpointChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_Row/onBreakpointChange/onBreakpointChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/Grid/Grid_Row/onBreakpointChange/onBreakpointChange.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..ccd4dde1e685aa6d10a3e4947068fec34172815b --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 Grid_Row_Columns from './Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns.test.ets'; + import Grid_Row_Columns_Default from './Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Default.test.ets'; + import Grid_Row_Columns_Option from './Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Option.test.ets'; + import Grid_Row_Gutter from './Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Gutter.test.ets'; + import Grid_Row_Length_String from './Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Length_String.test'; + import Gutter_Length_Resource from './Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.test'; + import Gutter_Length_Default from './Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Default.test'; + import Grid_Row_SizeOption from './Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_SizeOption.test'; + import Grid_Row_GutterOption_String from './Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.test'; + import Grid_Row_GutterOption_Default from './Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.test'; + import Grid_Row_GutterOption_Number from './Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.test'; + import Grid_Row_Direction_Row from './Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.test'; + import Grid_Row_Direction_RowReverse from './Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.test'; + import Grid_Row_Breakpoints_Default from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Default.test'; + import Grid_Row_Breakpoints_Component from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Component.test'; + import Grid_Row_Breakpoints_Window from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Window.test'; + import Grid_Row_Breakpoints_Change from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Change.test'; + import Grid_Row_Breakpoints_Incremental from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Incremental.test'; + import Grid_Row_Breakpoints_Negative from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Negative.test'; + import Grid_Row_Breakpoints_Quantity from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Quantity.test'; + import GridRow_onBreakpoint from './Grid/Grid_Row/onBreakpointChange/onBreakpointChange.test'; + + +export default function testsuite() { + + + Grid_Row_Columns() + Grid_Row_Columns_Option() + Grid_Row_Columns_Default() + Grid_Row_Gutter() + Gutter_Length_Resource() + Gutter_Length_Default() + Grid_Row_GutterOption_Number() + Grid_Row_GutterOption_Default() + Grid_Row_Direction_Row() + Grid_Row_Direction_RowReverse() + Grid_Row_Length_String() + Grid_Row_SizeOption() + Grid_Row_GutterOption_String() + Grid_Row_Breakpoints_Default() + Grid_Row_Breakpoints_Component() + Grid_Row_Breakpoints_Window() + Grid_Row_Breakpoints_Change() + Grid_Row_Breakpoints_Incremental() + Grid_Row_Breakpoints_Negative() + Grid_Row_Breakpoints_Quantity() + GridRow_onBreakpoint() + +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..52d6a700be21c25233a6d60567e3b453b3ec981e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/module.json @@ -0,0 +1,59 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.acts.arkui.layout.test.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.INTERNET" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.CAMERA" + } + ] + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..c08965e27e91133fd0611cbfb303cb1e37c955f0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/resources/base/element/float.json @@ -0,0 +1,8 @@ +{ + "float": [ + { + "name": "float_1", + "value": "10vp" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2977b612ec4595b13eaaffe3e8fc578e83c42d48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "phone_entry_dsc", + "value": "i am an entry for phone" + }, + { + "name": "phone_entry_main", + "value": "the phone entry ability" + }, + { + "name": "entry_label", + "value": "ActsContextTest" + }, + { + "name": "form_description", + "value": "my form" + }, + { + "name": "serviceability_description", + "value": "my whether" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "app_name", + "value": "Demo" + } + ] +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..cb853c622565589cf6fd07ac3bbec943c0468d81 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,27 @@ +{ + "src": [ + "MainAbility/pages/index/index", + + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Default", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Option", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Gutter", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Length_String", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Default", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_SizeOption", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Change", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Component", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Window", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Default", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Incremental", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Negative", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Quantity", + "MainAbility/pages/Grid/Grid_Row/onBreakpointChange/onBreakpointChange", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row", + "MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse" + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_gridRow_test/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..19c8848dfb41d2ca5e060525eb8180d538bc635c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.acts.arkui.layout.test", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "description": "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ee69f9a861d9dc269ed6638735d52674583498e1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ohosProject" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..e8e6edcc6fd087a70ef1977c80b9f4a77affd379 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutGridTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_component_grid_js_assets", + ":ace_ets_component_grid_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutGridTest" +} + +ohos_app_scope("ace_ets_component_grid_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_component_grid_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_ets_component_grid_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_ets_component_grid_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..2b7a0ca512547674b868ec82bda5a2642049ca5e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutGridTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..b0e0206ea9fb5ce94ef140d69510b6280969dd8e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,9 @@ +import AbilityStage from "@ohos.app.ability.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + globalThis.stageOnCreateRun = 1; + globalThis.stageContext = this.context; + } +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..0594e6e62c917b6aa681057bf10f26aff9d2abe5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,40 @@ +import Ability from '@ohos.app.ability.UIAbility' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +export default class MainAbility extends Ability { + onCreate(want,launchParam){ + // Ability is creating, initialize resources for this ability + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) + let AtManager = abilityAccessCtrl.createAtManager() + AtManager.requestPermissionsFromUser(this.context,[ + "ohos.permission.CAPTURE_SCREEN"]).then(() => {}) + globalThis.windowStage = windowStage + globalThis.abilityContext = this.context + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) + } + + onWindowStageDestroy() { + //Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/common/Common.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc98d34214f4aea48824806a09c6385b9d82dde5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/common/Common.ets @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ + +export default class CommonFunc { + static rect_left; + static rect_top; + static rect_right; + static rect_bottom; + static rect_value; + + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + + static getComponentRect(key) { + let strJson = getInspectorByKey(key); + let obj = JSON.parse(strJson); + console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); + let rectInfo = JSON.parse('[' + obj.$rect + ']'); + this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0]; + this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1]; + this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0]; + this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1]; + this.rect_value = { + "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom + }; + console.info(JSON.stringify(this.rect_value)); + return this.rect_value; + } +} + diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/common/MessageManager.ets new file mode 100644 index 0000000000000000000000000000000000000000..97dd36af2da2f6a3ce332ee8212fd1e722fff166 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/common/MessageManager.ets @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ +export interface Callback { + (message:any):void +} + +export class MessageManager { + callback:Callback + callbacks:Map = new Map() + + constructor() { + + } + + registerCallback(callback:Callback , type?:string) { + if (type == undefined) { + console.error('registerCallback callback set') + this.callback = callback + return + } + this.callbacks.set(type,callback) + } + + notify(message:any, type?:string) { + if (type == undefined) { + this.callback(message) + return + } + + let tmpCallback:Callback = this.callbacks.get(type) + if (tmpCallback === undefined) { + console.error('callbacks has no callback for type ' + type) + return + } + tmpCallback(message) + } + + clear() { + this.callbacks.clear() + this.callback = null + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemColumnStartEnd.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemColumnStartEnd.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemColumnStartEnd.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemColumnStartEnd.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemContentSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemContentSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemContentSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemContentSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPadMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPadMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPadMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPadMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPosition.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPosition.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPosition.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPosition.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_attribute/GridFrictionPage.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_attribute/GridFrictionPage.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_attribute/GridFrictionPage.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_attribute/GridFrictionPage.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..5c372e0c20209b661a274129b184c2ed9741a7d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +@Entry +@Component +struct Index { + + aboutToAppear(){ + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5841ae7bffea3a0b5e3c6d7d78aec80a9010f1e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..4bf893f776d7c265fb40e3ec5c91f3eb2e338dcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('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/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9529e19be5455dcc8c817ef5acb3a773dd543d06 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 + +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() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.acts.arkui.layout.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemColumnStartEnd.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemColumnStartEnd.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemColumnStartEnd.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemColumnStartEnd.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemContentSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemContentSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemContentSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemContentSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemOffset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemOffset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemOffset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemOffset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPadMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPadMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPadMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPadMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPosition.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPosition.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPosition.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPosition.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_attribute/Grid_GridFriction.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/Grid_attribute/Grid_GridFriction.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Grid/Grid_attribute/Grid_GridFriction.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/Grid/Grid_attribute/Grid_GridFriction.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..b293d3989e1f79e963552cb958bc056124ae0517 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 Grid_RowCol_TemplateChange from './Grid/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange.test.ets'; + import Grid_RowCol_GridSize from './Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize.test.ets'; + import Grid_RowCol_PadMar from './Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar.test.ets'; + import Grid_RowCol_Gap from './Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap.test.ets'; + import Grid_RowCol_LayoutDirection from './Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection.test.ets'; + import Grid_RowCol_maxCount from './Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount.test.ets'; + import Grid_RowCol_cellLength from './Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength.test.ets'; +import grid_RowCol_ItemPadMarTest from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPadMar.test'; +import grid_RowCol_ItemOffsetTest from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemOffset.test'; +import grid_RowCol_ItemPositionTest from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPosition.test'; +import grid_RowCol_ItemVisibilityTest from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility.test'; +import grid_RowCol_ItemContentSizeTest from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemContentSize.test'; +import grid_RowCol_ItemColumnStartEnd from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemColumnStartEnd.test'; +import grid_RowCol_ItemRowStartEnd from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd.test'; +import grid_GridFrictionTest from './Grid/Grid_attribute/Grid_GridFriction.test'; + +export default function testsuite() { + + + Grid_RowCol_TemplateChange() + Grid_RowCol_GridSize() + Grid_RowCol_PadMar() + Grid_RowCol_Gap() + Grid_RowCol_LayoutDirection() + Grid_RowCol_maxCount() + Grid_RowCol_cellLength() + grid_RowCol_ItemPadMarTest(); + grid_RowCol_ItemOffsetTest(); + grid_RowCol_ItemPositionTest(); + grid_RowCol_ItemVisibilityTest(); + grid_RowCol_ItemContentSizeTest(); + grid_RowCol_ItemColumnStartEnd() + grid_RowCol_ItemRowStartEnd() + grid_GridFrictionTest(); + +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..52d6a700be21c25233a6d60567e3b453b3ec981e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/module.json @@ -0,0 +1,59 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.acts.arkui.layout.test.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.INTERNET" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.CAMERA" + } + ] + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..c08965e27e91133fd0611cbfb303cb1e37c955f0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/resources/base/element/float.json @@ -0,0 +1,8 @@ +{ + "float": [ + { + "name": "float_1", + "value": "10vp" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2977b612ec4595b13eaaffe3e8fc578e83c42d48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "phone_entry_dsc", + "value": "i am an entry for phone" + }, + { + "name": "phone_entry_main", + "value": "the phone entry ability" + }, + { + "name": "entry_label", + "value": "ActsContextTest" + }, + { + "name": "form_description", + "value": "my form" + }, + { + "name": "serviceability_description", + "value": "my whether" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "app_name", + "value": "Demo" + } + ] +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..26aee7e96172066ed2bf3b6e1500e65ce004bb3e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,21 @@ +{ + "src": [ + "MainAbility/pages/index/index", + + "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemColumnStartEnd", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemContentSize", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemOffset", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPadMar", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPosition", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility", + "MainAbility/pages/Grid/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange", + "MainAbility/pages/Grid/Grid_attribute/GridFrictionPage" + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_grid_test/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..19c8848dfb41d2ca5e060525eb8180d538bc635c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.acts.arkui.layout.test", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "description": "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ee69f9a861d9dc269ed6638735d52674583498e1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ohosProject" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..c550b2d4a01c0f9bea0428e03261e6ee703bfd0a --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutListTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_layout_list_js_assets", + ":ace_ets_layout_list_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutListTest" +} + +ohos_app_scope("ace_ets_layout_list_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_layout_list_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_ets_layout_list_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_ets_layout_list_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..34d8b1a7dffa367263d3eb4986c0334d20692020 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutListTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..b0e0206ea9fb5ce94ef140d69510b6280969dd8e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,9 @@ +import AbilityStage from "@ohos.app.ability.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + globalThis.stageOnCreateRun = 1; + globalThis.stageContext = this.context; + } +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..0594e6e62c917b6aa681057bf10f26aff9d2abe5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,40 @@ +import Ability from '@ohos.app.ability.UIAbility' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +export default class MainAbility extends Ability { + onCreate(want,launchParam){ + // Ability is creating, initialize resources for this ability + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) + let AtManager = abilityAccessCtrl.createAtManager() + AtManager.requestPermissionsFromUser(this.context,[ + "ohos.permission.CAPTURE_SCREEN"]).then(() => {}) + globalThis.windowStage = windowStage + globalThis.abilityContext = this.context + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) + } + + onWindowStageDestroy() { + //Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/common/Common.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc98d34214f4aea48824806a09c6385b9d82dde5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/common/Common.ets @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ + +export default class CommonFunc { + static rect_left; + static rect_top; + static rect_right; + static rect_bottom; + static rect_value; + + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + + static getComponentRect(key) { + let strJson = getInspectorByKey(key); + let obj = JSON.parse(strJson); + console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); + let rectInfo = JSON.parse('[' + obj.$rect + ']'); + this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0]; + this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1]; + this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0]; + this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1]; + this.rect_value = { + "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom + }; + console.info(JSON.stringify(this.rect_value)); + return this.rect_value; + } +} + diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/common/MessageManager.ets new file mode 100644 index 0000000000000000000000000000000000000000..97dd36af2da2f6a3ce332ee8212fd1e722fff166 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/common/MessageManager.ets @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ +export interface Callback { + (message:any):void +} + +export class MessageManager { + callback:Callback + callbacks:Map = new Map() + + constructor() { + + } + + registerCallback(callback:Callback , type?:string) { + if (type == undefined) { + console.error('registerCallback callback set') + this.callback = callback + return + } + this.callbacks.set(type,callback) + } + + notify(message:any, type?:string) { + if (type == undefined) { + this.callback(message) + return + } + + let tmpCallback:Callback = this.callbacks.get(type) + if (tmpCallback === undefined) { + console.error('callbacks has no callback for type ' + type) + return + } + tmpCallback(message) + } + + clear() { + this.callbacks.clear() + this.callback = null + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_ListDirection.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_ListDirection.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_ListDirection.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_ListDirection.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_ListSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_ListSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_ListSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_ListSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_Margin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_Margin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_Margin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_Margin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_PadMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_PadMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_PadMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_PadMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_Padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_Padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_Padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_Padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_alignListItem.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_alignListItem.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_alignListItem.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_alignListItem.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_divider.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_divider.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_divider.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_divider.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_lanes.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_lanes.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_lanes.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListChange/List_lanes.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_InSertChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_InSertChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_InSertChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_InSertChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Margin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Margin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Margin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Margin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Offset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Offset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Offset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Offset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_PadMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_PadMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_PadMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_PadMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Position.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Position.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Position.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Position.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_SizeChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_SizeChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_SizeChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_SizeChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Visibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Visibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Visibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_Space/ListItemChange/ListItem_Visibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_SpaceChange/List_SpaceChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_SpaceChange/List_SpaceChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_SpaceChange/List_SpaceChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_SpaceChange/List_SpaceChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_attribute/ListFrictionPage.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_attribute/ListFrictionPage.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_attribute/ListFrictionPage.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_attribute/ListFrictionPage.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex1.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex1.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex1.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex1.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex2.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex2.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex2.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex2.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex3.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex3.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex3.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex3.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex4.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex4.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex4.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex4.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex5.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex5.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex5.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex5.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex6.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex6.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex6.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/List/List_initialIndex/List_ListInitialIndex6.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..5c372e0c20209b661a274129b184c2ed9741a7d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +@Entry +@Component +struct Index { + + aboutToAppear(){ + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5841ae7bffea3a0b5e3c6d7d78aec80a9010f1e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..4bf893f776d7c265fb40e3ec5c91f3eb2e338dcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('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/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9529e19be5455dcc8c817ef5acb3a773dd543d06 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 + +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() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.acts.arkui.layout.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..974c5f492a51e9c8ac2ecdf3361908b1d38ff0e6 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 listItem_SizeChange from './List/List_Space/ListItemChange/ListItem_SizeChange.test.ets'; +import listItem_Margin from './List/List_Space/ListItemChange/ListItem_Margin.test.ets'; +import listItem_Padding from './List/List_Space/ListItemChange/ListItem_Padding.test.ets'; +import listItem_PadMar from './List/List_Space/ListItemChange/ListItem_PadMar.test.ets'; +import listItem_Visibility from './List/List_Space/ListItemChange/ListItem_Visibility.test.ets'; +import listItem_Position from './List/List_Space/ListItemChange/ListItem_Position.test.ets'; +import listItem_Offset from './List/List_Space/ListItemChange/ListItem_Offset.test.ets'; +import listItem_InSertChange from './List/List_Space/ListItemChange/ListItem_InSertChange.test.ets'; +import list_SpaceChangeTest from './List/List_SpaceChange/List_SpaceChange.test'; +import list_ListInitialIndex1Test from './List/List_initialIndex/List_ListInitialIndex1.test'; +import list_ListInitialIndex2Test from './List/List_initialIndex/List_ListInitialIndex2.test'; +import list_ListInitialIndex3Test from './List/List_initialIndex/List_ListInitialIndex3.test'; +import list_ListInitialIndex4Test from './List/List_initialIndex/List_ListInitialIndex4.test'; +import list_ListInitialIndex5Test from './List/List_initialIndex/List_ListInitialIndex5.test'; +import list_ListInitialIndex6Test from './List/List_initialIndex/List_ListInitialIndex6.test'; +import List_alignListItem from './List/List_Space/ListChange/List_alignListItem.test'; +import List_divider from './List/List_Space/ListChange/List_divider.test'; +import List_lanes from './List/List_Space/ListChange/List_lanes.test'; +import List_ListDirection from './List/List_Space/ListChange/List_ListDirection.test'; +import List_ListSize from './List/List_Space/ListChange/List_ListSize.test'; +import List_Margin from './List/List_Space/ListChange/List_Margin.test'; +import List_Padding from './List/List_Space/ListChange/List_Padding.test'; +import List_PadMar from './List/List_Space/ListChange/List_PadMar.test'; +import list_ListFrictionTest from './List/List_attribute/List_ListFriction.test'; + +export default function testsuite() { + + listItem_SizeChange() + listItem_Margin() + listItem_Padding() + listItem_PadMar() + listItem_Visibility() + listItem_Position() + listItem_Offset() + listItem_InSertChange() + list_ListInitialIndex1Test(); + list_ListInitialIndex2Test(); + list_ListInitialIndex3Test(); + list_ListInitialIndex4Test(); + list_ListInitialIndex5Test(); + list_ListInitialIndex6Test(); + list_SpaceChangeTest(); + List_alignListItem(); + List_divider(); + List_lanes(); + List_ListDirection(); + List_ListSize(); + List_Margin(); + List_Padding(); + List_PadMar(); + list_ListFrictionTest(); + +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_ListDirection.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_ListDirection.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_ListDirection.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_ListDirection.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_ListSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_ListSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_ListSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_ListSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_Margin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_Margin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_Margin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_Margin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_PadMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_PadMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_PadMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_PadMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_Padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_Padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_Padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_Padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_alignListItem.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_alignListItem.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_alignListItem.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_alignListItem.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_divider.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_divider.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_divider.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_divider.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_lanes.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_lanes.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_lanes.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListChange/List_lanes.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_InSertChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_InSertChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_InSertChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_InSertChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Margin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Margin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Margin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Margin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Offset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Offset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Offset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Offset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_PadMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_PadMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_PadMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_PadMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Position.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Position.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Position.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Position.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_SizeChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_SizeChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_SizeChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_SizeChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Visibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Visibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Visibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_Space/ListItemChange/ListItem_Visibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_SpaceChange/List_SpaceChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_SpaceChange/List_SpaceChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_SpaceChange/List_SpaceChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_SpaceChange/List_SpaceChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_attribute/List_ListFriction.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_attribute/List_ListFriction.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_attribute/List_ListFriction.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_attribute/List_ListFriction.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex1.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex1.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex1.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex1.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex2.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex2.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex2.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex2.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex3.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex3.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex3.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex3.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex4.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex4.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex4.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex4.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex5.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex5.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex5.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex5.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex6.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex6.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex6.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/ets/test/List/List_initialIndex/List_ListInitialIndex6.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..52d6a700be21c25233a6d60567e3b453b3ec981e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/module.json @@ -0,0 +1,59 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.acts.arkui.layout.test.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.INTERNET" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.CAMERA" + } + ] + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..c08965e27e91133fd0611cbfb303cb1e37c955f0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/resources/base/element/float.json @@ -0,0 +1,8 @@ +{ + "float": [ + { + "name": "float_1", + "value": "10vp" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2977b612ec4595b13eaaffe3e8fc578e83c42d48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "phone_entry_dsc", + "value": "i am an entry for phone" + }, + { + "name": "phone_entry_main", + "value": "the phone entry ability" + }, + { + "name": "entry_label", + "value": "ActsContextTest" + }, + { + "name": "form_description", + "value": "my form" + }, + { + "name": "serviceability_description", + "value": "my whether" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "app_name", + "value": "Demo" + } + ] +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..a1bc477d6146cc858a7cd93794762653b1a1ed40 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,30 @@ +{ + "src": [ + "MainAbility/pages/index/index", + "MainAbility/pages/List/List_attribute/ListFrictionPage", + "MainAbility/pages/List/List_initialIndex/List_ListInitialIndex1", + "MainAbility/pages/List/List_initialIndex/List_ListInitialIndex2", + "MainAbility/pages/List/List_initialIndex/List_ListInitialIndex3", + "MainAbility/pages/List/List_initialIndex/List_ListInitialIndex4", + "MainAbility/pages/List/List_initialIndex/List_ListInitialIndex5", + "MainAbility/pages/List/List_initialIndex/List_ListInitialIndex6", + "MainAbility/pages/List/List_Space/ListChange/List_alignListItem", + "MainAbility/pages/List/List_Space/ListChange/List_divider", + "MainAbility/pages/List/List_Space/ListChange/List_lanes", + "MainAbility/pages/List/List_Space/ListChange/List_ListDirection", + "MainAbility/pages/List/List_Space/ListChange/List_ListSize", + "MainAbility/pages/List/List_Space/ListChange/List_Margin", + "MainAbility/pages/List/List_Space/ListChange/List_Padding", + "MainAbility/pages/List/List_Space/ListChange/List_PadMar", + "MainAbility/pages/List/List_Space/ListItemChange/ListItem_InSertChange", + "MainAbility/pages/List/List_Space/ListItemChange/ListItem_Margin", + "MainAbility/pages/List/List_Space/ListItemChange/ListItem_Offset", + "MainAbility/pages/List/List_Space/ListItemChange/ListItem_Padding", + "MainAbility/pages/List/List_Space/ListItemChange/ListItem_PadMar", + "MainAbility/pages/List/List_Space/ListItemChange/ListItem_Position", + "MainAbility/pages/List/List_Space/ListItemChange/ListItem_SizeChange", + "MainAbility/pages/List/List_Space/ListItemChange/ListItem_Visibility", + "MainAbility/pages/List/List_SpaceChange/List_SpaceChange" + + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_list_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_list_test/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..19c8848dfb41d2ca5e060525eb8180d538bc635c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.acts.arkui.layout.test", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "description": "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ee69f9a861d9dc269ed6638735d52674583498e1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ohosProject" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..9fffed42c0107ed45a5ab247b7a2c348a8902f45 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutRelativeContainerTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_layout_relativeContainer_js_assets", + ":ace_ets_layout_relativeContainer_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutRelativeContainerTest" +} + +ohos_app_scope("ace_ets_layout_relativeContainer_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_layout_relativeContainer_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_ets_layout_relativeContainer_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_ets_layout_relativeContainer_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..a37642a1a6a28d84372c2cab72e61ff53b5fae26 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutRelativeContainerTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..b0e0206ea9fb5ce94ef140d69510b6280969dd8e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,9 @@ +import AbilityStage from "@ohos.app.ability.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + globalThis.stageOnCreateRun = 1; + globalThis.stageContext = this.context; + } +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..0594e6e62c917b6aa681057bf10f26aff9d2abe5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,40 @@ +import Ability from '@ohos.app.ability.UIAbility' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +export default class MainAbility extends Ability { + onCreate(want,launchParam){ + // Ability is creating, initialize resources for this ability + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) + let AtManager = abilityAccessCtrl.createAtManager() + AtManager.requestPermissionsFromUser(this.context,[ + "ohos.permission.CAPTURE_SCREEN"]).then(() => {}) + globalThis.windowStage = windowStage + globalThis.abilityContext = this.context + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) + } + + onWindowStageDestroy() { + //Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/common/Common.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc98d34214f4aea48824806a09c6385b9d82dde5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/common/Common.ets @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ + +export default class CommonFunc { + static rect_left; + static rect_top; + static rect_right; + static rect_bottom; + static rect_value; + + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + + static getComponentRect(key) { + let strJson = getInspectorByKey(key); + let obj = JSON.parse(strJson); + console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); + let rectInfo = JSON.parse('[' + obj.$rect + ']'); + this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0]; + this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1]; + this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0]; + this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1]; + this.rect_value = { + "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom + }; + console.info(JSON.stringify(this.rect_value)); + return this.rect_value; + } +} + diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/common/MessageManager.ets new file mode 100644 index 0000000000000000000000000000000000000000..97dd36af2da2f6a3ce332ee8212fd1e722fff166 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/common/MessageManager.ets @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ +export interface Callback { + (message:any):void +} + +export class MessageManager { + callback:Callback + callbacks:Map = new Map() + + constructor() { + + } + + registerCallback(callback:Callback , type?:string) { + if (type == undefined) { + console.error('registerCallback callback set') + this.callback = callback + return + } + this.callbacks.set(type,callback) + } + + notify(message:any, type?:string) { + if (type == undefined) { + this.callback(message) + return + } + + let tmpCallback:Callback = this.callbacks.get(type) + if (tmpCallback === undefined) { + console.error('callbacks has no callback for type ' + type) + return + } + tmpCallback(message) + } + + clear() { + this.callbacks.clear() + this.callback = null + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Absent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Absent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Absent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Absent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Circular_Dependency.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Circular_Dependency.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Circular_Dependency.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Circular_Dependency.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Null.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Null.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Null.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Null.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Undefined.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Undefined.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Undefined.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Undefined.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Interdependence.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Interdependence.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Interdependence.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Interdependence.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Margin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Margin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Margin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Margin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_NoId.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_NoId.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_NoId.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_NoId.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Offset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Offset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Offset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Offset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Position.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Position.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Position.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Position.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_ThreeDirection.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_ThreeDirection.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_ThreeDirection.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_ThreeDirection.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_TwoDirection.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_TwoDirection.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_TwoDirection.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_TwoDirection.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_Hidden.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_Hidden.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_Hidden.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_Hidden.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_None.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_None.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_None.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_None.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_Level/RelativeContainer_Level.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_Level/RelativeContainer_Level.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_Level/RelativeContainer_Level.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_Level/RelativeContainer_Level.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_Vertical/RelativeContainer_Vertical.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_Vertical/RelativeContainer_Vertical.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_Vertical/RelativeContainer_Vertical.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/RelativeContainer/RelativeContainer_Vertical/RelativeContainer_Vertical.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..5c372e0c20209b661a274129b184c2ed9741a7d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +@Entry +@Component +struct Index { + + aboutToAppear(){ + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5841ae7bffea3a0b5e3c6d7d78aec80a9010f1e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..4bf893f776d7c265fb40e3ec5c91f3eb2e338dcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('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/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9529e19be5455dcc8c817ef5acb3a773dd543d06 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 + +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() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.acts.arkui.layout.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..6ef4f4b10d52ddbddbdd375bf9c5ddde0586ac2b --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 RelativeContainer_Level from './RelativeContainer/RelativeContainer_Level/RelativeContainer_Level.test.ets'; + import RelativeContainer_Vertical from './RelativeContainer/RelativeContainer_Vertical/RelativeContainer_Vertical.test.ets'; + import RelativeContainer_AnchorPoint_Absent from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Absent.test.ets'; + import RelativeContainer_AnchorPoint_Circular_Dependency from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Circular_Dependency.test.ets'; + import RelativeContainer_AnchorPoint_Interdependence from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Interdependence.test.ets'; + import RelativeContainer_AnchorPoint_Margin from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Margin.test.ets'; + import RelativeContainer_AnchorPoint_Padding from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Padding.test.ets'; + import RelativeContainer_AnchorPoint_ThreeDirection from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_ThreeDirection.test.ets'; + import RelativeContainer_AnchorPoint_TwoDirection from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_TwoDirection.test.ets'; + import RelativeContainer_AnchorPoint_Visibility_Hidden from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_Hidden.test.ets'; + import RelativeContainer_AnchorPoint_Visibility_None from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_None.test.ets'; + import RelativeContainer_AnchorPoint_NoId from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_NoId.test.ets'; + import RelativeContainer_AnchorPoint_Id_Null from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Null.test.ets'; + import RelativeContainer_AnchorPoint_Id_Undefined from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Undefined.test.ets'; + import RelativeContainer_AnchorPoint_Offset from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Offset.test.ets'; + import RelativeContainer_AnchorPoint_Position from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Position.test.ets'; + +export default function testsuite() { + +RelativeContainer_Level() +RelativeContainer_Vertical() +RelativeContainer_AnchorPoint_Absent() +RelativeContainer_AnchorPoint_Circular_Dependency() +RelativeContainer_AnchorPoint_Interdependence() +RelativeContainer_AnchorPoint_Margin() +RelativeContainer_AnchorPoint_Padding() +RelativeContainer_AnchorPoint_ThreeDirection() +RelativeContainer_AnchorPoint_TwoDirection() +RelativeContainer_AnchorPoint_Visibility_Hidden() +RelativeContainer_AnchorPoint_Visibility_None() +RelativeContainer_AnchorPoint_NoId() +RelativeContainer_AnchorPoint_Id_Null() +RelativeContainer_AnchorPoint_Id_Undefined() +RelativeContainer_AnchorPoint_Offset() +RelativeContainer_AnchorPoint_Position() + +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Absent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Absent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Absent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Absent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Circular_Dependency.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Circular_Dependency.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Circular_Dependency.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Circular_Dependency.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Null.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Null.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Null.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Null.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Undefined.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Undefined.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Undefined.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Undefined.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Interdependence.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Interdependence.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Interdependence.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Interdependence.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Margin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Margin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Margin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Margin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_NoId.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_NoId.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_NoId.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_NoId.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Offset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Offset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Offset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Offset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Position.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Position.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Position.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Position.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_ThreeDirection.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_ThreeDirection.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_ThreeDirection.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_ThreeDirection.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_TwoDirection.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_TwoDirection.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_TwoDirection.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_TwoDirection.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_Hidden.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_Hidden.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_Hidden.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_Hidden.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_None.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_None.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_None.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_None.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_Level/RelativeContainer_Level.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_Level/RelativeContainer_Level.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_Level/RelativeContainer_Level.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_Level/RelativeContainer_Level.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_Vertical/RelativeContainer_Vertical.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_Vertical/RelativeContainer_Vertical.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_Vertical/RelativeContainer_Vertical.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/ets/test/RelativeContainer/RelativeContainer_Vertical/RelativeContainer_Vertical.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..52d6a700be21c25233a6d60567e3b453b3ec981e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/module.json @@ -0,0 +1,59 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.acts.arkui.layout.test.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.INTERNET" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.CAMERA" + } + ] + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..c08965e27e91133fd0611cbfb303cb1e37c955f0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/resources/base/element/float.json @@ -0,0 +1,8 @@ +{ + "float": [ + { + "name": "float_1", + "value": "10vp" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2977b612ec4595b13eaaffe3e8fc578e83c42d48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "phone_entry_dsc", + "value": "i am an entry for phone" + }, + { + "name": "phone_entry_main", + "value": "the phone entry ability" + }, + { + "name": "entry_label", + "value": "ActsContextTest" + }, + { + "name": "form_description", + "value": "my form" + }, + { + "name": "serviceability_description", + "value": "my whether" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "app_name", + "value": "Demo" + } + ] +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..6f10e4506525aa5449e88963e26f778c8774b04e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,21 @@ +{ + "src": [ + "MainAbility/pages/index/index", + "MainAbility/pages/RelativeContainer/RelativeContainer_Level/RelativeContainer_Level", + "MainAbility/pages/RelativeContainer/RelativeContainer_Vertical/RelativeContainer_Vertical", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Absent", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Circular_Dependency", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Interdependence", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Margin", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Padding", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_ThreeDirection", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_TwoDirection", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_Hidden", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_None", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_NoId", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Null", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Undefined", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Offset", + "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Position" + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_relativeContainer_test/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..19c8848dfb41d2ca5e060525eb8180d538bc635c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.acts.arkui.layout.test", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "description": "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ee69f9a861d9dc269ed6638735d52674583498e1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ohosProject" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..bf1132332fc46406241df2050a27b8b7971bbe94 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutRowTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_layout_row_js_assets", + ":ace_ets_layout_row_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutRowTest" +} + +ohos_app_scope("ace_ets_layout_row_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_layout_row_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_ets_layout_row_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_ets_layout_row_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..82f8859244f21ea819aea500136ede16f5df049f --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutRowTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..b0e0206ea9fb5ce94ef140d69510b6280969dd8e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,9 @@ +import AbilityStage from "@ohos.app.ability.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + globalThis.stageOnCreateRun = 1; + globalThis.stageContext = this.context; + } +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..0594e6e62c917b6aa681057bf10f26aff9d2abe5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,40 @@ +import Ability from '@ohos.app.ability.UIAbility' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +export default class MainAbility extends Ability { + onCreate(want,launchParam){ + // Ability is creating, initialize resources for this ability + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) + let AtManager = abilityAccessCtrl.createAtManager() + AtManager.requestPermissionsFromUser(this.context,[ + "ohos.permission.CAPTURE_SCREEN"]).then(() => {}) + globalThis.windowStage = windowStage + globalThis.abilityContext = this.context + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) + } + + onWindowStageDestroy() { + //Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/common/Common.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc98d34214f4aea48824806a09c6385b9d82dde5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/common/Common.ets @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ + +export default class CommonFunc { + static rect_left; + static rect_top; + static rect_right; + static rect_bottom; + static rect_value; + + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + + static getComponentRect(key) { + let strJson = getInspectorByKey(key); + let obj = JSON.parse(strJson); + console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); + let rectInfo = JSON.parse('[' + obj.$rect + ']'); + this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0]; + this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1]; + this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0]; + this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1]; + this.rect_value = { + "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom + }; + console.info(JSON.stringify(this.rect_value)); + return this.rect_value; + } +} + diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/common/MessageManager.ets new file mode 100644 index 0000000000000000000000000000000000000000..97dd36af2da2f6a3ce332ee8212fd1e722fff166 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/common/MessageManager.ets @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ +export interface Callback { + (message:any):void +} + +export class MessageManager { + callback:Callback + callbacks:Map = new Map() + + constructor() { + + } + + registerCallback(callback:Callback , type?:string) { + if (type == undefined) { + console.error('registerCallback callback set') + this.callback = callback + return + } + this.callbacks.set(type,callback) + } + + notify(message:any, type?:string) { + if (type == undefined) { + this.callback(message) + return + } + + let tmpCallback:Callback = this.callbacks.get(type) + if (tmpCallback === undefined) { + console.error('callbacks has no callback for type ' + type) + return + } + tmpCallback(message) + } + + clear() { + this.callbacks.clear() + this.callback = null + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/RowNesting/rowNesting_Space.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/RowNesting/rowNesting_Space.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/RowNesting/rowNesting_Space.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/RowNesting/rowNesting_Space.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/RowNesting/rowNesting_alignItems.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/RowNesting/rowNesting_alignItems.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/RowNesting/rowNesting_alignItems.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/RowNesting/rowNesting_alignItems.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/RowNesting/rowNesting_justifyContent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/RowNesting/rowNesting_justifyContent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/RowNesting/rowNesting_justifyContent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/RowNesting/rowNesting_justifyContent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/flexBasis/Row_flexBasis_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/flexBasis/Row_flexBasis_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/flexBasis/Row_flexBasis_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/flexBasis/Row_flexBasis_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/flexBasis/Row_flexBasis_Type.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/flexBasis/Row_flexBasis_Type.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/flexBasis/Row_flexBasis_Type.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/flexBasis/Row_flexBasis_Type.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/flexGrow/Row_flexGrow_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/flexGrow/Row_flexGrow_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/flexGrow/Row_flexGrow_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/flexGrow/Row_flexGrow_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/flexGrow/Row_flexGrow_Part.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/flexGrow/Row_flexGrow_Part.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/flexGrow/Row_flexGrow_Part.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/flexGrow/Row_flexGrow_Part.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/flexShrink/Row_flexShrink_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/flexShrink/Row_flexShrink_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/flexShrink/Row_flexShrink_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/flexShrink/Row_flexShrink_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/flexShrink/Row_flexShrink_Part.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/flexShrink/Row_flexShrink_Part.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/flexShrink/Row_flexShrink_Part.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/flexShrink/Row_flexShrink_Part.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_All.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_All.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_All.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_All.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_Part.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_Part.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_Part.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_Part.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_flexGrow.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_flexGrow.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_flexGrow.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_flexGrow.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_flexShrink.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_flexShrink.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_flexShrink.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/layoutWeight/Row_layoutWeight_flexShrink.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_FlexAlign.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_FlexAlign.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_FlexAlign.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_FlexAlign.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_Margin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_Margin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_Margin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_Margin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_MarginPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_MarginPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_MarginPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_MarginPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_Padding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_Padding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_Padding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_Padding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_Size.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_Size.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_Size.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_Size.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_VerticalAlign.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_VerticalAlign.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_VerticalAlign.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/parentComponentChanged/Row_VerticalAlign.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/spaceChanged/Row_Space.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/spaceChanged/Row_Space.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/spaceChanged/Row_Space.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/spaceChanged/Row_Space.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/spaceChanged/Row_Space_Default.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/spaceChanged/Row_Space_Default.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/spaceChanged/Row_Space_Default.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/spaceChanged/Row_Space_Default.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/spaceChanged/Row_Space_String.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/spaceChanged/Row_Space_String.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/spaceChanged/Row_Space_String.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/spaceChanged/Row_Space_String.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/RowMarPad_TextMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/RowMarPad_TextMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/RowMarPad_TextMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/RowMarPad_TextMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/RowMar_TextMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/RowMar_TextMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/RowMar_TextMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/RowMar_TextMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/RowPad_TextMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/RowPad_TextMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/RowPad_TextMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/RowPad_TextMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextDisplayPriority.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextDisplayPriority.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextDisplayPriority.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextDisplayPriority.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextFlexShrink.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextFlexShrink.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextFlexShrink.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextFlexShrink.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextLayoutWeight.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextLayoutWeight.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextLayoutWeight.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextLayoutWeight.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextOffset.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextOffset.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextOffset.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextOffset.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextPosition.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextPosition.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextPosition.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextPosition.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/Row/subComponentChanged/Row_TextVisibility.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..5c372e0c20209b661a274129b184c2ed9741a7d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +@Entry +@Component +struct Index { + + aboutToAppear(){ + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5841ae7bffea3a0b5e3c6d7d78aec80a9010f1e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..4bf893f776d7c265fb40e3ec5c91f3eb2e338dcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('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/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9529e19be5455dcc8c817ef5acb3a773dd543d06 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 + +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() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.acts.arkui.layout.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..7c6fa95bae998874df7b07394157ff81cd9f0e27 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 Row_Space from './Row/spaceChanged/Row_Space.test.ets'; + import Row_Space_String from './Row/spaceChanged/Row_Space_String.test.ets'; + import Row_Space_Default from './Row/spaceChanged/Row_Space_Default.test.ets'; + import Row_layoutWeight_All from './Row/layoutWeight/Row_layoutWeight_All.test.ets'; + import Row_layoutWeight_Default from './Row/layoutWeight/Row_layoutWeight_Default.test.ets'; + import Row_layoutWeight_flexGrow from './Row/layoutWeight/Row_layoutWeight_flexGrow.test.ets'; + import Row_layoutWeight_flexShrink from './Row/layoutWeight/Row_layoutWeight_flexShrink.test.ets'; + import Row_layoutWeight_Part from './Row/layoutWeight/Row_layoutWeight_Part.test.ets'; + import Row_flexGrow_Default from './Row/flexGrow/Row_flexGrow_Default.test.ets'; + import Row_flexGrow_Part from './Row/flexGrow/Row_flexGrow_Part.test.ets'; + import Row_flexShrink_Default from './Row/flexShrink/Row_flexShrink_Default.test.ets'; + import Row_flexShrink_Part from './Row/flexShrink/Row_flexShrink_Part.test.ets'; + import Row_flexBasis_Default from './Row/flexBasis/Row_flexBasis_Default.test.ets'; + import Row_flexBasis_Type from './Row/flexBasis/Row_flexBasis_Type.test.ets'; + import rowNesting_Space from './Row/RowNesting/rowNesting_Space.test.ets'; + import rowNesting_alignItems from './Row/RowNesting/rowNesting_alignItems.test.ets'; + import rowNesting_justifyContent from './Row/RowNesting/rowNesting_justifyContent.test.ets'; +import row_TextSizeTest from './Row/subComponentChanged/Row_TextSize.test'; +import rowPad_TextMarPadTest from './Row/subComponentChanged/RowPad_TextMarPad.test'; +import rowMar_TextMarPadTest from './Row/subComponentChanged/RowMar_TextMarPad.test'; +import rowMarPad_TextMarPadTest from './Row/subComponentChanged/RowMarPad_TextMarPad.test'; +import row_TextPositionTest from './Row/subComponentChanged/Row_TextPosition.test'; +import row_TextOffsetTest from './Row/subComponentChanged/Row_TextOffset.test'; +import row_TextDisplayPriorityTest from './Row/subComponentChanged/Row_TextDisplayPriority.test'; +import row_TextLayoutWeightTest from './Row/subComponentChanged/Row_TextLayoutWeight.test'; +import row_TextFlexShrinkTest from './Row/subComponentChanged/Row_TextFlexShrink.test'; +import row_TextVisibilityTest from './Row/subComponentChanged/Row_TextVisibility.test'; +import Row_FlexAlign from './Row/parentComponentChanged/Row_FlexAlign.test'; +import Row_Margin from './Row/parentComponentChanged/Row_Margin.test'; +import Row_MarginPadding from './Row/parentComponentChanged/Row_MarginPadding.test'; +import Row_Padding from './Row/parentComponentChanged/Row_Padding.test'; +import Row_Size from './Row/parentComponentChanged/Row_Size.test'; +import Row_VerticalAlign from './Row/parentComponentChanged/Row_VerticalAlign.test'; + +export default function testsuite() { + + Row_Space() + Row_Space_String() + Row_Space_Default() + Row_layoutWeight_All() + Row_layoutWeight_Default() + Row_layoutWeight_flexGrow() + Row_layoutWeight_flexShrink() + Row_layoutWeight_Part() + Row_flexGrow_Default() + Row_flexGrow_Part() + Row_flexShrink_Default() + Row_flexShrink_Part() + Row_flexBasis_Default() + Row_flexBasis_Type() + rowNesting_Space() + rowNesting_alignItems() + rowNesting_justifyContent() + row_TextSizeTest(); + rowPad_TextMarPadTest(); + rowMar_TextMarPadTest(); + rowMarPad_TextMarPadTest(); + row_TextPositionTest(); + row_TextOffsetTest(); + row_TextDisplayPriorityTest(); + row_TextLayoutWeightTest(); + row_TextFlexShrinkTest(); + row_TextVisibilityTest(); + Row_FlexAlign(); + Row_Margin(); + Row_MarginPadding(); + Row_Padding(); + Row_Size(); + Row_VerticalAlign(); + +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/RowNesting/rowNesting_Space.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/RowNesting/rowNesting_Space.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/RowNesting/rowNesting_Space.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/RowNesting/rowNesting_Space.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/RowNesting/rowNesting_alignItems.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/RowNesting/rowNesting_alignItems.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/RowNesting/rowNesting_alignItems.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/RowNesting/rowNesting_alignItems.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/RowNesting/rowNesting_justifyContent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/RowNesting/rowNesting_justifyContent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/RowNesting/rowNesting_justifyContent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/RowNesting/rowNesting_justifyContent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Type.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Type.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Type.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Type.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexGrow/Row_flexGrow_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/flexGrow/Row_flexGrow_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexGrow/Row_flexGrow_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/flexGrow/Row_flexGrow_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexGrow/Row_flexGrow_Part.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/flexGrow/Row_flexGrow_Part.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexGrow/Row_flexGrow_Part.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/flexGrow/Row_flexGrow_Part.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexShrink/Row_flexShrink_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/flexShrink/Row_flexShrink_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexShrink/Row_flexShrink_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/flexShrink/Row_flexShrink_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexShrink/Row_flexShrink_Part.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/flexShrink/Row_flexShrink_Part.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexShrink/Row_flexShrink_Part.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/flexShrink/Row_flexShrink_Part.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_All.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_All.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_All.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_All.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_Part.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_Part.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_Part.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_Part.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_flexGrow.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_flexGrow.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_flexGrow.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_flexGrow.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_flexShrink.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_flexShrink.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_flexShrink.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/layoutWeight/Row_layoutWeight_flexShrink.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_FlexAlign.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_FlexAlign.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_FlexAlign.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_FlexAlign.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_Margin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_Margin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_Margin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_Margin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_MarginPadding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_MarginPadding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_MarginPadding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_MarginPadding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_Padding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_Padding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_Padding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_Padding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_Size.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_Size.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_Size.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_Size.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_VerticalAlign.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_VerticalAlign.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_VerticalAlign.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/parentComponentChanged/Row_VerticalAlign.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_Default.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_Default.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_Default.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_Default.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_String.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_String.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_String.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_String.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/RowMarPad_TextMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/RowMarPad_TextMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/RowMarPad_TextMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/RowMarPad_TextMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/RowMar_TextMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/RowMar_TextMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/RowMar_TextMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/RowMar_TextMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/RowPad_TextMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/RowPad_TextMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/RowPad_TextMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/RowPad_TextMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextDisplayPriority.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextDisplayPriority.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextDisplayPriority.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextDisplayPriority.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextFlexShrink.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextFlexShrink.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextFlexShrink.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextFlexShrink.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextLayoutWeight.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextLayoutWeight.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextLayoutWeight.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextLayoutWeight.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextOffset.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextOffset.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextOffset.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextOffset.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextPosition.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextPosition.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextPosition.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextPosition.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextVisibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextVisibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextVisibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextVisibility.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..52d6a700be21c25233a6d60567e3b453b3ec981e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/module.json @@ -0,0 +1,59 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.acts.arkui.layout.test.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.INTERNET" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.CAMERA" + } + ] + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..c08965e27e91133fd0611cbfb303cb1e37c955f0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/resources/base/element/float.json @@ -0,0 +1,8 @@ +{ + "float": [ + { + "name": "float_1", + "value": "10vp" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2977b612ec4595b13eaaffe3e8fc578e83c42d48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "phone_entry_dsc", + "value": "i am an entry for phone" + }, + { + "name": "phone_entry_main", + "value": "the phone entry ability" + }, + { + "name": "entry_label", + "value": "ActsContextTest" + }, + { + "name": "form_description", + "value": "my form" + }, + { + "name": "serviceability_description", + "value": "my whether" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "app_name", + "value": "Demo" + } + ] +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..a410ce079b4636a6e1e5fb89c0d965073570074d --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,38 @@ +{ + "src": [ + "MainAbility/pages/index/index", + "MainAbility/pages/Row/parentComponentChanged/Row_FlexAlign", + "MainAbility/pages/Row/parentComponentChanged/Row_Margin", + "MainAbility/pages/Row/parentComponentChanged/Row_MarginPadding", + "MainAbility/pages/Row/parentComponentChanged/Row_Padding", + "MainAbility/pages/Row/parentComponentChanged/Row_Size", + "MainAbility/pages/Row/parentComponentChanged/Row_VerticalAlign", + "MainAbility/pages/Row/subComponentChanged/RowMarPad_TextMarPad", + "MainAbility/pages/Row/subComponentChanged/RowMar_TextMarPad", + "MainAbility/pages/Row/subComponentChanged/RowPad_TextMarPad", + "MainAbility/pages/Row/subComponentChanged/Row_TextDisplayPriority", + "MainAbility/pages/Row/subComponentChanged/Row_TextFlexShrink", + "MainAbility/pages/Row/subComponentChanged/Row_TextLayoutWeight", + "MainAbility/pages/Row/subComponentChanged/Row_TextOffset", + "MainAbility/pages/Row/subComponentChanged/Row_TextPosition", + "MainAbility/pages/Row/subComponentChanged/Row_TextSize", + "MainAbility/pages/Row/subComponentChanged/Row_TextVisibility", + "MainAbility/pages/Row/spaceChanged/Row_Space", + "MainAbility/pages/Row/spaceChanged/Row_Space_String", + "MainAbility/pages/Row/spaceChanged/Row_Space_Default", + "MainAbility/pages/Row/layoutWeight/Row_layoutWeight_All", + "MainAbility/pages/Row/layoutWeight/Row_layoutWeight_Default", + "MainAbility/pages/Row/layoutWeight/Row_layoutWeight_flexGrow", + "MainAbility/pages/Row/layoutWeight/Row_layoutWeight_flexShrink", + "MainAbility/pages/Row/layoutWeight/Row_layoutWeight_Part", + "MainAbility/pages/Row/flexGrow/Row_flexGrow_Default", + "MainAbility/pages/Row/flexGrow/Row_flexGrow_Part", + "MainAbility/pages/Row/flexShrink/Row_flexShrink_Default", + "MainAbility/pages/Row/flexShrink/Row_flexShrink_Part", + "MainAbility/pages/Row/flexBasis/Row_flexBasis_Default", + "MainAbility/pages/Row/flexBasis/Row_flexBasis_Type", + "MainAbility/pages/Row/RowNesting/rowNesting_Space", + "MainAbility/pages/Row/RowNesting/rowNesting_alignItems", + "MainAbility/pages/Row/RowNesting/rowNesting_justifyContent" + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_row_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_row_test/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..19c8848dfb41d2ca5e060525eb8180d538bc635c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.acts.arkui.layout.test", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "description": "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ee69f9a861d9dc269ed6638735d52674583498e1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ohosProject" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..848a3c1bf3111de3124958082cfde2f762b056c1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutScrollTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_layout_scroll_js_assets", + ":ace_ets_layout_scroll_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutScrollTest" +} + +ohos_app_scope("ace_ets_layout_scroll_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_layout_scroll_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_ets_layout_scroll_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_ets_layout_scroll_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..93ded3dc9e6a61da5711bba1b5ab42562ce54c52 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutScrollTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..b0e0206ea9fb5ce94ef140d69510b6280969dd8e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,9 @@ +import AbilityStage from "@ohos.app.ability.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + globalThis.stageOnCreateRun = 1; + globalThis.stageContext = this.context; + } +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..0594e6e62c917b6aa681057bf10f26aff9d2abe5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,40 @@ +import Ability from '@ohos.app.ability.UIAbility' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +export default class MainAbility extends Ability { + onCreate(want,launchParam){ + // Ability is creating, initialize resources for this ability + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) + let AtManager = abilityAccessCtrl.createAtManager() + AtManager.requestPermissionsFromUser(this.context,[ + "ohos.permission.CAPTURE_SCREEN"]).then(() => {}) + globalThis.windowStage = windowStage + globalThis.abilityContext = this.context + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) + } + + onWindowStageDestroy() { + //Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/common/Common.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc98d34214f4aea48824806a09c6385b9d82dde5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/common/Common.ets @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ + +export default class CommonFunc { + static rect_left; + static rect_top; + static rect_right; + static rect_bottom; + static rect_value; + + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + + static getComponentRect(key) { + let strJson = getInspectorByKey(key); + let obj = JSON.parse(strJson); + console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); + let rectInfo = JSON.parse('[' + obj.$rect + ']'); + this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0]; + this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1]; + this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0]; + this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1]; + this.rect_value = { + "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom + }; + console.info(JSON.stringify(this.rect_value)); + return this.rect_value; + } +} + diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/common/MessageManager.ets new file mode 100644 index 0000000000000000000000000000000000000000..97dd36af2da2f6a3ce332ee8212fd1e722fff166 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/common/MessageManager.ets @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ +export interface Callback { + (message:any):void +} + +export class MessageManager { + callback:Callback + callbacks:Map = new Map() + + constructor() { + + } + + registerCallback(callback:Callback , type?:string) { + if (type == undefined) { + console.error('registerCallback callback set') + this.callback = callback + return + } + this.callbacks.set(type,callback) + } + + notify(message:any, type?:string) { + if (type == undefined) { + this.callback(message) + return + } + + let tmpCallback:Callback = this.callbacks.get(type) + if (tmpCallback === undefined) { + console.error('callbacks has no callback for type ' + type) + return + } + tmpCallback(message) + } + + clear() { + this.callbacks.clear() + this.callback = null + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Scroll/Scroll_attribute/ScrollFrictionPage.ets b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/pages/Scroll/Scroll_attribute/ScrollFrictionPage.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Scroll/Scroll_attribute/ScrollFrictionPage.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/pages/Scroll/Scroll_attribute/ScrollFrictionPage.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..5c372e0c20209b661a274129b184c2ed9741a7d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +@Entry +@Component +struct Index { + + aboutToAppear(){ + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5841ae7bffea3a0b5e3c6d7d78aec80a9010f1e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..4bf893f776d7c265fb40e3ec5c91f3eb2e338dcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('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/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9529e19be5455dcc8c817ef5acb3a773dd543d06 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 + +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() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.acts.arkui.layout.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..39ad8b34f5b1e827ee52af0932156dc30355517e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 scroll_ScrollFrictionTest from './Scroll/Scroll_attribute/Scroll_ScrollFriction.test'; + + +export default function testsuite() { + scroll_ScrollFrictionTest(); + +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Scroll/Scroll_attribute/Scroll_ScrollFriction.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/test/Scroll/Scroll_attribute/Scroll_ScrollFriction.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Scroll/Scroll_attribute/Scroll_ScrollFriction.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/ets/test/Scroll/Scroll_attribute/Scroll_ScrollFriction.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..52d6a700be21c25233a6d60567e3b453b3ec981e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/module.json @@ -0,0 +1,59 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.acts.arkui.layout.test.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.INTERNET" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.CAMERA" + } + ] + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..c08965e27e91133fd0611cbfb303cb1e37c955f0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/resources/base/element/float.json @@ -0,0 +1,8 @@ +{ + "float": [ + { + "name": "float_1", + "value": "10vp" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2977b612ec4595b13eaaffe3e8fc578e83c42d48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "phone_entry_dsc", + "value": "i am an entry for phone" + }, + { + "name": "phone_entry_main", + "value": "the phone entry ability" + }, + { + "name": "entry_label", + "value": "ActsContextTest" + }, + { + "name": "form_description", + "value": "my form" + }, + { + "name": "serviceability_description", + "value": "my whether" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "app_name", + "value": "Demo" + } + ] +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..07d1df22ebac2363491e8ae9f47e302e79a0f3a3 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,7 @@ +{ + "src": [ + "MainAbility/pages/index/index", + "MainAbility/pages/Scroll/Scroll_attribute/ScrollFrictionPage" + + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_scroll_test/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..19c8848dfb41d2ca5e060525eb8180d538bc635c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.acts.arkui.layout.test", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "description": "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ee69f9a861d9dc269ed6638735d52674583498e1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ohosProject" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..42f0f2c03670a92795910bbcbb6f234f157f3709 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutStackTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_layout_stack_flex_js_assets", + ":ace_layout_stack_flex_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutStackTest" +} + +ohos_app_scope("ace_layout_stack_flex_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_layout_stack_flex_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_layout_stack_flex_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_layout_stack_flex_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..6c135927f0f93654f0fb9ae3f98bcd9c93de30c2 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutStackTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..b0e0206ea9fb5ce94ef140d69510b6280969dd8e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,9 @@ +import AbilityStage from "@ohos.app.ability.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + globalThis.stageOnCreateRun = 1; + globalThis.stageContext = this.context; + } +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..0594e6e62c917b6aa681057bf10f26aff9d2abe5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,40 @@ +import Ability from '@ohos.app.ability.UIAbility' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +export default class MainAbility extends Ability { + onCreate(want,launchParam){ + // Ability is creating, initialize resources for this ability + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) + let AtManager = abilityAccessCtrl.createAtManager() + AtManager.requestPermissionsFromUser(this.context,[ + "ohos.permission.CAPTURE_SCREEN"]).then(() => {}) + globalThis.windowStage = windowStage + globalThis.abilityContext = this.context + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) + } + + onWindowStageDestroy() { + //Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/common/Common.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc98d34214f4aea48824806a09c6385b9d82dde5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/common/Common.ets @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ + +export default class CommonFunc { + static rect_left; + static rect_top; + static rect_right; + static rect_bottom; + static rect_value; + + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + + static getComponentRect(key) { + let strJson = getInspectorByKey(key); + let obj = JSON.parse(strJson); + console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); + let rectInfo = JSON.parse('[' + obj.$rect + ']'); + this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0]; + this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1]; + this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0]; + this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1]; + this.rect_value = { + "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom + }; + console.info(JSON.stringify(this.rect_value)); + return this.rect_value; + } +} + diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/common/MessageManager.ets new file mode 100644 index 0000000000000000000000000000000000000000..97dd36af2da2f6a3ce332ee8212fd1e722fff166 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/common/MessageManager.ets @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ +export interface Callback { + (message:any):void +} + +export class MessageManager { + callback:Callback + callbacks:Map = new Map() + + constructor() { + + } + + registerCallback(callback:Callback , type?:string) { + if (type == undefined) { + console.error('registerCallback callback set') + this.callback = callback + return + } + this.callbacks.set(type,callback) + } + + notify(message:any, type?:string) { + if (type == undefined) { + this.callback(message) + return + } + + let tmpCallback:Callback = this.callbacks.get(type) + if (tmpCallback === undefined) { + console.error('callbacks has no callback for type ' + type) + return + } + tmpCallback(message) + } + + clear() { + this.callbacks.clear() + this.callback = null + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/StackItem_change/stack_offset_change.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/StackItem_change/stack_offset_change.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/StackItem_change/stack_offset_change.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/StackItem_change/stack_offset_change.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/StackItem_change/stack_position_change.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/StackItem_change/stack_position_change.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/StackItem_change/stack_position_change.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/StackItem_change/stack_position_change.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/StackItem_change/stack_zIndex.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/StackItem_change/stack_zIndex.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/StackItem_change/stack_zIndex.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/StackItem_change/stack_zIndex.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_alignContent/stack_alignContent.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_alignContent/stack_alignContent.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_alignContent/stack_alignContent.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_alignContent/stack_alignContent.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackAlignChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackAlignChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackAlignChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackAlignChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackMarginChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackMarginChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackMarginChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackMarginChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackNoneSettingWidthHeight.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackNoneSettingWidthHeight.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackNoneSettingWidthHeight.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackNoneSettingWidthHeight.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackPaddingChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackPaddingChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackPaddingChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackPaddingChange.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackSizeChange.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackSizeChange.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackSizeChange.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/Stack/Stack_change/stackSizeChange.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..5c372e0c20209b661a274129b184c2ed9741a7d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +@Entry +@Component +struct Index { + + aboutToAppear(){ + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5841ae7bffea3a0b5e3c6d7d78aec80a9010f1e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..4bf893f776d7c265fb40e3ec5c91f3eb2e338dcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('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/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9529e19be5455dcc8c817ef5acb3a773dd543d06 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 + +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() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.acts.arkui.layout.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..4a65b1f1b537e5ae825c4e42392f1e8bb13a65c5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 stackAlignChange from './Stack/Stack_change/stackAlignChange.test.ets'; +import stackSizeChange from './Stack/Stack_change/stackSizeChange.test.ets'; +import stackNoneSettingWidthHeight from './Stack/Stack_change/stackNoneSettingWidthHeight.test.ets'; +import stackPaddingChange from './Stack/Stack_change/stackPaddingChange.test.ets'; +import stackMarginChange from './Stack/Stack_change/stackMarginChange.test.ets'; +import Stack_AlignContent from './Stack/Stack_alignContent/stack_alignContent.test'; +import Stack_Offset_Change from './Stack/StackItem_change/stack_offset_change.test'; +import Stack_Position_Change from './Stack/StackItem_change/stack_position_change.test'; +import Stack_ZIndex from './Stack/StackItem_change/stack_zIndex.test'; + +export default function testsuite() { + +stackAlignChange() +stackSizeChange() +stackNoneSettingWidthHeight() +stackPaddingChange() +stackMarginChange() + Stack_AlignContent(); + Stack_Offset_Change(); + Stack_Position_Change(); + Stack_ZIndex(); + +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/StackItem_change/stack_offset_change.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/StackItem_change/stack_offset_change.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/StackItem_change/stack_offset_change.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/StackItem_change/stack_offset_change.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/StackItem_change/stack_position_change.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/StackItem_change/stack_position_change.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/StackItem_change/stack_position_change.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/StackItem_change/stack_position_change.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/StackItem_change/stack_zIndex.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/StackItem_change/stack_zIndex.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/StackItem_change/stack_zIndex.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/StackItem_change/stack_zIndex.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/Stack_alignContent/stack_alignContent.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/Stack_alignContent/stack_alignContent.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/Stack_alignContent/stack_alignContent.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/Stack_alignContent/stack_alignContent.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/Stack_change/stackAlignChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/Stack_change/stackAlignChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/Stack_change/stackAlignChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/Stack_change/stackAlignChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/Stack_change/stackMarginChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/Stack_change/stackMarginChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/Stack_change/stackMarginChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/Stack_change/stackMarginChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/Stack_change/stackNoneSettingWidthHeight.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/Stack_change/stackNoneSettingWidthHeight.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/Stack_change/stackNoneSettingWidthHeight.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/Stack_change/stackNoneSettingWidthHeight.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/Stack_change/stackPaddingChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/Stack_change/stackPaddingChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/Stack_change/stackPaddingChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/Stack_change/stackPaddingChange.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/Stack_change/stackSizeChange.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/Stack_change/stackSizeChange.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/Stack_change/stackSizeChange.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/ets/test/Stack/Stack_change/stackSizeChange.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..52d6a700be21c25233a6d60567e3b453b3ec981e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/module.json @@ -0,0 +1,59 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.acts.arkui.layout.test.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.INTERNET" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.CAMERA" + } + ] + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..c08965e27e91133fd0611cbfb303cb1e37c955f0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/resources/base/element/float.json @@ -0,0 +1,8 @@ +{ + "float": [ + { + "name": "float_1", + "value": "10vp" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2977b612ec4595b13eaaffe3e8fc578e83c42d48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "phone_entry_dsc", + "value": "i am an entry for phone" + }, + { + "name": "phone_entry_main", + "value": "the phone entry ability" + }, + { + "name": "entry_label", + "value": "ActsContextTest" + }, + { + "name": "form_description", + "value": "my form" + }, + { + "name": "serviceability_description", + "value": "my whether" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "app_name", + "value": "Demo" + } + ] +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..fe8953751a042b3116c2384cd7f016edfa75f50d --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,15 @@ +{ + "src": [ + "MainAbility/pages/index/index", + "MainAbility/pages/Stack/StackItem_change/stack_offset_change", + "MainAbility/pages/Stack/StackItem_change/stack_position_change", + "MainAbility/pages/Stack/StackItem_change/stack_zIndex", + "MainAbility/pages/Stack/Stack_alignContent/stack_alignContent", + "MainAbility/pages/Stack/Stack_change/stackAlignChange", + "MainAbility/pages/Stack/Stack_change/stackMarginChange", + "MainAbility/pages/Stack/Stack_change/stackNoneSettingWidthHeight", + "MainAbility/pages/Stack/Stack_change/stackPaddingChange", + "MainAbility/pages/Stack/Stack_change/stackSizeChange" + + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_stack_test/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..19c8848dfb41d2ca5e060525eb8180d538bc635c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.acts.arkui.layout.test", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "description": "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ee69f9a861d9dc269ed6638735d52674583498e1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ohosProject" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..9b6b39201a2fd02e562b5fb2835cfb7e0a88dbc1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutSwiperTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_layout_swiper_js_assets", + ":ace_ets_layout_swiper_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutSwiperTest" +} + +ohos_app_scope("ace_ets_layout_swiper_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_layout_swiper_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_ets_layout_swiper_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_ets_layout_swiper_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..b8ebe2e48744d3d6bb556513d040799c591dd9f3 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutSwiperTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..b0e0206ea9fb5ce94ef140d69510b6280969dd8e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,9 @@ +import AbilityStage from "@ohos.app.ability.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + globalThis.stageOnCreateRun = 1; + globalThis.stageContext = this.context; + } +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..0594e6e62c917b6aa681057bf10f26aff9d2abe5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,40 @@ +import Ability from '@ohos.app.ability.UIAbility' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +export default class MainAbility extends Ability { + onCreate(want,launchParam){ + // Ability is creating, initialize resources for this ability + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) + let AtManager = abilityAccessCtrl.createAtManager() + AtManager.requestPermissionsFromUser(this.context,[ + "ohos.permission.CAPTURE_SCREEN"]).then(() => {}) + globalThis.windowStage = windowStage + globalThis.abilityContext = this.context + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) + } + + onWindowStageDestroy() { + //Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/common/Common.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc98d34214f4aea48824806a09c6385b9d82dde5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/common/Common.ets @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ + +export default class CommonFunc { + static rect_left; + static rect_top; + static rect_right; + static rect_bottom; + static rect_value; + + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + + static getComponentRect(key) { + let strJson = getInspectorByKey(key); + let obj = JSON.parse(strJson); + console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); + let rectInfo = JSON.parse('[' + obj.$rect + ']'); + this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0]; + this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1]; + this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0]; + this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1]; + this.rect_value = { + "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom + }; + console.info(JSON.stringify(this.rect_value)); + return this.rect_value; + } +} + diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/common/MessageManager.ets new file mode 100644 index 0000000000000000000000000000000000000000..97dd36af2da2f6a3ce332ee8212fd1e722fff166 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/common/MessageManager.ets @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ +export interface Callback { + (message:any):void +} + +export class MessageManager { + callback:Callback + callbacks:Map = new Map() + + constructor() { + + } + + registerCallback(callback:Callback , type?:string) { + if (type == undefined) { + console.error('registerCallback callback set') + this.callback = callback + return + } + this.callbacks.set(type,callback) + } + + notify(message:any, type?:string) { + if (type == undefined) { + this.callback(message) + return + } + + let tmpCallback:Callback = this.callbacks.get(type) + if (tmpCallback === undefined) { + console.error('callbacks has no callback for type ' + type) + return + } + tmpCallback(message) + } + + clear() { + this.callbacks.clear() + this.callback = null + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize2.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize2.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize2.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize2.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemVisibility.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemVisibility.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemVisibility.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemVisibility.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_1.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_1.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_1.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_1.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_2.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_2.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_2.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_2.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_3.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_3.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_3.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_3.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_4.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_4.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_4.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_4.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeTrue.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeTrue.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeTrue.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeTrue.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperIndex.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperIndex.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperIndex.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperIndex.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperItemSpace.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperItemSpace.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperItemSpace.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperItemSpace.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopFalse.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopFalse.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopFalse.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopFalse.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopTrue.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopTrue.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopTrue.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopTrue.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperMarPad.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperMarPad.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperMarPad.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperMarPad.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperMargin.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperMargin.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperMargin.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperMargin.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperPadding.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperPadding.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperPadding.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperPadding.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperVertical.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperVertical.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperVertical.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/Swiper/Swiper_ParmsChange/swiperVertical.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..5c372e0c20209b661a274129b184c2ed9741a7d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +@Entry +@Component +struct Index { + + aboutToAppear(){ + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5841ae7bffea3a0b5e3c6d7d78aec80a9010f1e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..4bf893f776d7c265fb40e3ec5c91f3eb2e338dcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('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/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9529e19be5455dcc8c817ef5acb3a773dd543d06 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 + +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() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.acts.arkui.layout.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..15b7c0ec8003a6d3e9ea1c97b2a26e3ec373a5dc --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 swiperIndex from './Swiper/Swiper_ParmsChange/swiperIndex.test.ets'; +import swiperVertical from './Swiper/Swiper_ParmsChange/swiperVertical.test.ets'; +import swiperLoopTrue from './Swiper/Swiper_ParmsChange/swiperLoopTrue.test.ets'; +import swiperLoopFalse from './Swiper/Swiper_ParmsChange/swiperLoopFalse.test.ets'; + +import swiperItemSpace from './Swiper/Swiper_ParmsChange/swiperItemSpace.test.ets'; +import swiperPadding from './Swiper/Swiper_ParmsChange/swiperPadding.test.ets'; +import swiperMargin from './Swiper/Swiper_ParmsChange/swiperMargin.test.ets'; +import swiperMarPad from './Swiper/Swiper_ParmsChange/swiperMarPad.test.ets'; +import swiperDisableSwipeTrue from './Swiper/Swiper_ParmsChange/swiperDisableSwipeTrue.test.ets'; +import swiperDisableSwipeFalse from './Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.test.ets'; +import swiperItemSize from './Swiper/Swiper_ItemChange/swiperItemSize.test.ets'; +import swiperItemSize2 from './Swiper/Swiper_ItemChange/swiperItemSize2.test.ets'; +import swiperItemPadding from './Swiper/Swiper_ItemChange/swiperItemPadding.test.ets'; +import swiperItemMargin from './Swiper/Swiper_ItemChange/swiperItemMargin.test.ets'; +import swiperItemPadMar from './Swiper/Swiper_ItemChange/swiperItemPadMar.test.ets'; +import swiperItemVisibility from './Swiper/Swiper_ItemChange/swiperItemVisibility.test.ets'; + +export default function testsuite() { + +swiperIndex() +swiperVertical() +swiperLoopTrue() +swiperLoopFalse() +swiperItemSpace() +swiperPadding() +swiperMargin() +swiperMarPad() +swiperDisableSwipeTrue() +swiperDisableSwipeFalse() +swiperItemSize() +swiperItemSize2() +swiperItemPadding() +swiperItemMargin() +swiperItemPadMar() +swiperItemVisibility() + +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemPadMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemPadMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemPadMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemPadMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemPadding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemPadding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemPadding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemPadding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemSize2.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemSize2.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemSize2.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemSize2.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemVisibility.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemVisibility.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemVisibility.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemVisibility.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_1.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_1.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_1.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_1.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_2.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_2.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_2.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_2.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_3.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_3.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_3.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_3.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_4.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_4.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_4.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperAutoPlay_4.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperDisableSwipeTrue.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperDisableSwipeTrue.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperDisableSwipeTrue.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperDisableSwipeTrue.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperIndex.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperIndex.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperIndex.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperIndex.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperItemSpace.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperItemSpace.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperItemSpace.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperItemSpace.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperLoopFalse.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperLoopFalse.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperLoopFalse.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperLoopFalse.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperLoopTrue.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperLoopTrue.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperLoopTrue.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperLoopTrue.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMarPad.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMarPad.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMarPad.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMarPad.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMargin.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMargin.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMargin.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMargin.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperPadding.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperPadding.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperPadding.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperPadding.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperVertical.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperVertical.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperVertical.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperVertical.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..52d6a700be21c25233a6d60567e3b453b3ec981e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/module.json @@ -0,0 +1,59 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.acts.arkui.layout.test.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.INTERNET" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.CAMERA" + } + ] + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..c08965e27e91133fd0611cbfb303cb1e37c955f0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/resources/base/element/float.json @@ -0,0 +1,8 @@ +{ + "float": [ + { + "name": "float_1", + "value": "10vp" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2977b612ec4595b13eaaffe3e8fc578e83c42d48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "phone_entry_dsc", + "value": "i am an entry for phone" + }, + { + "name": "phone_entry_main", + "value": "the phone entry ability" + }, + { + "name": "entry_label", + "value": "ActsContextTest" + }, + { + "name": "form_description", + "value": "my form" + }, + { + "name": "serviceability_description", + "value": "my whether" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "app_name", + "value": "Demo" + } + ] +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..7bc5fd86aded4f53363f33d5fc0ec28e26e03372 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,25 @@ +{ + "src": [ + "MainAbility/pages/index/index", + "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemMargin", + "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadding", + "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadMar", + "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize", + "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize2", + "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemVisibility", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_1", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_2", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_3", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_4", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeTrue", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperIndex", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperItemSpace", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopFalse", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopTrue", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperMargin", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperMarPad", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperPadding", + "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperVertical" + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_swiper_test/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/.idea/.gitignore b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..eaf91e2ac647df635a09f01b8a2a254252aae8d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/.idea/ace_ets_layout_tabs_test.iml b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/.idea/ace_ets_layout_tabs_test.iml new file mode 100644 index 0000000000000000000000000000000000000000..18ec59dd70c312989ec67b525207ca8514461e22 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/.idea/ace_ets_layout_tabs_test.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/.idea/misc.xml b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..9715c221cd4910f4d04f53a751b4465092f72024 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/.idea/modules.xml b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/.idea/modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..85b2f048480531e53cd0390d636075f26a474fea --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..19c8848dfb41d2ca5e060525eb8180d538bc635c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.acts.arkui.layout.test", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "description": "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ee69f9a861d9dc269ed6638735d52674583498e1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ohosProject" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..1f6d79a7dfd61a4dfe7ab46cabd56eaa7169d550 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutTabsTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_component_tabs_js_assets", + ":ace_ets_component_tabs_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutTabsTest" +} + +ohos_app_scope("ace_ets_component_tabs_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_component_tabs_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_ets_component_tabs_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_ets_component_tabs_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..bb2750883ef166b56123b9d252308267f2923461 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutTabsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..b0e0206ea9fb5ce94ef140d69510b6280969dd8e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,9 @@ +import AbilityStage from "@ohos.app.ability.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + globalThis.stageOnCreateRun = 1; + globalThis.stageContext = this.context; + } +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..0594e6e62c917b6aa681057bf10f26aff9d2abe5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,40 @@ +import Ability from '@ohos.app.ability.UIAbility' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +export default class MainAbility extends Ability { + onCreate(want,launchParam){ + // Ability is creating, initialize resources for this ability + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) + let AtManager = abilityAccessCtrl.createAtManager() + AtManager.requestPermissionsFromUser(this.context,[ + "ohos.permission.CAPTURE_SCREEN"]).then(() => {}) + globalThis.windowStage = windowStage + globalThis.abilityContext = this.context + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) + } + + onWindowStageDestroy() { + //Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/common/Common.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc98d34214f4aea48824806a09c6385b9d82dde5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/common/Common.ets @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ + +export default class CommonFunc { + static rect_left; + static rect_top; + static rect_right; + static rect_bottom; + static rect_value; + + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + + static getComponentRect(key) { + let strJson = getInspectorByKey(key); + let obj = JSON.parse(strJson); + console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); + let rectInfo = JSON.parse('[' + obj.$rect + ']'); + this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0]; + this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1]; + this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0]; + this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1]; + this.rect_value = { + "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom + }; + console.info(JSON.stringify(this.rect_value)); + return this.rect_value; + } +} + diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/common/MessageManager.ets new file mode 100644 index 0000000000000000000000000000000000000000..97dd36af2da2f6a3ce332ee8212fd1e722fff166 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/common/MessageManager.ets @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ +export interface Callback { + (message:any):void +} + +export class MessageManager { + callback:Callback + callbacks:Map = new Map() + + constructor() { + + } + + registerCallback(callback:Callback , type?:string) { + if (type == undefined) { + console.error('registerCallback callback set') + this.callback = callback + return + } + this.callbacks.set(type,callback) + } + + notify(message:any, type?:string) { + if (type == undefined) { + this.callback(message) + return + } + + let tmpCallback:Callback = this.callbacks.get(type) + if (tmpCallback === undefined) { + console.error('callbacks has no callback for type ' + type) + return + } + tmpCallback(message) + } + + clear() { + this.callbacks.clear() + this.callback = null + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ItemsChange/Tabs_itemPadMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ItemsChange/Tabs_itemPadMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ItemsChange/Tabs_itemPadMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ItemsChange/Tabs_itemPadMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ItemsChange/Tabs_itemSize.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ItemsChange/Tabs_itemSize.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ItemsChange/Tabs_itemSize.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ItemsChange/Tabs_itemSize.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_PadMar.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_PadMar.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_PadMar.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_PadMar.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_WidHei.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_WidHei.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_WidHei.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_WidHei.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barMode.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barMode.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barMode.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barMode.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barPosition.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barPosition.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barPosition.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barPosition.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barWidHei.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barWidHei.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barWidHei.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barWidHei.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_scrollable.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_scrollable.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_scrollable.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_scrollable.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/tabs_index/Tabs_index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/tabs_index/Tabs_index.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Tabs/tabs_index/Tabs_index.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/Tabs/tabs_index/Tabs_index.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..5c372e0c20209b661a274129b184c2ed9741a7d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +@Entry +@Component +struct Index { + + aboutToAppear(){ + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5841ae7bffea3a0b5e3c6d7d78aec80a9010f1e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..4bf893f776d7c265fb40e3ec5c91f3eb2e338dcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('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/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9529e19be5455dcc8c817ef5acb3a773dd543d06 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 + +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() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.acts.arkui.layout.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..1ef0707dae388ac9a18f8e118f8696fc48927929 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 Tabs_itemPadMar from './Tabs/Tabs_ItemsChange/Tabs_itemPadMar.test'; +import Tabs_itemSize from './Tabs/Tabs_ItemsChange/Tabs_itemSize.test'; +import tabs_IndexTest from './Tabs/tabs_index/Tabs_index.test'; +import tabs_PadMarTest from './Tabs/Tabs_ParmsChange/Tabs_PadMar.test'; +import tabs_WidHeiTest from './Tabs/Tabs_ParmsChange/Tabs_WidHei.test'; +import Tabs_barMode from './Tabs/Tabs_ParmsChange/Tabs_barMode.test'; +import Tabs_barPosition from './Tabs/Tabs_ParmsChange/Tabs_barPosition.test'; +import Tabs_barWidHei from './Tabs/Tabs_ParmsChange/Tabs_barWidHei.test'; +import Tabs_scrollable from './Tabs/Tabs_ParmsChange/Tabs_scrollable.test'; + + +export default function testsuite() { + + Tabs_itemPadMar(); + Tabs_itemSize(); + tabs_IndexTest(); + tabs_PadMarTest(); + tabs_WidHeiTest(); + Tabs_barMode(); + Tabs_barPosition(); + Tabs_barWidHei(); + Tabs_scrollable(); +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ItemsChange/Tabs_itemPadMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ItemsChange/Tabs_itemPadMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ItemsChange/Tabs_itemPadMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ItemsChange/Tabs_itemPadMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ItemsChange/Tabs_itemSize.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ItemsChange/Tabs_itemSize.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ItemsChange/Tabs_itemSize.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ItemsChange/Tabs_itemSize.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_PadMar.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_PadMar.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_PadMar.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_PadMar.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_WidHei.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_WidHei.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_WidHei.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_WidHei.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barMode.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barMode.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barMode.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barMode.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barPosition.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barPosition.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barPosition.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barPosition.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barWidHei.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barWidHei.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barWidHei.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barWidHei.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_scrollable.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_scrollable.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_scrollable.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_scrollable.test.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/tabs_index/Tabs_index.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/tabs_index/Tabs_index.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/tabs_index/Tabs_index.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/ets/test/Tabs/tabs_index/Tabs_index.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..52d6a700be21c25233a6d60567e3b453b3ec981e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/module.json @@ -0,0 +1,59 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.acts.arkui.layout.test.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.INTERNET" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.CAMERA" + } + ] + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..c08965e27e91133fd0611cbfb303cb1e37c955f0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/resources/base/element/float.json @@ -0,0 +1,8 @@ +{ + "float": [ + { + "name": "float_1", + "value": "10vp" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2977b612ec4595b13eaaffe3e8fc578e83c42d48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "phone_entry_dsc", + "value": "i am an entry for phone" + }, + { + "name": "phone_entry_main", + "value": "the phone entry ability" + }, + { + "name": "entry_label", + "value": "ActsContextTest" + }, + { + "name": "form_description", + "value": "my form" + }, + { + "name": "serviceability_description", + "value": "my whether" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "app_name", + "value": "Demo" + } + ] +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..0feb90c10cccf2fff894e26faf1b4693cb369e5a --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,14 @@ +{ + "src": [ + "MainAbility/pages/index/index", + "MainAbility/pages/Tabs/tabs_index/Tabs_index", + "MainAbility/pages/Tabs/Tabs_ItemsChange/Tabs_itemPadMar", + "MainAbility/pages/Tabs/Tabs_ItemsChange/Tabs_itemSize", + "MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barMode", + "MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barPosition", + "MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barWidHei", + "MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_PadMar", + "MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_scrollable", + "MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_WidHei" + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_tabs_test/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/.idea/.gitignore b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..eaf91e2ac647df635a09f01b8a2a254252aae8d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/.idea/ace_ets_layout_waterflow_test.iml b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/.idea/ace_ets_layout_waterflow_test.iml new file mode 100644 index 0000000000000000000000000000000000000000..18ec59dd70c312989ec67b525207ca8514461e22 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/.idea/ace_ets_layout_waterflow_test.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/.idea/misc.xml b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..9715c221cd4910f4d04f53a751b4465092f72024 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/.idea/modules.xml b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/.idea/modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..5328020892df0ccd5c27e79ea2923fca4ee1d434 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/AppScope/app.json b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..19c8848dfb41d2ca5e060525eb8180d538bc635c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/AppScope/app.json @@ -0,0 +1,21 @@ +{ + "app": { + "bundleName": "com.acts.arkui.layout.test", + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "debug": false, + "icon": "$media:icon", + "label": "$string:app_name", + "description": "$string:description_application", + "distributedNotificationEnabled": true, + "keepAlive": true, + "singleUser": true, + "minAPIVersion": 10, + "targetAPIVersion": 10, + "car": { + "apiCompatibleVersion": 10, + "singleUser": false + } + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/AppScope/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/AppScope/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ee69f9a861d9dc269ed6638735d52674583498e1 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/AppScope/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string":[ + { + "name":"app_name", + "value":"ohosProject" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/AppScope/resources/base/media/app_icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/AppScope/resources/base/media/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/AppScope/resources/base/media/app_icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/BUILD.gn b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..42bb6a18cbc7bb9c79eab90993e368c35380b129 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2023 iSoftStone Information Technology (Group) 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("ActsAceEtsLayoutWaterflowTest") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":ace_ets_component_waterflow_js_assets", + ":ace_ets_component_waterflow_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAceEtsLayoutWaterflowTest" +} + +ohos_app_scope("ace_ets_component_waterflow_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("ace_ets_component_waterflow_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("ace_ets_component_waterflow_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":ace_ets_component_waterflow_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/Test.json b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..104d910af5d7a93ad7d1ad7933bff3cf4c165fcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/Test.json @@ -0,0 +1,25 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "180000", + "bundle-name": "com.acts.arkui.layout.test", + "module-name": "phone", + "shell-timeout": "600000", + "testcase-timeout": 60000 + }, + "kits": [{ + "test-file-name": [ + "ActsAceEtsLayoutWaterflowTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { + "type": "ShellKit", + "run-command": [ + "power-shell wakeup", + "power-shell setmode 602" + ] + + }] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/Application/AbilityStage.ts new file mode 100644 index 0000000000000000000000000000000000000000..b0e0206ea9fb5ce94ef140d69510b6280969dd8e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/Application/AbilityStage.ts @@ -0,0 +1,9 @@ +import AbilityStage from "@ohos.app.ability.AbilityStage" + +export default class MyAbilityStage extends AbilityStage { + onCreate() { + console.log("[Demo] MyAbilityStage onCreate") + globalThis.stageOnCreateRun = 1; + globalThis.stageContext = this.context; + } +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/MainAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..0594e6e62c917b6aa681057bf10f26aff9d2abe5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -0,0 +1,40 @@ +import Ability from '@ohos.app.ability.UIAbility' +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +export default class MainAbility extends Ability { + onCreate(want,launchParam){ + // Ability is creating, initialize resources for this ability + console.log("[Demo] MainAbility onCreate") + globalThis.abilityWant = want; + } + + onDestroy() { + // Ability is destroying, release resources for this ability + console.log("[Demo] MainAbility onDestroy") + } + + onWindowStageCreate(windowStage) { + // Main window is created, set main page for this ability + console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage) + let AtManager = abilityAccessCtrl.createAtManager() + AtManager.requestPermissionsFromUser(this.context,[ + "ohos.permission.CAPTURE_SCREEN"]).then(() => {}) + globalThis.windowStage = windowStage + globalThis.abilityContext = this.context + windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) + } + + onWindowStageDestroy() { + //Main window is destroyed, release UI related resources + console.log("[Demo] MainAbility onWindowStageDestroy") + } + + onForeground() { + // Ability has brought to foreground + console.log("[Demo] MainAbility onForeground") + } + + onBackground() { + // Ability has back to background + console.log("[Demo] MainAbility onBackground") + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/common/Common.ets b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/common/Common.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc98d34214f4aea48824806a09c6385b9d82dde5 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/common/Common.ets @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ + +export default class CommonFunc { + static rect_left; + static rect_top; + static rect_right; + static rect_bottom; + static rect_value; + + static sleep(time){ + return new Promise((resolve,reject)=>{ + setTimeout(()=>{ + resolve("ok") + },time) + }).then(()=>{ + console.info(`sleep ${time} over...`) + }) + } + + static getComponentRect(key) { + let strJson = getInspectorByKey(key); + let obj = JSON.parse(strJson); + console.info("[getInspectorByKey] current component obj is: " + JSON.stringify(obj)); + let rectInfo = JSON.parse('[' + obj.$rect + ']'); + this.rect_left = JSON.parse('[' + rectInfo[0] + ']')[0]; + this.rect_top = JSON.parse('[' + rectInfo[0] + ']')[1]; + this.rect_right = JSON.parse('[' + rectInfo[1] + ']')[0]; + this.rect_bottom = JSON.parse('[' + rectInfo[1] + ']')[1]; + this.rect_value = { + "left": this.rect_left, "top": this.rect_top, "right": this.rect_right, "bottom": this.rect_bottom + }; + console.info(JSON.stringify(this.rect_value)); + return this.rect_value; + } +} + diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/common/MessageManager.ets b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/common/MessageManager.ets new file mode 100644 index 0000000000000000000000000000000000000000..97dd36af2da2f6a3ce332ee8212fd1e722fff166 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/common/MessageManager.ets @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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. + */ +export interface Callback { + (message:any):void +} + +export class MessageManager { + callback:Callback + callbacks:Map = new Map() + + constructor() { + + } + + registerCallback(callback:Callback , type?:string) { + if (type == undefined) { + console.error('registerCallback callback set') + this.callback = callback + return + } + this.callbacks.set(type,callback) + } + + notify(message:any, type?:string) { + if (type == undefined) { + this.callback(message) + return + } + + let tmpCallback:Callback = this.callbacks.get(type) + if (tmpCallback === undefined) { + console.error('callbacks has no callback for type ' + type) + return + } + tmpCallback(message) + } + + clear() { + this.callbacks.clear() + this.callback = null + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowDataSource.ets b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowDataSource.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowDataSource.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowDataSource.ets diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowFrictionPage.ets b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowFrictionPage.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowFrictionPage.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowFrictionPage.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/pages/index/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/pages/index/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..5c372e0c20209b661a274129b184c2ed9741a7d7 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/MainAbility/pages/index/index.ets @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +@Entry +@Component +struct Index { + + aboutToAppear(){ + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text('Hello World') + .fontSize(50) + .fontWeight(FontWeight.Bold) + Button() { + Text('next page') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .backgroundColor('#0D9FFB') + .onClick(() => { + + }) + } + .width('100%') + .height('100%') + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/TestAbility/TestAbility.ts b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/TestAbility/TestAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5841ae7bffea3a0b5e3c6d7d78aec80a9010f1e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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.app.ability.UIAbility' + +export default class TestAbility extends Ability { + onCreate(want, launchParam) { + console.log('TestAbility onCreate') + } + + onDestroy() { + console.log('TestAbility onDestroy') + } + + onWindowStageCreate(windowStage) { + console.log('TestAbility onWindowStageCreate') + windowStage.loadContent("TestAbility/pages/index", (err, data) => { + if (err.code) { + console.error('Failed to load the content. Cause:' + JSON.stringify(err)); + return; + } + console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) + }); + + globalThis.abilityContext = this.context; + } + + onWindowStageDestroy() { + console.log('TestAbility onWindowStageDestroy') + } + + onForeground() { + console.log('TestAbility onForeground') + } + + onBackground() { + console.log('TestAbility onBackground') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/TestAbility/pages/index.ets b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/TestAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..4bf893f776d7c265fb40e3ec5c91f3eb2e338dcb --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/TestAbility/pages/index.ets @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 router from '@ohos.router'; + +@Entry +@Component +struct Index { + aboutToAppear() { + console.info('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/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts new file mode 100644 index 0000000000000000000000000000000000000000..9529e19be5455dcc8c817ef5acb3a773dd543d06 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 + +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() { + console.log("onAbilityCreateCallback"); +} + +async function addAbilityMonitorCallback(err: any) { + console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) +} + +export default class OpenHarmonyTestRunner implements TestRunner { + constructor() { + } + + onPrepare() { + console.info("OpenHarmonyTestRunner OnPrepare ") + } + + async onRun() { + console.log('OpenHarmonyTestRunner onRun run') + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' + let lMonitor = { + abilityName: testAbilityName, + onAbilityCreate: onAbilityCreateCallback, + }; + abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) + var cmd = 'aa start -d 0 -a com.acts.arkui.layout.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName + cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) + var debug = abilityDelegatorArguments.parameters["-D"] + if (debug == 'true') + { + cmd += ' -D' + } + console.info('cmd : '+cmd) + abilityDelegator.executeShellCommand(cmd, + (err: any, d: any) => { + console.info('executeShellCommand : err : ' + JSON.stringify(err)); + console.info('executeShellCommand : data : ' + d.stdResult); + console.info('executeShellCommand : data : ' + d.exitCode); + }) + console.info('OpenHarmonyTestRunner onRun end') + } +}; \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..ca865b98ec4c37e026f95e4d94302f1075a9f84c --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/test/List.test.ets @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 waterFlow_WaterFlowFrictionTest from './WaterFlow/WaterFlow_attribute/WaterFlow_WaterFlowFriction.test'; +export default function testsuite() { + + waterFlow_WaterFlowFrictionTest(); + +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/WaterFlow/WaterFlow_attribute/WaterFlow_WaterFlowFriction.test.ets b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/test/WaterFlow/WaterFlow_attribute/WaterFlow_WaterFlowFriction.test.ets similarity index 100% rename from arkui/ace_ets_layout_test/entry/src/main/ets/test/WaterFlow/WaterFlow_attribute/WaterFlow_WaterFlowFriction.test.ets rename to arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/ets/test/WaterFlow/WaterFlow_attribute/WaterFlow_WaterFlowFriction.test.ets diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..52d6a700be21c25233a6d60567e3b453b3ec981e --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/module.json @@ -0,0 +1,59 @@ +{ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "tablet", + "default", + "phone" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [{ + "name": "com.acts.arkui.layout.test.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [{ + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + }] + }], + "metadata": [{ + "name": "ArkTSPartialUpdate", + "value": "true" + }], + "requestPermissions": [ + { + "name": "ohos.permission.CAPTURE_SCREEN" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.INTERNET" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.CAMERA" + } + ] + } +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/resources/base/element/float.json b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/resources/base/element/float.json new file mode 100644 index 0000000000000000000000000000000000000000..c08965e27e91133fd0611cbfb303cb1e37c955f0 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/resources/base/element/float.json @@ -0,0 +1,8 @@ +{ + "float": [ + { + "name": "float_1", + "value": "10vp" + } + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/resources/base/element/string.json b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2977b612ec4595b13eaaffe3e8fc578e83c42d48 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/resources/base/element/string.json @@ -0,0 +1,32 @@ +{ + "string": [ + { + "name": "phone_entry_dsc", + "value": "i am an entry for phone" + }, + { + "name": "phone_entry_main", + "value": "the phone entry ability" + }, + { + "name": "entry_label", + "value": "ActsContextTest" + }, + { + "name": "form_description", + "value": "my form" + }, + { + "name": "serviceability_description", + "value": "my whether" + }, + { + "name": "description_application", + "value": "demo for test" + }, + { + "name": "app_name", + "value": "Demo" + } + ] +} diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/resources/base/media/icon.png b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..474a55588fd7216113dd42073aadf254d4dba023 Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/resources/base/media/icon.png differ diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/resources/base/profile/main_pages.json new file mode 100644 index 0000000000000000000000000000000000000000..84ae5af7514cad8dd27945e985edfe2c7508ed24 --- /dev/null +++ b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/entry/src/main/resources/base/profile/main_pages.json @@ -0,0 +1,6 @@ +{ + "src": [ + "MainAbility/pages/index/index", + "MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowFrictionPage" + ] +} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd Binary files /dev/null and b/arkui/ace_ets_layout_test/ace_ets_layout_waterflow_test/signature/openharmony_sx.p7b differ diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/List.test.ets deleted file mode 100644 index b47b7eb03c39e4b6642187550931141f2feb5284..0000000000000000000000000000000000000000 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/List.test.ets +++ /dev/null @@ -1,802 +0,0 @@ -/* - * Copyright (c) 2023 iSoftStone Information Technology (Group) 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 flexBase_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexBaseJsunit.test.ets'; - import flexPadding_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexPaddingJsunit.test.ets'; - import flexMargin_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexMarginJsunit.test.ets'; - import flexExceed_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexExceedJsunit.test.ets'; - import flexHeightModify_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexHeightModifyJsunit.test.ets'; - import flexOffset_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexOffsetJsunit.test.ets'; - import flexVisibility_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexVisibilityJsunit.test.ets'; - import flexAlignSelf_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexAlignSelfJsunit.test.ets'; - import flexTextMargin_AutoJsunit from './Flex/alignItems/ItemAlign_Auto/FlexTextMarginJsunit.test.ets'; -import flexBase_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexBaseJsunit.test.ets'; -import flexPadding_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexPaddingJsunit.test.ets'; -import flexMargin_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexMarginJsunit.test.ets'; -import flexExceed_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexExceedJsunit.test.ets'; -import flexHeightModify_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexHeightModifyJsunit.test.ets'; -import flexOffset_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexOffsetJsunit.test.ets'; -import flexVisibility_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexVisibilityJsunit.test.ets'; -import flexAlignSelf_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexAlignSelfJsunit.test.ets'; -import flexTextMargin_StartJsunit from './Flex/alignItems/ItemAlign_Start/FlexTextMarginJsunit.test.ets'; -import flexBase_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexBaseJsunit.test.ets'; -import flexPadding_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexPaddingJsunit.test.ets'; -import flexMargin_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexMarginJsunit.test.ets'; -import flexExceed_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexExceedJsunit.test.ets'; -import flexHeightModify_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexHeightModifyJsunit.test.ets'; -import flexOffset_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexOffsetJsunit.test.ets'; -import flexVisibility_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexVisibilityJsunit.test.ets'; -import flexAlignSelf_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexAlignSelfJsunit.test.ets'; -import flexTextMargin_CenterJsunit from './Flex/alignItems/ItemAlign_Center/FlexTextMarginJsunit.test.ets'; -import flexBase_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexBaseJsunit.test.ets'; -import flexPadding_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexPaddingJsunit.test.ets'; -import flexMargin_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexMarginJsunit.test.ets'; -import flexExceed_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexExceedJsunit.test.ets'; -import flexHeightModify_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexHeightModifyJsunit.test.ets'; -import flexOffset_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexOffsetJsunit.test.ets'; -import flexVisibility_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexVisibilityJsunit.test.ets'; -import flexAlignSelf_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexAlignSelfJsunit.test.ets'; -import flexTextMargin_EndJsunit from './Flex/alignItems/ItemAlign_End/FlexTextMarginJsunit.test.ets'; -import flexBase_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexBaseJsunit.test.ets'; -import flexPadding_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexPaddingJsunit.test.ets'; -import flexMargin_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexMarginJsunit.test.ets'; -import flexExceed_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexExceedJsunit.test.ets'; -import flexHeightModify_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexHeightModifyJsunit.test.ets'; -import flexOffset_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexOffsetJsunit.test.ets'; -import flexVisibility_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexVisibilityJsunit.test.ets'; -import flexAlignSelf_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexAlignSelfJsunit.test.ets'; -import flexTextMargin_StretchJsunit from './Flex/alignItems/ItemAlign_Stretch/FlexTextMarginJsunit.test.ets'; -import flexBase_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexBaseJsunit.test.ets'; -import flexPadding_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexPaddingJsunit.test.ets'; -import flexMargin_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexMarginJsunit.test.ets'; -import flexExceed_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexExceedJsunit.test.ets'; -import flexHeightModify_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexHeightModifyJsunit.test.ets'; -import flexOffset_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexOffsetJsunit.test.ets'; -import flexVisibility_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexVisibilityJsunit.test.ets'; -import flexAlignSelf_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexAlignSelfJsunit.test.ets'; -import flexTextMargin_BaselineJsunit from './Flex/alignItems/ItemAlign_Baseline/FlexTextMarginJsunit.test.ets'; -import stackAlignChange from './Stack/Stack_change/stackAlignChange.test.ets'; -import stackSizeChange from './Stack/Stack_change/stackSizeChange.test.ets'; -import stackNoneSettingWidthHeight from './Stack/Stack_change/stackNoneSettingWidthHeight.test.ets'; -import stackPaddingChange from './Stack/Stack_change/stackPaddingChange.test.ets'; -import stackMarginChange from './Stack/Stack_change/stackMarginChange.test.ets'; -import swiperIndex from './Swiper/Swiper_ParmsChange/swiperIndex.test.ets'; -import swiperVertical from './Swiper/Swiper_ParmsChange/swiperVertical.test.ets'; -import swiperLoopTrue from './Swiper/Swiper_ParmsChange/swiperLoopTrue.test.ets'; -import swiperLoopFalse from './Swiper/Swiper_ParmsChange/swiperLoopFalse.test.ets'; - -import swiperItemSpace from './Swiper/Swiper_ParmsChange/swiperItemSpace.test.ets'; -import swiperPadding from './Swiper/Swiper_ParmsChange/swiperPadding.test.ets'; -import swiperMargin from './Swiper/Swiper_ParmsChange/swiperMargin.test.ets'; -import swiperMarPad from './Swiper/Swiper_ParmsChange/swiperMarPad.test.ets'; -import swiperDisableSwipeTrue from './Swiper/Swiper_ParmsChange/swiperDisableSwipeTrue.test.ets'; -import swiperDisableSwipeFalse from './Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.test.ets'; -import swiperItemSize from './Swiper/Swiper_ItemChange/swiperItemSize.test.ets'; -import swiperItemSize2 from './Swiper/Swiper_ItemChange/swiperItemSize2.test.ets'; -import swiperItemPadding from './Swiper/Swiper_ItemChange/swiperItemPadding.test.ets'; -import swiperItemMargin from './Swiper/Swiper_ItemChange/swiperItemMargin.test.ets'; -import swiperItemPadMar from './Swiper/Swiper_ItemChange/swiperItemPadMar.test.ets'; -import swiperItemVisibility from './Swiper/Swiper_ItemChange/swiperItemVisibility.test.ets'; -import RelativeContainer_Level from './RelativeContainer/RelativeContainer_Level/RelativeContainer_Level.test.ets'; - import RelativeContainer_Vertical from './RelativeContainer/RelativeContainer_Vertical/RelativeContainer_Vertical.test.ets'; - import RelativeContainer_AnchorPoint_Absent from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Absent.test.ets'; - import RelativeContainer_AnchorPoint_Circular_Dependency from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Circular_Dependency.test.ets'; - import RelativeContainer_AnchorPoint_Interdependence from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Interdependence.test.ets'; - import RelativeContainer_AnchorPoint_Margin from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Margin.test.ets'; - import RelativeContainer_AnchorPoint_Padding from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Padding.test.ets'; - import RelativeContainer_AnchorPoint_ThreeDirection from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_ThreeDirection.test.ets'; - import RelativeContainer_AnchorPoint_TwoDirection from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_TwoDirection.test.ets'; - import RelativeContainer_AnchorPoint_Visibility_Hidden from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_Hidden.test.ets'; - import RelativeContainer_AnchorPoint_Visibility_None from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_None.test.ets'; - import RelativeContainer_AnchorPoint_NoId from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_NoId.test.ets'; - import RelativeContainer_AnchorPoint_Id_Null from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Null.test.ets'; - import RelativeContainer_AnchorPoint_Id_Undefined from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Undefined.test.ets'; - import RelativeContainer_AnchorPoint_Offset from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Offset.test.ets'; - import RelativeContainer_AnchorPoint_Position from './RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Position.test.ets'; -import Row_Space from './Row/spaceChanged/Row_Space.test.ets'; - import Row_Space_String from './Row/spaceChanged/Row_Space_String.test.ets'; - import Row_Space_Default from './Row/spaceChanged/Row_Space_Default.test.ets'; - import Row_layoutWeight_All from './Row/layoutWeight/Row_layoutWeight_All.test.ets'; - import Row_layoutWeight_Default from './Row/layoutWeight/Row_layoutWeight_Default.test.ets'; - import Row_layoutWeight_flexGrow from './Row/layoutWeight/Row_layoutWeight_flexGrow.test.ets'; - import Row_layoutWeight_flexShrink from './Row/layoutWeight/Row_layoutWeight_flexShrink.test.ets'; - import Row_layoutWeight_Part from './Row/layoutWeight/Row_layoutWeight_Part.test.ets'; - import Row_flexGrow_Default from './Row/flexGrow/Row_flexGrow_Default.test.ets'; - import Row_flexGrow_Part from './Row/flexGrow/Row_flexGrow_Part.test.ets'; - import Row_flexShrink_Default from './Row/flexShrink/Row_flexShrink_Default.test.ets'; - import Row_flexShrink_Part from './Row/flexShrink/Row_flexShrink_Part.test.ets'; - import Row_flexBasis_Default from './Row/flexBasis/Row_flexBasis_Default.test.ets'; - import Row_flexBasis_Type from './Row/flexBasis/Row_flexBasis_Type.test.ets'; - import rowNesting_Space from './Row/RowNesting/rowNesting_Space.test.ets'; - import rowNesting_alignItems from './Row/RowNesting/rowNesting_alignItems.test.ets'; - import rowNesting_justifyContent from './Row/RowNesting/rowNesting_justifyContent.test.ets'; - import Column_Space from './Column/spaceChanged/Column_Space.test.ets'; - import Column_Space_String from './Column/spaceChanged/Column_Space_String.test.ets'; - import Column_Space_Default from './Column/spaceChanged/Column_Space_Default.test.ets'; - import layoutWeight_Part from './Column/layoutWeight/layoutWeight_Part.test'; - import layoutWeight_All from './Column/layoutWeight/layoutWeight_All.test'; - import layoutWeight_Default from './Column/layoutWeight/layoutWeight_Default.test.ets'; - import layoutWeight_flexGrow from './Column/layoutWeight/layoutWeight_flexGrow.test.ets'; - import layoutWeight_flexShrink from './Column/layoutWeight/layoutWeight_flexShrink.test.ets'; - import flexGrow_Part from './Column/flexGrow/flexGrow_Part.test.ets'; - import flexGrow_Default from './Column/flexGrow/flexGrow_Default.test.ets'; - import flexShrink_Part from './Column/flexShrink/flexShrink_Part.test.ets'; - import flexBasis_Type from './Column/flexBasis/flexBasis_Type.test.ets'; - import flexBasis_Default from './Column/flexBasis/flexBasis_Default.test.ets'; - import columnNesting_Space from './Column/columnNesting/columnNesting_Space.test.ets'; - import columnNesting_alignItems from './Column/columnNesting/columnNesting_alignItems.test.ets'; - import columnNesting_justifyContent from './Column/columnNesting/columnNesting_justifyContent.test.ets'; - -import Grid_Col_Span_Default from './Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Default.test.ets'; - import Grid_Col_Span_Number from './Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Number.test.ets'; - import Grid_Col_Span_GridColColumnOption from './Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_GridColColumnOption.test.ets'; - import Grid_Col_Order_Default from './Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Default.test.ets'; - import Grid_Col_Order_Number from './Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Number.test.ets'; - import Grid_Col_Order_GridColColumnOption from './Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_GridColColumnOption.test.ets'; - import Grid_Col_Offset_Default from './Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Default.test.ets'; - import Grid_Col_Offset_Number from './Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Number.test.ets'; - import Grid_Col_Offset_GridColColumnOption from './Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_GridColColumnOption.test.ets'; - - import Grid_Row_Columns from './Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns.test.ets'; - import Grid_Row_Columns_Default from './Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Default.test.ets'; - import Grid_Row_Columns_Option from './Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Option.test.ets'; - import Grid_Row_Gutter from './Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Gutter.test.ets'; - import Grid_Row_Length_String from './Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Length_String.test'; - import Gutter_Length_Resource from './Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.test'; - import Gutter_Length_Default from './Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Default.test'; - import Grid_Row_SizeOption from './Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_SizeOption.test'; - import Grid_Row_GutterOption_String from './Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.test'; - import Grid_Row_GutterOption_Default from './Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.test'; - import Grid_Row_GutterOption_Number from './Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.test'; - import Grid_Row_Direction_Row from './Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.test'; - import Grid_Row_Direction_RowReverse from './Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.test'; - import Grid_Row_Breakpoints_Default from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Default.test'; - import Grid_Row_Breakpoints_Component from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Component.test'; - import Grid_Row_Breakpoints_Window from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Window.test'; - import Grid_Row_Breakpoints_Change from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Change.test'; - import Grid_Row_Breakpoints_Incremental from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Incremental.test'; - import Grid_Row_Breakpoints_Negative from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Negative.test'; - import Grid_Row_Breakpoints_Quantity from './Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Quantity.test'; - import GridRow_onBreakpoint from './Grid/Grid_Row/onBreakpointChange/onBreakpointChange.test'; - - import Grid_RowCol_TemplateChange from './Grid/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange.test.ets'; - import Grid_RowCol_GridSize from './Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize.test.ets'; - import Grid_RowCol_PadMar from './Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar.test.ets'; - import Grid_RowCol_Gap from './Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap.test.ets'; - import Grid_RowCol_LayoutDirection from './Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection.test.ets'; - import Grid_RowCol_maxCount from './Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount.test.ets'; - import Grid_RowCol_cellLength from './Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength.test.ets'; - import AlignSpaceEvenly_NoSpace from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace.test.ets'; - import AlignSpaceEvenly_AddPadding from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding.test.ets'; - import AlignSpaceEvenly_AddMargin from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin.test.ets'; - import AlignSpaceEvenly_AddAllSpace from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace.test.ets'; - import AlignSpaceEvenly_AddAlign from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign.test.ets'; - import AlignSpaceEvenly_AddOffset from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.test.ets'; - import AlignSpaceEvenly_AddVisibility from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility.test.ets'; - import AlignSpaceEvenly_AddLayoutWeight from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight.test.ets'; - import AlignSpaceEvenly_AddOneWidth from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth.test.ets'; - import AlignSpaceEvenly_AddOneMargin from './Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin.test.ets'; - import AlignStart_NoSpace from './Flex/justifyContent/Start/AlignStart_NoSpace.test.ets'; - import AlignStart_AddPadding from './Flex/justifyContent/Start/AlignStart_AddPadding.test.ets'; - import AlignStart_AddMargin from './Flex/justifyContent/Start/AlignStart_AddMargin.test.ets'; - import AlignStart_AddAllSpace from './Flex/justifyContent/Start/AlignStart_AddAllSpace.test.ets'; - import AlignStart_AddAlign from './Flex/justifyContent/Start/AlignStart_AddAlign.test.ets'; - import AlignStart_AddOffset from './Flex/justifyContent/Start/AlignStart_AddOffset.test.ets'; - import AlignStart_AddVisibility from './Flex/justifyContent/Start/AlignStart_AddVisibility.test.ets'; - import AlignStart_AddLayoutWeight from './Flex/justifyContent/Start/AlignStart_AddLayoutWeight.test.ets'; - import AlignStart_AddOneWidth from './Flex/justifyContent/Start/AlignStart_AddOneWidth.test.ets'; - import AlignStart_AddOneMargin from './Flex/justifyContent/Start/AlignStart_AddOneMargin.test.ets'; - import AlignCenter_NoSpace from './Flex/justifyContent/Center/AlignCenter_NoSpace.test.ets'; - import AlignCenter_AddPadding from './Flex/justifyContent/Center/AlignCenter_AddPadding.test.ets'; - import AlignCenter_AddMargin from './Flex/justifyContent/Center/AlignCenter_AddMargin.test.ets'; - import AlignCenter_AddAllSpace from './Flex/justifyContent/Center/AlignCenter_AddAllSpace.test.ets'; - import AlignCenter_AddAlign from './Flex/justifyContent/Center/AlignCenter_AddAlign.test.ets'; - import AlignCenter_AddOffset from './Flex/justifyContent/Center/AlignCenter_AddOffset.test.ets'; - import AlignCenter_AddVisibility from './Flex/justifyContent/Center/AlignCenter_AddVisibility.test.ets'; - import AlignCenter_AddLayoutWeight from './Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.test.ets'; - import AlignCenter_AddOneWidth from './Flex/justifyContent/Center/AlignCenter_AddOneWidth.test.ets'; - import AlignCenter_AddOneMargin from './Flex/justifyContent/Center/AlignCenter_AddOneMargin.test.ets'; - import AlignEnd_NoSpace from './Flex/justifyContent/End/AlignEnd_NoSpace.test.ets'; - import AlignEnd_AddPadding from './Flex/justifyContent/End/AlignEnd_AddPadding.test.ets'; - import AlignEnd_AddMargin from './Flex/justifyContent/End/AlignEnd_AddMargin.test.ets'; - import AlignEnd_AddAllSpace from './Flex/justifyContent/End/AlignEnd_AddAllSpace.test.ets'; - import AlignEnd_AddAlign from './Flex/justifyContent/End/AlignEnd_AddAlign.test.ets'; - import AlignEnd_AddOffset from './Flex/justifyContent/End/AlignEnd_AddOffset.test.ets'; - import AlignEnd_AddVisibility from './Flex/justifyContent/End/AlignEnd_AddVisibility.test.ets'; - import AlignEnd_AddLayoutWeight from './Flex/justifyContent/End/AlignEnd_AddLayoutWeight.test.ets'; - import AlignEnd_AddOneWidth from './Flex/justifyContent/End/AlignEnd_AddOneWidth.test.ets'; - import AlignEnd_AddOneMargin from './Flex/justifyContent/End/AlignEnd_AddOneMargin.test.ets'; - import flex_AlignContent_SpaceBetween_FlexSizeTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexSize.test'; - import flex_AlignContent_SpaceBetween_FlexPadTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexPad.test'; - import flex_AlignContent_SpaceBetween_FlexMarTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexMar.test'; - import flex_AlignContent_SpaceBetween_FlexMarPadTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_FlexMarPad.test'; - import flex_AlignContent_SpaceBetween_TextSizeTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextSize.test'; - import flex_AlignContent_SpaceBetween_TextMarTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextMar.test'; - import flex_AlignContent_SpaceBetween_TextOffsetTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextOffset.test'; - import flex_AlignContent_SpaceBetween_TextVisibilityTest from './Flex/alignContent/SpaceBeTween/Flex_AlignContent_SpaceBetween_TextVisibility.test'; - import flex_AlignContent_SpaceAround_FlexSizeTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize.test'; - import flex_AlignContent_SpaceAround_FlexPadTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad.test'; - import flex_AlignContent_SpaceAround_FlexMarTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMar.test'; - import flex_AlignContent_SpaceAround_FlexMarPadTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMarPad.test'; - import flex_AlignContent_SpaceAround_TextSizeTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextSize.test'; - import flex_AlignContent_SpaceAround_TextMarTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextMar.test'; - import flex_AlignContent_SpaceAround_TextOffsetTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextOffset.test'; - import flex_AlignContent_SpaceAround_TextVisibilityTest from './Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextVisibility.test'; -import Tabs_itemPadMar from './Tabs/Tabs_ItemsChange/Tabs_itemPadMar.test'; -import Tabs_itemSize from './Tabs/Tabs_ItemsChange/Tabs_itemSize.test'; -import tabs_IndexTest from './Tabs/tabs_index/Tabs_index.test'; -import tabs_PadMarTest from './Tabs/Tabs_ParmsChange/Tabs_PadMar.test'; -import tabs_WidHeiTest from './Tabs/Tabs_ParmsChange/Tabs_WidHei.test'; -import Tabs_barMode from './Tabs/Tabs_ParmsChange/Tabs_barMode.test'; -import Tabs_barPosition from './Tabs/Tabs_ParmsChange/Tabs_barPosition.test'; -import Tabs_barWidHei from './Tabs/Tabs_ParmsChange/Tabs_barWidHei.test'; -import Tabs_scrollable from './Tabs/Tabs_ParmsChange/Tabs_scrollable.test'; -import flexWrapReverse_notFixedParent from './Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParent.test.ets'; -import flexWrapReverse_notFixedParentPadding from './Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentPadding.test.ets'; -import flexWrapReverse_notFixedParentMargin from './Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentMargin.test.ets'; -import flexWrapReverse_fixedParent from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParent.test.ets'; -import flexWrapReverse_fixedParentPadding from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentPadding.test.ets'; -import flexWrapReverse_fixedParentMargin from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMargin.test.ets'; -import flexWrapReverse_fixedParentMarPad from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMarPad.test.ets'; -import flexWrapReverse_fixedParentChildVisibility from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildVisibility.test.ets'; -import flexWrapReverse_fixedParentChildPosition from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildPosition.test.ets'; -import flexWrapReverse_fixedParentChildLayoutWeight from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildLayoutWeight.test.ets'; -import flexWrapReverse_fixedParentChildDisplayPriority from './Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildDisplayPriority.test.ets'; -import flexAlign_SpaceBetween_fixedChild from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChild.test.ets'; -import flexAlign_SpaceBetween_fixedChildParentPadding from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentPadding.test.ets'; -import flexAlign_SpaceBetween_fixedChildParentMargin from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMargin.test.ets'; -import flexAlign_SpaceBetween_fixedChildParentMarPad from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMarPad.test.ets'; -import flexAlign_SpaceBetween_fixedChildParentItemAlignEnd from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentItemAlignEnd.test.ets'; -import flexAlign_SpaceBetween_fixedParent from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParent.test.ets'; -import flexAlign_SpaceBetween_fixedParentVisibility from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentVisibility.test.ets'; -import flexAlign_SpaceBetween_fixedParentChangeFirst from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirst.test.ets'; -import flexAlign_SpaceBetween_fixedParentChangeFirstWidth from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirstWidth.test.ets'; -import flexAlign_SpaceBetween_fixedParentMarginFirst from './Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentMarginFirst.test.ets'; -import flexAlign_SpaceAround_fixedChild from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChild.test.ets'; -import flexAlign_SpaceAround_fixedChildParentPadding from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentPadding.test.ets'; -import flexAlign_SpaceAround_fixedChildParentMargin from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMargin.test.ets'; -import flexAlign_SpaceAround_fixedChildParentMarPad from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMarPad.test.ets'; -import flexAlign_SpaceAround_fixedChildParentItemAlignEnd from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentItemAlignEnd.test.ets'; -import flexAlign_SpaceAround_fixedParent from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParent.test.ets'; -import flexAlign_SpaceAround_fixedParentVisibility from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentVisibility.test.ets'; -import flexAlign_SpaceAround_fixedParentChangeFirst from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirst.test.ets'; -import flexAlign_SpaceAround_fixedParentChangeFirstWidth from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirstWidth.test.ets'; -import flexAlign_SpaceAround_fixedParentMarginFirst from './Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentMarginFirst.test.ets'; -import column_WidthHeight_ChangeParent from './Column/ParentComponentChanged/Column_WidthHeight_ChangeParent.test.ets'; -import column_Padding_ChangeParent from './Column/ParentComponentChanged/Column_Padding_ChangeParent.test.ets'; -import column_Margin_ChangeParent from './Column/ParentComponentChanged/Column_Margin_ChangeParent.test.ets'; -import column_MarPad_ChangeParent from './Column/ParentComponentChanged/Column_MarPad_ChangeParent.test.ets'; -import column_AlignItems_ChangeParent from './Column/ParentComponentChanged/Column_AlignItems_ChangeParent.test.ets'; -import column_JustifyContent_ChangeParent from './Column/ParentComponentChanged/Column_JustifyContent_ChangeParent.test.ets'; -import listItem_SizeChange from './List/List_Space/ListItemChange/ListItem_SizeChange.test.ets'; -import listItem_Margin from './List/List_Space/ListItemChange/ListItem_Margin.test.ets'; -import listItem_Padding from './List/List_Space/ListItemChange/ListItem_Padding.test.ets'; -import listItem_PadMar from './List/List_Space/ListItemChange/ListItem_PadMar.test.ets'; -import listItem_Visibility from './List/List_Space/ListItemChange/ListItem_Visibility.test.ets'; -import listItem_Position from './List/List_Space/ListItemChange/ListItem_Position.test.ets'; -import listItem_Offset from './List/List_Space/ListItemChange/ListItem_Offset.test.ets'; -import listItem_InSertChange from './List/List_Space/ListItemChange/ListItem_InSertChange.test.ets'; -import ColumnWidthHeight_SubChange from './Column/subComponentChanged/ColumnWidthHeight_SubChange.test.ets'; -import ColumnSetPadding_SubChange from './Column/subComponentChanged/ColumnSetPadding_SubChange.test.ets'; -import ColumnSetPadding_SubChangeMar from './Column/subComponentChanged/ColumnSetPadding_SubChangeMar.test.ets'; -import ColumnSetPadding_SubChangePad from './Column/subComponentChanged/ColumnSetPadding_SubChangePad.test.ets'; -import ColumnSetMargin_SubChange from './Column/subComponentChanged/ColumnSetMargin_SubChange.test.ets'; -import ColumnSetMargin_SubChangeMar from './Column/subComponentChanged/ColumnSetMargin_SubChangeMar.test.ets'; -import ColumnSetMargin_SubChangePad from './Column/subComponentChanged/ColumnSetMargin_SubChangePad.test.ets'; -import ColumnSetPaddingMargin_SubChange from './Column/subComponentChanged/ColumnSetPaddingMargin_SubChange.test.ets'; -import ColumnSetPaddingMargin_SubChangeMar from './Column/subComponentChanged/ColumnSetPaddingMargin_SubChangeMar.test.ets'; -import ColumnSetPaddingMargin_SubChangePad from './Column/subComponentChanged/ColumnSetPaddingMargin_SubChangePad.test.ets'; -import ColumnSetPosition_SubChange from './Column/subComponentChanged/ColumnSetPosition_SubChange.test.ets'; -import ColumnSetOffset_SubChange from './Column/subComponentChanged/ColumnSetOffset_SubChange.test.ets'; -import ColumnSetDisplayPriority_SubChange from './Column/subComponentChanged/ColumnSetDisplayPriority_SubChange.test.ets'; -import ColumnSetLayoutWeight_SubChange from './Column/subComponentChanged/ColumnSetLayoutWeight_SubChange.test.ets'; -import ColumnSetLayoutWeightNone_SubChange from './Column/subComponentChanged/ColumnSetLayoutWeightNone_SubChange.test.ets'; -import ColumnSetFlexShink_SubChange from './Column/subComponentChanged/ColumnSetFlexShink_SubChange.test.ets'; -import ColumnSetFlexShinkNone_SubChange from './Column/subComponentChanged/ColumnSetFlexShinkNone_SubChange.test.ets'; -import ColumnSetVisibility_SubChange from './Column/subComponentChanged/ColumnSetVisibility_SubChange.test.ets'; -import flex_NoWrap_FlexSizeTest from './Flex/Wrap/NoWrap/Flex_NoWrap_FlexSize.test'; -import flex_NoWrap_PaddingTest from './Flex/Wrap/NoWrap/Flex_NoWrap_Padding.test'; -import flex_NoWrap_TextSizeTest from './Flex/Wrap/NoWrap/Flex_NoWrap_TextSize.test'; -import flex_NoWrap_FlexPad_TextMarPadTest from "./Flex/Wrap/NoWrap/Flex_NoWrap_FlexPad_TextMarPad.test"; -import flex_NoWrap_FlexMar_TextMarPadTest from "./Flex/Wrap/NoWrap/Flex_NoWrap_FlexMar_TextMarPad.test"; -import flex_NoWrap_FlexMarPad_TextMarPadTest from "./Flex/Wrap/NoWrap/Flex_NoWrap_FlexMarPad_TextMarPad.test"; -import flex_NoWrap_VisibilityTest from './Flex/Wrap/NoWrap/Flex_NoWrap_Visibility.test'; -import flex_NoWrap_LayoutWeightTest from './Flex/Wrap/NoWrap/Flex_NoWrap_LayoutWeight.test'; -import flex_NoWrap_DisplayPriorityTest from './Flex/Wrap/NoWrap/Flex_NoWrap_DisplayPriority.test'; -import flex_NoWrap_PositionTest from './Flex/Wrap/NoWrap/Flex_NoWrap_Position.test'; -import flex_Wrap_FlexSizeTest from './Flex/Wrap/Wrap/Flex_Wrap_FlexSize.test'; -import flex_Wrap_TextSizeTest from './Flex/Wrap/Wrap/Flex_Wrap_TextSize.test'; -import flex_Wrap_PaddingTest from './Flex/Wrap/Wrap/Flex_Wrap_Padding.test'; -import flex_Wrap_FlexPad_TextMarPadTest from "./Flex/Wrap/Wrap/Flex_Wrap_FlexPad_TextMarPad.test"; -import flex_Wrap_FlexMar_TextMarPadTest from "./Flex/Wrap/Wrap/Flex_Wrap_FlexMar_TextMarPad.test"; -import flex_Wrap_FlexMarPad_TextMarPadTest from "./Flex/Wrap/Wrap/Flex_Wrap_FlexMarPad_TextMarPad.test"; -import flex_Wrap_VisibilityTest from './Flex/Wrap/Wrap/Flex_Wrap_Visibility.test'; -import flex_Wrap_PositionTest from './Flex/Wrap/Wrap/Flex_Wrap_Position.test'; -import flex_Wrap_LayoutWeightTest from './Flex/Wrap/Wrap/Flex_Wrap_LayoutWeight.test'; -import flex_Wrap_DisplayPriorityTest from './Flex/Wrap/Wrap/Flex_Wrap_DisplayPriority.test'; -import row_TextSizeTest from './Row/subComponentChanged/Row_TextSize.test'; -import rowPad_TextMarPadTest from './Row/subComponentChanged/RowPad_TextMarPad.test'; -import rowMar_TextMarPadTest from './Row/subComponentChanged/RowMar_TextMarPad.test'; -import rowMarPad_TextMarPadTest from './Row/subComponentChanged/RowMarPad_TextMarPad.test'; -import row_TextPositionTest from './Row/subComponentChanged/Row_TextPosition.test'; -import row_TextOffsetTest from './Row/subComponentChanged/Row_TextOffset.test'; -import row_TextDisplayPriorityTest from './Row/subComponentChanged/Row_TextDisplayPriority.test'; -import row_TextLayoutWeightTest from './Row/subComponentChanged/Row_TextLayoutWeight.test'; -import row_TextFlexShrinkTest from './Row/subComponentChanged/Row_TextFlexShrink.test'; -import row_TextVisibilityTest from './Row/subComponentChanged/Row_TextVisibility.test'; -import grid_RowCol_ItemPadMarTest from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPadMar.test'; -import grid_RowCol_ItemOffsetTest from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemOffset.test'; -import grid_RowCol_ItemPositionTest from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPosition.test'; -import grid_RowCol_ItemVisibilityTest from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility.test'; -import grid_RowCol_ItemContentSizeTest from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemContentSize.test'; -import grid_RowCol_ItemColumnStartEnd from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemColumnStartEnd.test'; -import grid_RowCol_ItemRowStartEnd from './Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd.test'; -import list_SpaceChangeTest from './List/List_SpaceChange/List_SpaceChange.test'; -import list_ListInitialIndex1Test from './List/List_initialIndex/List_ListInitialIndex1.test'; -import list_ListInitialIndex2Test from './List/List_initialIndex/List_ListInitialIndex2.test'; -import list_ListInitialIndex3Test from './List/List_initialIndex/List_ListInitialIndex3.test'; -import list_ListInitialIndex4Test from './List/List_initialIndex/List_ListInitialIndex4.test'; -import list_ListInitialIndex5Test from './List/List_initialIndex/List_ListInitialIndex5.test'; -import list_ListInitialIndex6Test from './List/List_initialIndex/List_ListInitialIndex6.test'; -import List_alignListItem from './List/List_Space/ListChange/List_alignListItem.test'; -import List_divider from './List/List_Space/ListChange/List_divider.test'; -import List_lanes from './List/List_Space/ListChange/List_lanes.test'; -import List_ListDirection from './List/List_Space/ListChange/List_ListDirection.test'; -import List_ListSize from './List/List_Space/ListChange/List_ListSize.test'; -import List_Margin from './List/List_Space/ListChange/List_Margin.test'; -import List_Padding from './List/List_Space/ListChange/List_Padding.test'; -import List_PadMar from './List/List_Space/ListChange/List_PadMar.test'; -import Stack_AlignContent from './Stack/Stack_alignContent/stack_alignContent.test'; -import Stack_Offset_Change from './Stack/StackItem_change/stack_offset_change.test'; -import Stack_Position_Change from './Stack/StackItem_change/stack_position_change.test'; -import Stack_ZIndex from './Stack/StackItem_change/stack_zIndex.test'; -import Row_FlexAlign from './Row/parentComponentChanged/Row_FlexAlign.test'; -import Row_Margin from './Row/parentComponentChanged/Row_Margin.test'; -import Row_MarginPadding from './Row/parentComponentChanged/Row_MarginPadding.test'; -import Row_Padding from './Row/parentComponentChanged/Row_Padding.test'; -import Row_Size from './Row/parentComponentChanged/Row_Size.test'; -import Row_VerticalAlign from './Row/parentComponentChanged/Row_VerticalAlign.test'; -import list_ListFrictionTest from './List/List_attribute/List_ListFriction.test'; -import grid_GridFrictionTest from './Grid/Grid_attribute/Grid_GridFriction.test'; -import waterFlow_WaterFlowFrictionTest from './WaterFlow/WaterFlow_attribute/WaterFlow_WaterFlowFriction.test'; -import scroll_ScrollFrictionTest from './Scroll/Scroll_attribute/Scroll_ScrollFriction.test'; - -import AlignContentFlex_Start from './Flex/alignContent/Start/AlignContentFlex_Start.test.ets'; -import AlignContent_FlexAlign_Start_Margin from './Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin.test.ets'; -import AlignContent_FlexAlign_Start_Margin_padding from './Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin_padding.test.ets'; -import AlignContent_FlexAlign_Start_padding from './Flex/alignContent/Start/AlignContent_FlexAlign_Start_padding.test.ets'; -import AlignContent_Start_FlexP_fixed from './Flex/alignContent/Start/AlignContent_Start_FlexP_fixed.test.ets'; -import AlignContent_Start_FlexP_Fixed_Margin from './Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Margin.test.ets'; -import AlignContent_Start_FlexP_Fixed_Offset from './Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Offset.test.ets'; -import AlignContent_Start_FlexP_Fixed_Visibility from './Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Visibility.test.ets'; - -import AlignContentFlexJsunit from './Flex/alignContent/SpaceEvenly/AlignContentFlexJsunit.test.ets'; -import AlignContentFlexP_fixed from './Flex/alignContent/SpaceEvenly/AlignContentFlexP_fixed.test.ets'; -import AlignContentFlexP_Fixed_Margin from './Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Margin.test.ets'; -import AlignContentFlexP_Fixed_Offset from './Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Offset.test.ets'; -import AlignContentFlexP_Fixed_Visibility from './Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Visibility.test.ets'; -import AlignContent_FlexAlign_SpaceEvenly_Margin from './Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin.test.ets'; -import AlignContent_FlexAlign_SpaceEvenly_Margin_padding from './Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin_padding.test.ets'; -import AlignContent_FlexAlign_SpaceEvenly_padding from './Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_padding.test.ets'; - -import AlignContentFlex_End from './Flex/alignContent/End/AlignContentFlex_End.test.ets'; -import AlignContent_End_FlexP_fixed from './Flex/alignContent/End/AlignContent_End_FlexP_fixed.test.ets'; -import AlignContent_End_FlexP_Fixed_Margin from './Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Margin.test.ets'; -import AlignContent_End_FlexP_Fixed_Offset from './Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Offset.test.ets'; -import AlignContent_End_FlexP_Fixed_Visibility from './Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Visibility.test.ets'; -import AlignContent_FlexAlign_End_Margin from './Flex/alignContent/End/AlignContent_FlexAlign_End_Margin.test.ets'; -import AlignContent_FlexAlign_End_Margin_padding from './Flex/alignContent/End/AlignContent_FlexAlign_End_Margin_padding.test.ets'; -import AlignContent_FlexAlign_End_padding from './Flex/alignContent/End/AlignContent_FlexAlign_End_padding.test.ets'; - -import AlignContentFlex_Center from './Flex/alignContent/Center/AlignContentFlex_Center.test.ets'; -import AlignContent_Center_FlexP_fixed from './Flex/alignContent/Center/AlignContent_Center_FlexP_fixed.test.ets'; -import AlignContent_Center_FlexP_Fixed_Margin from './Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Margin.test.ets'; -import AlignContent_Center_FlexP_Fixed_Offset from './Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Offset.test.ets'; -import AlignContent_Center_FlexP_Fixed_Visibility from './Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Visibility.test.ets'; -import AlignContent_FlexAlign_Center_Margin from './Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin.test.ets'; -import AlignContent_FlexAlign_Center_Margin_padding from './Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin_padding.test.ets'; -import AlignContent_FlexAlign_Center_padding from './Flex/alignContent/Center/AlignContent_FlexAlign_Center_padding.test.ets'; -export default function testsuite() { - flexBase_AutoJsunit() - flexPadding_AutoJsunit() - flexMargin_AutoJsunit() - flexExceed_AutoJsunit() - flexHeightModify_AutoJsunit() - flexOffset_AutoJsunit() - flexVisibility_AutoJsunit() - flexAlignSelf_AutoJsunit() - flexTextMargin_AutoJsunit() -flexBase_StartJsunit() -flexPadding_StartJsunit() -flexMargin_StartJsunit() -flexExceed_StartJsunit() -flexHeightModify_StartJsunit() -flexOffset_StartJsunit() -flexVisibility_StartJsunit() -flexAlignSelf_StartJsunit() -flexTextMargin_StartJsunit() -flexBase_CenterJsunit() -flexPadding_CenterJsunit() -flexMargin_CenterJsunit() -flexExceed_CenterJsunit() -flexHeightModify_CenterJsunit() -flexOffset_CenterJsunit() -flexVisibility_CenterJsunit() -flexAlignSelf_CenterJsunit() -flexTextMargin_CenterJsunit() -flexBase_EndJsunit() -flexPadding_EndJsunit() -flexMargin_EndJsunit() -flexExceed_EndJsunit() -flexHeightModify_EndJsunit() -flexOffset_EndJsunit() -flexVisibility_EndJsunit() -flexAlignSelf_EndJsunit() -flexTextMargin_EndJsunit() -flexBase_StretchJsunit() -flexPadding_StretchJsunit() -flexMargin_StretchJsunit() -flexExceed_StretchJsunit() -flexHeightModify_StretchJsunit() -flexOffset_StretchJsunit() -flexVisibility_StretchJsunit() -flexAlignSelf_StretchJsunit() -flexTextMargin_StretchJsunit() -flexBase_BaselineJsunit() -flexPadding_BaselineJsunit() -flexMargin_BaselineJsunit() -flexExceed_BaselineJsunit() -flexHeightModify_BaselineJsunit() -flexOffset_BaselineJsunit() -flexVisibility_BaselineJsunit() -flexAlignSelf_BaselineJsunit() -flexTextMargin_BaselineJsunit() -stackAlignChange() -stackSizeChange() -stackNoneSettingWidthHeight() -stackPaddingChange() -stackMarginChange() -swiperIndex() -swiperVertical() -swiperLoopTrue() -swiperLoopFalse() - -swiperItemSpace() -swiperPadding() -swiperMargin() -swiperMarPad() -swiperDisableSwipeTrue() -swiperDisableSwipeFalse() -swiperItemSize() -swiperItemSize2() -swiperItemPadding() -swiperItemMargin() -swiperItemPadMar() -swiperItemVisibility() -RelativeContainer_Level() -RelativeContainer_Vertical() -RelativeContainer_AnchorPoint_Absent() -RelativeContainer_AnchorPoint_Circular_Dependency() -RelativeContainer_AnchorPoint_Interdependence() -RelativeContainer_AnchorPoint_Margin() -RelativeContainer_AnchorPoint_Padding() -RelativeContainer_AnchorPoint_ThreeDirection() -RelativeContainer_AnchorPoint_TwoDirection() -RelativeContainer_AnchorPoint_Visibility_Hidden() -RelativeContainer_AnchorPoint_Visibility_None() -RelativeContainer_AnchorPoint_NoId() -RelativeContainer_AnchorPoint_Id_Null() -RelativeContainer_AnchorPoint_Id_Undefined() -RelativeContainer_AnchorPoint_Offset() -RelativeContainer_AnchorPoint_Position() - Row_Space() - Row_Space_String() - Row_Space_Default() - Row_layoutWeight_All() - Row_layoutWeight_Default() - Row_layoutWeight_flexGrow() - Row_layoutWeight_flexShrink() - Row_layoutWeight_Part() - Row_flexGrow_Default() - Row_flexGrow_Part() - Row_flexShrink_Default() - Row_flexShrink_Part() - Row_flexBasis_Default() - Row_flexBasis_Type() - rowNesting_Space() - rowNesting_alignItems() - rowNesting_justifyContent() - Column_Space() - Column_Space_String() - Column_Space_Default() - layoutWeight_Part() - layoutWeight_All() - layoutWeight_Default() - layoutWeight_flexGrow() - layoutWeight_flexShrink() - flexGrow_Part() - flexGrow_Default() - flexShrink_Part() - flexBasis_Type() - flexBasis_Default() - columnNesting_Space() - columnNesting_alignItems() - columnNesting_justifyContent() - - Grid_Col_Span_Default() - Grid_Col_Span_Number() - Grid_Col_Span_GridColColumnOption() - Grid_Col_Order_Default() - Grid_Col_Order_Number() - Grid_Col_Order_GridColColumnOption() - Grid_Col_Offset_Default() - Grid_Col_Offset_Number() - Grid_Col_Offset_GridColColumnOption() - - Grid_Row_Columns() - Grid_Row_Columns_Option() - Grid_Row_Columns_Default() - Grid_Row_Gutter() - Gutter_Length_Resource() - Gutter_Length_Default() - Grid_Row_GutterOption_Number() - Grid_Row_GutterOption_Default() - Grid_Row_Direction_Row() - Grid_Row_Direction_RowReverse() - Grid_Row_Length_String() - Grid_Row_SizeOption() - Grid_Row_GutterOption_String() - Grid_Row_Breakpoints_Default() - Grid_Row_Breakpoints_Component() - Grid_Row_Breakpoints_Window() - Grid_Row_Breakpoints_Change() - Grid_Row_Breakpoints_Incremental() - Grid_Row_Breakpoints_Negative() - Grid_Row_Breakpoints_Quantity() - GridRow_onBreakpoint() - - Grid_RowCol_TemplateChange() - Grid_RowCol_GridSize() - Grid_RowCol_PadMar() - Grid_RowCol_Gap() - Grid_RowCol_LayoutDirection() - Grid_RowCol_maxCount() - Grid_RowCol_cellLength() - AlignSpaceEvenly_NoSpace() - AlignSpaceEvenly_AddPadding() - AlignSpaceEvenly_AddMargin() - AlignSpaceEvenly_AddAllSpace() - AlignSpaceEvenly_AddAlign() - AlignSpaceEvenly_AddOffset() - AlignSpaceEvenly_AddVisibility() - AlignSpaceEvenly_AddLayoutWeight() - AlignSpaceEvenly_AddOneWidth() - AlignSpaceEvenly_AddOneMargin() - AlignStart_NoSpace() - AlignStart_AddPadding() - AlignStart_AddMargin() - AlignStart_AddAllSpace() - AlignStart_AddAlign() - AlignStart_AddOffset() - AlignStart_AddVisibility() - AlignStart_AddLayoutWeight() - AlignStart_AddOneWidth() - AlignStart_AddOneMargin() - AlignCenter_NoSpace() - AlignCenter_AddPadding() - AlignCenter_AddMargin() - AlignCenter_AddAllSpace() - AlignCenter_AddAlign() - AlignCenter_AddOffset() - AlignCenter_AddVisibility() - AlignCenter_AddLayoutWeight() - AlignCenter_AddOneWidth() - AlignCenter_AddOneMargin() - AlignEnd_NoSpace() - AlignEnd_AddPadding() - AlignEnd_AddMargin() - AlignEnd_AddAllSpace() - AlignEnd_AddAlign() - AlignEnd_AddOffset() - AlignEnd_AddVisibility() - AlignEnd_AddLayoutWeight() - AlignEnd_AddOneWidth() - AlignEnd_AddOneMargin() - flex_AlignContent_SpaceBetween_FlexSizeTest(); - flex_AlignContent_SpaceBetween_FlexPadTest(); - flex_AlignContent_SpaceBetween_FlexMarTest(); - flex_AlignContent_SpaceBetween_FlexMarPadTest(); - flex_AlignContent_SpaceBetween_TextSizeTest(); - flex_AlignContent_SpaceBetween_TextMarTest(); - flex_AlignContent_SpaceBetween_TextOffsetTest(); - flex_AlignContent_SpaceBetween_TextVisibilityTest(); - flex_AlignContent_SpaceAround_FlexSizeTest(); - flex_AlignContent_SpaceAround_FlexPadTest(); - flex_AlignContent_SpaceAround_FlexMarTest(); - flex_AlignContent_SpaceAround_FlexMarPadTest(); - flex_AlignContent_SpaceAround_TextSizeTest(); - flex_AlignContent_SpaceAround_TextMarTest(); - flex_AlignContent_SpaceAround_TextOffsetTest(); - flex_AlignContent_SpaceAround_TextVisibilityTest(); - Tabs_itemPadMar(); - Tabs_itemSize(); - tabs_IndexTest(); - tabs_PadMarTest(); - tabs_WidHeiTest(); - Tabs_barMode(); - Tabs_barPosition(); - Tabs_barWidHei(); - Tabs_scrollable(); - flexWrapReverse_notFixedParent() - flexWrapReverse_notFixedParentPadding() - flexWrapReverse_notFixedParentMargin() - flexWrapReverse_fixedParent() - flexWrapReverse_fixedParentPadding() - flexWrapReverse_fixedParentMargin() - flexWrapReverse_fixedParentMarPad() - flexWrapReverse_fixedParentChildVisibility() - flexWrapReverse_fixedParentChildPosition() - flexWrapReverse_fixedParentChildLayoutWeight() - flexWrapReverse_fixedParentChildDisplayPriority() - flexAlign_SpaceBetween_fixedChild() - flexAlign_SpaceBetween_fixedChildParentPadding() - flexAlign_SpaceBetween_fixedChildParentMargin() - flexAlign_SpaceBetween_fixedChildParentMarPad() - flexAlign_SpaceBetween_fixedChildParentItemAlignEnd() - flexAlign_SpaceBetween_fixedParent() - flexAlign_SpaceBetween_fixedParentVisibility() - flexAlign_SpaceBetween_fixedParentChangeFirst() - flexAlign_SpaceBetween_fixedParentChangeFirstWidth() - flexAlign_SpaceBetween_fixedParentMarginFirst() - flexAlign_SpaceAround_fixedChild() - flexAlign_SpaceAround_fixedChildParentPadding() - flexAlign_SpaceAround_fixedChildParentMargin() - flexAlign_SpaceAround_fixedChildParentMarPad() - flexAlign_SpaceAround_fixedChildParentItemAlignEnd() - flexAlign_SpaceAround_fixedParent() - flexAlign_SpaceAround_fixedParentVisibility() - flexAlign_SpaceAround_fixedParentChangeFirst() - flexAlign_SpaceAround_fixedParentChangeFirstWidth() - flexAlign_SpaceAround_fixedParentMarginFirst() - column_WidthHeight_ChangeParent() - column_Padding_ChangeParent() - column_Margin_ChangeParent() - column_MarPad_ChangeParent() - column_AlignItems_ChangeParent() - column_JustifyContent_ChangeParent() - listItem_SizeChange() - listItem_Margin() - listItem_Padding() - listItem_PadMar() - listItem_Visibility() - listItem_Position() - listItem_Offset() - listItem_InSertChange() - ColumnWidthHeight_SubChange() - ColumnSetPadding_SubChange() - ColumnSetPadding_SubChangeMar() - ColumnSetPadding_SubChangePad() - ColumnSetMargin_SubChange() - ColumnSetMargin_SubChangeMar() - ColumnSetMargin_SubChangePad() - ColumnSetPaddingMargin_SubChange() - ColumnSetPaddingMargin_SubChangeMar() - ColumnSetPaddingMargin_SubChangePad() - ColumnSetPosition_SubChange() - ColumnSetOffset_SubChange() - ColumnSetDisplayPriority_SubChange() - ColumnSetLayoutWeight_SubChange() - ColumnSetLayoutWeightNone_SubChange() - ColumnSetFlexShink_SubChange() - ColumnSetFlexShinkNone_SubChange() - ColumnSetVisibility_SubChange() - flex_NoWrap_FlexSizeTest(); - flex_NoWrap_PaddingTest(); - flex_NoWrap_TextSizeTest(); - flex_NoWrap_FlexPad_TextMarPadTest(); - flex_NoWrap_FlexMar_TextMarPadTest(); - flex_NoWrap_FlexMarPad_TextMarPadTest(); - flex_NoWrap_VisibilityTest(); - flex_NoWrap_LayoutWeightTest(); - flex_NoWrap_DisplayPriorityTest(); - flex_NoWrap_PositionTest(); - flex_Wrap_FlexSizeTest(); - flex_Wrap_PaddingTest(); - flex_Wrap_TextSizeTest(); - flex_Wrap_FlexPad_TextMarPadTest(); - flex_Wrap_FlexMar_TextMarPadTest(); - flex_Wrap_FlexMarPad_TextMarPadTest(); - flex_Wrap_VisibilityTest(); - flex_Wrap_PositionTest(); - flex_Wrap_LayoutWeightTest(); - flex_Wrap_DisplayPriorityTest(); - row_TextSizeTest(); - rowPad_TextMarPadTest(); - rowMar_TextMarPadTest(); - rowMarPad_TextMarPadTest(); - row_TextPositionTest(); - row_TextOffsetTest(); - row_TextDisplayPriorityTest(); - row_TextLayoutWeightTest(); - row_TextFlexShrinkTest(); - row_TextVisibilityTest(); - grid_RowCol_ItemPadMarTest(); - grid_RowCol_ItemOffsetTest(); - grid_RowCol_ItemPositionTest(); - grid_RowCol_ItemVisibilityTest(); - grid_RowCol_ItemContentSizeTest(); - grid_RowCol_ItemColumnStartEnd() - grid_RowCol_ItemRowStartEnd() - list_ListInitialIndex1Test(); - list_ListInitialIndex2Test(); - list_ListInitialIndex3Test(); - list_ListInitialIndex4Test(); - list_ListInitialIndex5Test(); - list_ListInitialIndex6Test(); - list_SpaceChangeTest(); - List_alignListItem(); - List_divider(); - List_lanes(); - List_ListDirection(); - List_ListSize(); - List_Margin(); - List_Padding(); - List_PadMar(); - Stack_AlignContent(); - Stack_Offset_Change(); - Stack_Position_Change(); - Stack_ZIndex(); - Row_FlexAlign(); - Row_Margin(); - Row_MarginPadding(); - Row_Padding(); - Row_Size(); - Row_VerticalAlign(); - list_ListFrictionTest(); - grid_GridFrictionTest(); - waterFlow_WaterFlowFrictionTest(); - scroll_ScrollFrictionTest(); - AlignContentFlex_Start(); - AlignContent_FlexAlign_Start_Margin(); - AlignContent_FlexAlign_Start_Margin_padding(); - AlignContent_FlexAlign_Start_padding(); - AlignContent_Start_FlexP_fixed(); - AlignContent_Start_FlexP_Fixed_Margin(); - AlignContent_Start_FlexP_Fixed_Offset(); - AlignContent_Start_FlexP_Fixed_Visibility(); - AlignContentFlexJsunit(); - AlignContentFlexP_fixed(); - AlignContentFlexP_Fixed_Margin(); - AlignContentFlexP_Fixed_Offset(); - AlignContentFlexP_Fixed_Visibility(); - AlignContent_FlexAlign_SpaceEvenly_Margin(); - AlignContent_FlexAlign_SpaceEvenly_Margin_padding(); - AlignContent_FlexAlign_SpaceEvenly_padding(); - AlignContentFlex_End(); - AlignContent_End_FlexP_fixed(); - AlignContent_End_FlexP_Fixed_Margin(); - AlignContent_End_FlexP_Fixed_Offset(); - AlignContent_End_FlexP_Fixed_Visibility(); - AlignContent_FlexAlign_End_Margin(); - AlignContent_FlexAlign_End_Margin_padding(); - AlignContent_FlexAlign_End_padding(); - AlignContentFlex_Center(); - AlignContent_Center_FlexP_fixed(); - AlignContent_Center_FlexP_Fixed_Margin(); - AlignContent_Center_FlexP_Fixed_Offset(); - AlignContent_Center_FlexP_Fixed_Visibility(); - AlignContent_FlexAlign_Center_Margin(); - AlignContent_FlexAlign_Center_Margin_padding(); - AlignContent_FlexAlign_Center_padding(); -} \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/entry/src/main/resources/base/profile/main_pages.json deleted file mode 100644 index cc17c41a08221b9bce93ff4e5bf49298d27fc6c9..0000000000000000000000000000000000000000 --- a/arkui/ace_ets_layout_test/entry/src/main/resources/base/profile/main_pages.json +++ /dev/null @@ -1,414 +0,0 @@ -{ - "src": [ - "MainAbility/pages/index/index", - "MainAbility/pages/Column/columnNesting/columnNesting_alignItems", - "MainAbility/pages/Column/columnNesting/columnNesting_justifyContent", - "MainAbility/pages/Column/columnNesting/columnNesting_Space", - "MainAbility/pages/Column/flexBasis/flexBasis_Default", - "MainAbility/pages/Column/flexBasis/flexBasis_Type", - "MainAbility/pages/Column/flexGrow/flexGrow_Default", - "MainAbility/pages/Column/flexGrow/flexGrow_Part", - "MainAbility/pages/Column/flexShrink/flexShrink_Default", - "MainAbility/pages/Column/flexShrink/flexShrink_Part", - "MainAbility/pages/Column/layoutWeight/layoutWeight_All", - "MainAbility/pages/Column/layoutWeight/layoutWeight_Default", - "MainAbility/pages/Column/layoutWeight/layoutWeight_flexGrow", - "MainAbility/pages/Column/layoutWeight/layoutWeight_flexShrink", - "MainAbility/pages/Column/layoutWeight/layoutWeight_Part", - "MainAbility/pages/Column/ParentComponentChanged/Column_AlignItems_ChangeParent", - "MainAbility/pages/Column/ParentComponentChanged/Column_JustifyContent_ChangeParent", - "MainAbility/pages/Column/ParentComponentChanged/Column_Margin_ChangeParent", - "MainAbility/pages/Column/ParentComponentChanged/Column_MarPad_ChangeParent", - "MainAbility/pages/Column/ParentComponentChanged/Column_Padding_ChangeParent", - "MainAbility/pages/Column/ParentComponentChanged/Column_WidthHeight_ChangeParent", - "MainAbility/pages/Column/spaceChanged/Column_Space", - "MainAbility/pages/Column/spaceChanged/Column_Space_Default", - "MainAbility/pages/Column/spaceChanged/Column_Space_String", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetDisplayPriority_SubChange", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetFlexShinkNone_SubChange", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetFlexShink_SubChange", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetLayoutWeightNone_SubChange", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetLayoutWeight_SubChange", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChange", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChangeMar", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetMargin_SubChangePad", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetOffset_SubChange", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChange", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChangeMar", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetPaddingMargin_SubChangePad", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChange", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChangeMar", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetPadding_SubChangePad", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetPosition_SubChange", - "MainAbility/pages/Column/subcomponentChanged/ColumnSetVisibility_SubChange", - "MainAbility/pages/Column/subcomponentChanged/ColumnWidthHeight_SubChange", - "MainAbility/pages/Flex/alignContent/Center/AlignContentFlex_Center", - "MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_fixed", - "MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Margin", - "MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Offset", - "MainAbility/pages/Flex/alignContent/Center/AlignContent_Center_FlexP_Fixed_Visibility", - "MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin", - "MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_Margin_padding", - "MainAbility/pages/Flex/alignContent/Center/AlignContent_FlexAlign_Center_padding", - "MainAbility/pages/Flex/alignContent/End/AlignContentFlex_End", - "MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_fixed", - "MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Margin", - "MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Offset", - "MainAbility/pages/Flex/alignContent/End/AlignContent_End_FlexP_Fixed_Visibility", - "MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin", - "MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_Margin_padding", - "MainAbility/pages/Flex/alignContent/End/AlignContent_FlexAlign_End_padding", - "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMar", - "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexMarPad", - "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad", - "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize", - "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextMar", - "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextOffset", - "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextSize", - "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_TextVisibility", - "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexMar", - "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexMarPad", - "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexPad", - "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexSize", - "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextMar", - "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextOffset", - "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextSize", - "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_TextVisibility", - "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlex", - "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_fixed", - "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Margin", - "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Offset", - "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContentFlexP_Fixed_Visibility", - "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin", - "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_Margin_padding", - "MainAbility/pages/Flex/alignContent/SpaceEvenly/AlignContent_FlexAlign_SpaceEvenly_padding", - "MainAbility/pages/Flex/alignContent/Start/AlignContentFlex_Start", - "MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin", - "MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_Margin_padding", - "MainAbility/pages/Flex/alignContent/Start/AlignContent_FlexAlign_Start_padding", - "MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_fixed", - "MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Margin", - "MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Offset", - "MainAbility/pages/Flex/alignContent/Start/AlignContent_Start_FlexP_Fixed_Visibility", - "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexAlignSelf", - "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexBase", - "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexExceed", - "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexHeightModify", - "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexMargin", - "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexOffset", - "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexPadding", - "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexTextMargin", - "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexVisibility", - "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexAlignSelf", - "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexBase", - "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexExceed", - "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexHeightModify", - "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexMargin", - "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexOffset", - "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexPadding", - "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexTextMargin", - "MainAbility/pages/Flex/alignItems/ItemAlign_Baseline/FlexVisibility", - "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexAlignSelf", - "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexBase", - "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexExceed", - "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexHeightModify", - "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexMargin", - "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexOffset", - "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexPadding", - "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexTextMargin", - "MainAbility/pages/Flex/alignItems/ItemAlign_Center/FlexVisibility", - "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexAlignSelf", - "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexBase", - "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexExceed", - "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexHeightModify", - "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexMargin", - "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexOffset", - "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexPadding", - "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexTextMargin", - "MainAbility/pages/Flex/alignItems/ItemAlign_End/FlexVisibility", - "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexAlignSelf", - "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexBase", - "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexExceed", - "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexHeightModify", - "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexMargin", - "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexOffset", - "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexPadding", - "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexTextMargin", - "MainAbility/pages/Flex/alignItems/ItemAlign_Start/FlexVisibility", - "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexAlignSelf", - "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexBase", - "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexExceed", - "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexHeightModify", - "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexMargin", - "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexOffset", - "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexPadding", - "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexTextMargin", - "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexVisibility", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAlign", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAllSpace", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddMargin", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOffset", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneMargin", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneWidth", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddPadding", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddVisibility", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_NoSpace", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAlign", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAllSpace", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddLayoutWeight", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddMargin", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOffset", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneMargin", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneWidth", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddPadding", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddVisibility", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_NoSpace", - "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChild", - "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentItemAlignEnd", - "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMargin", - "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentMarPad", - "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedChildParentPadding", - "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParent", - "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirst", - "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentChangeFirstWidth", - "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentMarginFirst", - "MainAbility/pages/Flex/justifyContent/SpaceAround/FlexAlign_SpaceAround_fixedParentVisibility", - "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChild", - "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentItemAlignEnd", - "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMargin", - "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentMarPad", - "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedChildParentPadding", - "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParent", - "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirst", - "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentChangeFirstWidth", - "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentMarginFirst", - "MainAbility/pages/Flex/justifyContent/SpaceBetween/FlexAlign_SpaceBetween_fixedParentVisibility", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAlign", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAllSpace", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddLayoutWeight", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddMargin", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOffset", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneMargin", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneWidth", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddPadding", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddVisibility", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_NoSpace", - "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_DisplayPriority", - "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMarPad_TextMarPad", - "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexMar_TextMarPad", - "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexPad_TextMarPad", - "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_FlexSize", - "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_LayoutWeight", - "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Padding", - "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Position", - "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_TextSize", - "MainAbility/pages/Flex/Wrap/NoWrap/Flex_NoWrap_Visibility", - "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_DisplayPriority", - "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexMarPad_TextMarPad", - "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexMar_TextMarPad", - "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexPad_TextMarPad", - "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_FlexSize", - "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_LayoutWeight", - "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Padding", - "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Position", - "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_TextSize", - "MainAbility/pages/Flex/Wrap/Wrap/Flex_Wrap_Visibility", - "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParent", - "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildDisplayPriority", - "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildLayoutWeight", - "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildPosition", - "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentChildVisibility", - "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMargin", - "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentMarPad", - "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_fixedParentPadding", - "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParent", - "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentMargin", - "MainAbility/pages/Flex/Wrap/WrapReverse/FlexWrapReverse_notFixedParentPadding", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemColumnStartEnd", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemContentSize", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemOffset", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPadMar", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemPosition", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange", - "MainAbility/pages/List/List_attribute/ListFrictionPage", - "MainAbility/pages/List/List_initialIndex/List_ListInitialIndex1", - "MainAbility/pages/List/List_initialIndex/List_ListInitialIndex2", - "MainAbility/pages/List/List_initialIndex/List_ListInitialIndex3", - "MainAbility/pages/List/List_initialIndex/List_ListInitialIndex4", - "MainAbility/pages/List/List_initialIndex/List_ListInitialIndex5", - "MainAbility/pages/List/List_initialIndex/List_ListInitialIndex6", - "MainAbility/pages/List/List_Space/ListChange/List_alignListItem", - "MainAbility/pages/List/List_Space/ListChange/List_divider", - "MainAbility/pages/List/List_Space/ListChange/List_lanes", - "MainAbility/pages/List/List_Space/ListChange/List_ListDirection", - "MainAbility/pages/List/List_Space/ListChange/List_ListSize", - "MainAbility/pages/List/List_Space/ListChange/List_Margin", - "MainAbility/pages/List/List_Space/ListChange/List_Padding", - "MainAbility/pages/List/List_Space/ListChange/List_PadMar", - "MainAbility/pages/List/List_Space/ListItemChange/ListItem_InSertChange", - "MainAbility/pages/List/List_Space/ListItemChange/ListItem_Margin", - "MainAbility/pages/List/List_Space/ListItemChange/ListItem_Offset", - "MainAbility/pages/List/List_Space/ListItemChange/ListItem_Padding", - "MainAbility/pages/List/List_Space/ListItemChange/ListItem_PadMar", - "MainAbility/pages/List/List_Space/ListItemChange/ListItem_Position", - "MainAbility/pages/List/List_Space/ListItemChange/ListItem_SizeChange", - "MainAbility/pages/List/List_Space/ListItemChange/ListItem_Visibility", - "MainAbility/pages/List/List_SpaceChange/List_SpaceChange", - "MainAbility/pages/Row/parentComponentChanged/Row_FlexAlign", - "MainAbility/pages/Row/parentComponentChanged/Row_Margin", - "MainAbility/pages/Row/parentComponentChanged/Row_MarginPadding", - "MainAbility/pages/Row/parentComponentChanged/Row_Padding", - "MainAbility/pages/Row/parentComponentChanged/Row_Size", - "MainAbility/pages/Row/parentComponentChanged/Row_VerticalAlign", - "MainAbility/pages/Row/subComponentChanged/RowMarPad_TextMarPad", - "MainAbility/pages/Row/subComponentChanged/RowMar_TextMarPad", - "MainAbility/pages/Row/subComponentChanged/RowPad_TextMarPad", - "MainAbility/pages/Row/subComponentChanged/Row_TextDisplayPriority", - "MainAbility/pages/Row/subComponentChanged/Row_TextFlexShrink", - "MainAbility/pages/Row/subComponentChanged/Row_TextLayoutWeight", - "MainAbility/pages/Row/subComponentChanged/Row_TextOffset", - "MainAbility/pages/Row/subComponentChanged/Row_TextPosition", - "MainAbility/pages/Row/subComponentChanged/Row_TextSize", - "MainAbility/pages/Row/subComponentChanged/Row_TextVisibility", - "MainAbility/pages/Stack/StackItem_change/stack_offset_change", - "MainAbility/pages/Stack/StackItem_change/stack_position_change", - "MainAbility/pages/Stack/StackItem_change/stack_zIndex", - "MainAbility/pages/Stack/Stack_alignContent/stack_alignContent", - "MainAbility/pages/Stack/Stack_change/stackAlignChange", - "MainAbility/pages/Stack/Stack_change/stackMarginChange", - "MainAbility/pages/Stack/Stack_change/stackNoneSettingWidthHeight", - "MainAbility/pages/Stack/Stack_change/stackPaddingChange", - "MainAbility/pages/Stack/Stack_change/stackSizeChange", - "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemMargin", - "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadding", - "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadMar", - "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize", - "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize2", - "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemVisibility", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_1", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_2", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_3", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperAutoPlay_4", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeTrue", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperIndex", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperItemSpace", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopFalse", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopTrue", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperMargin", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperMarPad", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperPadding", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperVertical", - "MainAbility/pages/RelativeContainer/RelativeContainer_Level/RelativeContainer_Level", - "MainAbility/pages/RelativeContainer/RelativeContainer_Vertical/RelativeContainer_Vertical", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Absent", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Circular_Dependency", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Interdependence", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Margin", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Padding", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_ThreeDirection", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_TwoDirection", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_Hidden", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Visibility_None", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_NoId", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Null", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Id_Undefined", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Offset", - "MainAbility/pages/RelativeContainer/RelativeContainer_AnchorPoint/RelativeContainer_AnchorPoint_Position", - - "MainAbility/pages/Row/spaceChanged/Row_Space", - "MainAbility/pages/Row/spaceChanged/Row_Space_String", - "MainAbility/pages/Row/spaceChanged/Row_Space_Default", - "MainAbility/pages/Row/layoutWeight/Row_layoutWeight_All", - "MainAbility/pages/Row/layoutWeight/Row_layoutWeight_Default", - "MainAbility/pages/Row/layoutWeight/Row_layoutWeight_flexGrow", - "MainAbility/pages/Row/layoutWeight/Row_layoutWeight_flexShrink", - "MainAbility/pages/Row/layoutWeight/Row_layoutWeight_Part", - "MainAbility/pages/Row/flexGrow/Row_flexGrow_Default", - "MainAbility/pages/Row/flexGrow/Row_flexGrow_Part", - "MainAbility/pages/Row/flexShrink/Row_flexShrink_Default", - "MainAbility/pages/Row/flexShrink/Row_flexShrink_Part", - "MainAbility/pages/Row/flexBasis/Row_flexBasis_Default", - "MainAbility/pages/Row/flexBasis/Row_flexBasis_Type", - "MainAbility/pages/Row/RowNesting/rowNesting_Space", - "MainAbility/pages/Row/RowNesting/rowNesting_alignItems", - "MainAbility/pages/Row/RowNesting/rowNesting_justifyContent", - - "MainAbility/pages/Column/layoutWeight/layoutWeight_Part", - "MainAbility/pages/Column/layoutWeight/layoutWeight_All", - "MainAbility/pages/Column/layoutWeight/layoutWeight_Default", - "MainAbility/pages/Column/layoutWeight/layoutWeight_flexGrow", - "MainAbility/pages/Column/layoutWeight/layoutWeight_flexShrink", - "MainAbility/pages/Column/flexGrow/flexGrow_Part", - "MainAbility/pages/Column/flexGrow/flexGrow_Default", - "MainAbility/pages/Column/flexShrink/flexShrink_Part", - "MainAbility/pages/Column/flexBasis/flexBasis_Type", - "MainAbility/pages/Column/flexBasis/flexBasis_Default", - "MainAbility/pages/Column/columnNesting/columnNesting_Space", - "MainAbility/pages/Column/columnNesting/columnNesting_alignItems", - "MainAbility/pages/Column/columnNesting/columnNesting_justifyContent", - - "MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Default", - "MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_Number", - "MainAbility/pages/Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_GridColColumnOption", - "MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Default", - "MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_Number", - "MainAbility/pages/Grid/Grid_Col/Grid_Col_Order/Grid_Col_Order_GridColColumnOption", - "MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Default", - "MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_Number", - "MainAbility/pages/Grid/Grid_Col/Grid_Col_Offset/Grid_Col_Offset_GridColColumnOption", - - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Default", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Columns/Grid_Row_Columns_Option", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Gutter", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Length_String", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Default", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_SizeOption", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Change", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Component", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Window", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Default", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Incremental", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Negative", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Breakpoints/Grid_Row_Breakpoints_Quantity", - "MainAbility/pages/Grid/Grid_Row/onBreakpointChange/onBreakpointChange", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row", - "MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse", - "MainAbility/pages/Grid/Grid_attribute/GridFrictionPage", - "MainAbility/pages/Tabs/tabs_index/Tabs_index", - "MainAbility/pages/Tabs/Tabs_ItemsChange/Tabs_itemPadMar", - "MainAbility/pages/Tabs/Tabs_ItemsChange/Tabs_itemSize", - "MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barMode", - "MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barPosition", - "MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_barWidHei", - "MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_PadMar", - "MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_scrollable", - "MainAbility/pages/Tabs/Tabs_ParmsChange/Tabs_WidHei", - "MainAbility/pages/Scroll/Scroll_attribute/ScrollFrictionPage", - "MainAbility/pages/WaterFlow/WaterFlow_attribute/WaterFlowFrictionPage" - ] -} \ No newline at end of file