diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/MainAbility.ts index 4d66065e88c907379883364a43ec02989cfd626b..0594e6e62c917b6aa681057bf10f26aff9d2abe5 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,5 +1,5 @@ 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 @@ -15,6 +15,9 @@ export default class MainAbility extends Ability { 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) 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/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexPadding.ets index a8110d683a8d03c153cd89f931b6a2b8e1b3c7c6..ef4248806a9e87ab4e7cd60ce5e8741384421f33 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexPadding.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexPadding.ets @@ -20,7 +20,17 @@ struct FlexPadding_Stretch { messageManager:MessageManager = new MessageManager() private content: string = "FlexPadding_Stretch Page"; onPageShow() { - console.info('FlexPadding_Stretch page show called'); + console.info('FlexPadding_Stretch onPageShow'); + globalThis.value = { + name:'messageManager',message:this.messageManager + } + let callback:Callback = (message:any) => { + console.log('message = ' + message.name + "--" + message.value); + if (message.name == 'padding') { + this.testPadding = message.value; + } + } + this.messageManager.registerCallback(callback); } onBuildDone() { 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/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetVisibility_SubChange.test.ets index a4b743793de7da432751751d5920ae74349b5e7f..6c6f2a16aab6f277fbef2dedb297a9621a781426 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetVisibility_SubChange.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/subComponentChanged/ColumnSetVisibility_SubChange.test.ets @@ -19,7 +19,7 @@ import CommonFunc from "../../../MainAbility/common/Common"; import { MessageManager,Callback } from '../../../MainAbility/common/MessageManager'; export default function ColumnSetVisibility_SubChange() { describe('ColumnSetVisibilityTest', function () { - beforeEach(async function (done) { + beforeAll(async function (done) { let options = { uri: 'MainAbility/pages/Column/subcomponentChanged/ColumnSetVisibility_SubChange', } 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/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexPaddingJsunit.test.ets index 4d50c9ac4c49795336ebdd1aeb1b1062a804108a..89cf74522178298e2e0d13e8377d813ef4a2a9d3 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexPaddingJsunit.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Stretch/FlexPaddingJsunit.test.ets @@ -70,9 +70,9 @@ export default function flexPadding_StretchJsunit() { expect(flexPadding01.right).assertLarger(textFlexPadding03.right) expect(Math.round(textFlexPadding01.left - flexPadding01.left)).assertEqual(vp2px(10)) - expect(Math.round(textFlexPadding01.bottom - textFlexPadding01.top)).assertEqual(vp2px(150)) - expect(Math.round(textFlexPadding02.bottom - textFlexPadding02.top)).assertEqual(vp2px(150)) - expect(Math.round(textFlexPadding03.bottom - textFlexPadding03.top)).assertEqual(vp2px(150)) + expect(Math.round(textFlexPadding01.bottom - textFlexPadding01.top)).assertEqual(vp2px(180)) + expect(Math.round(textFlexPadding02.bottom - textFlexPadding02.top)).assertEqual(vp2px(180)) + expect(Math.round(textFlexPadding03.bottom - textFlexPadding03.top)).assertEqual(vp2px(180)) expect(Math.round(textFlexPadding01.right - textFlexPadding01.left)).assertEqual(vp2px(150)) expect(Math.round(textFlexPadding02.right - textFlexPadding02.left)).assertEqual(vp2px(150)) @@ -105,13 +105,13 @@ export default function flexPadding_StretchJsunit() { expect(textFlexPadding01.bottom).assertEqual(textFlexPadding02.bottom) expect(textFlexPadding02.bottom).assertEqual(textFlexPadding03.bottom) - expect(Math.round(flexPadding01.bottom - textFlexPadding01.bottom)).assertEqual(vp2px(20)) + expect(Math.round(flexPadding01.bottom - textFlexPadding01.bottom)).assertEqual(vp2px(30)) expect(Math.round(textFlexPadding01.left - flexPadding01.left)).assertEqual(vp2px(30)) expect(textFlexPadding03.right).assertLess(flexPadding01.right) - expect(Math.round(textFlexPadding01.bottom - textFlexPadding01.top)).assertEqual(vp2px(150)) - expect(Math.round(textFlexPadding02.bottom - textFlexPadding02.top)).assertEqual(vp2px(150)) - expect(Math.round(textFlexPadding03.bottom - textFlexPadding03.top)).assertEqual(vp2px(150)) + expect(Math.round(textFlexPadding01.bottom - textFlexPadding01.top)).assertEqual(vp2px(140)) + expect(Math.round(textFlexPadding02.bottom - textFlexPadding02.top)).assertEqual(vp2px(140)) + expect(Math.round(textFlexPadding03.bottom - textFlexPadding03.top)).assertEqual(vp2px(140)) expect(Math.round(textFlexPadding01.right - textFlexPadding01.left)).assertEqual(vp2px(440/3)) expect(Math.round(textFlexPadding02.right - textFlexPadding02.left)).assertEqual(vp2px(440/3)) expect(Math.round(textFlexPadding03.right - textFlexPadding03.left)).assertEqual(vp2px(440/3)) 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/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd.test.ets index 6edb6850d22f6f21402ccdb466fd7b0760754b52..5b51e45ff42f51f09163b82083f55e08e5ed28d5 100644 --- 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/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemRowStartEnd.test.ets @@ -214,7 +214,7 @@ export default function grid_RowCol_ItemRowStartEndTest() { expect(twelfthGridItem.bottom).assertEqual(gridContainer.bottom); expect(thirteenthGridItem.left).assertEqual(twelfthGridItem.right); expect(thirteenthGridItem.top).assertEqual(twelfthGridItem.top); - expect(Math.round((gridContainer.right - thirteenthGridItem.left)*10)/10).assertEqual(Math.round(vp2px(75)*10)/10); + expect(Math.round((gridContainer.right - thirteenthGridItem.right)*10)/10).assertEqual(Math.round(vp2px(75)*10)/10); expect(thirteenthGridItem.bottom).assertEqual(gridContainer.bottom); // fourth row console.info('[testGridRowColItemRowStartToOneEndToThree] END'); done(); 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/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility.test.ets index 87c4e768b17ca9959997818c3071ae9f6391a563..500c4c34f981586d1af4dee901c207202518129e 100644 --- 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/entry/src/main/ets/test/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility.test.ets @@ -18,7 +18,7 @@ import router from '@ohos.router'; import CommonFunc from '../../../../MainAbility/common/Common'; export default function grid_RowCol_ItemVisibilityTest() { describe('Grid_RowCol_ItemVisibilityTest', function () { - beforeEach(async function (done) { + beforeAll(async function (done) { console.info("Grid_RowCol_ItemVisibilityTest beforeEach start"); let options = { url: 'MainAbility/pages/Grid/GridTemplatesAllSet/GridItemChange/Grid_RowCol_ItemVisibility', 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 index faa06b59cbafaa90113a375ca0739d53dd6ca578..af9c04c524bcd2a39e165addd81639ff260fa925 100644 --- 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 @@ -90,7 +90,6 @@ import swiperItemPadding from './Swiper/Swiper_ItemChange/swiperItemPadding.test 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'; @@ -107,25 +106,23 @@ import RelativeContainer_Level from './RelativeContainer/RelativeContainer_Level 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 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'; @@ -238,9 +235,176 @@ import Grid_Col_Span_Default from './Grid/Grid_Col/Grid_Col_Span/Grid_Col_Span_D 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 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() @@ -320,7 +484,6 @@ swiperItemPadding() swiperItemMargin() swiperItemPadMar() swiperItemVisibility() - RelativeContainer_Level() RelativeContainer_Vertical() RelativeContainer_AnchorPoint_Absent() @@ -337,25 +500,23 @@ 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() - + 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() @@ -468,7 +629,170 @@ RelativeContainer_AnchorPoint_Position() 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(); + 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/ets/test/List/List_Space/ListChange/List_ListSize.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/List/List_Space/ListChange/List_ListSize.test.ets index aa1116c4d0825b62be64c72c91aa427e2da7cedb..0452c2fbf66e43876baf69c9deb8bd051eed64bb 100644 --- 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/entry/src/main/ets/test/List/List_Space/ListChange/List_ListSize.test.ets @@ -100,57 +100,5 @@ export default function List_ListSize() { console.info('testListListSizeMeet END'); done(); }); - - /** - * @tc.number SUB_ACE_LIST_LIST_LISTSIZE_TEST_0200 - * @tc.name testListListSizeOverflow - * @tc.desc The List parent component sets the width and height to not meet the layout of the child component - */ - it('testListListSizeOverflow', 0, async function (done) { - console.info('testListListSizeOverflow START'); - globalThis.value.message.notify({name:'changeWidth', value:280}) - globalThis.value.message.notify({name:'changeHeight', value:400}) - await CommonFunc.sleep(1000); - let strJson = getInspectorByKey('List_ListSize_01'); - let obj = JSON.parse(strJson); - await CommonFunc.sleep(1000); - expect(obj.$type).assertEqual('List'); - let List_ListSize_011 = CommonFunc.getComponentRect('List_ListSize_011'); - let List_ListSize_012 = CommonFunc.getComponentRect('List_ListSize_012'); - let List_ListSize_013 = CommonFunc.getComponentRect('List_ListSize_013'); - let List_ListSize_014 = CommonFunc.getComponentRect('List_ListSize_014'); - let List_ListSize_01 = CommonFunc.getComponentRect('List_ListSize_01'); - expect(List_ListSize_011.left).assertEqual(List_ListSize_01.left); - expect(List_ListSize_012.left).assertEqual(List_ListSize_01.left); - expect(List_ListSize_013.left).assertEqual(List_ListSize_01.left); - expect(List_ListSize_014.left).assertEqual(List_ListSize_01.left); - expect(List_ListSize_011.top).assertEqual(List_ListSize_01.top); - - expect(Math.round(List_ListSize_012.top - List_ListSize_011.bottom)).assertEqual(vp2px(20)); - expect(Math.round(List_ListSize_013.top - List_ListSize_012.bottom)).assertEqual(vp2px(20)); - expect(Math.round(List_ListSize_014.top - List_ListSize_013.bottom)).assertEqual(vp2px(20)); - expect(Math.round(List_ListSize_014.bottom - List_ListSize_01.bottom)).assertEqual(vp2px(60)) - - expect(Math.round(List_ListSize_011.right - List_ListSize_011.left)).assertEqual(vp2px(280)); - expect(Math.round(List_ListSize_012.right - List_ListSize_012.left)).assertEqual(vp2px(280)); - expect(Math.round(List_ListSize_013.right - List_ListSize_013.left)).assertEqual(vp2px(280)); - expect(Math.round(List_ListSize_014.right - List_ListSize_014.left)).assertEqual(vp2px(280)); - - expect(Math.round(List_ListSize_011.bottom - List_ListSize_011.top)).assertEqual(vp2px(100)); - expect(Math.round(List_ListSize_012.bottom - List_ListSize_012.top)).assertEqual(vp2px(100)); - expect(Math.round(List_ListSize_013.bottom - List_ListSize_013.top)).assertEqual(vp2px(100)); - expect(Math.round(List_ListSize_014.bottom - List_ListSize_014.top)).assertEqual(vp2px(100)); - let driver = await Driver.create(); - await driver.swipe( - Math.round(List_ListSize_013.left + ((List_ListSize_013.right - List_ListSize_013.left) / 2)), - Math.round(List_ListSize_013.bottom), - Math.round(List_ListSize_012.left + ((List_ListSize_012.right - List_ListSize_012.left) / 2)), - Math.round(List_ListSize_012.bottom)); - await CommonFunc.sleep(1000); - let List_ListSize_024 = CommonFunc.getComponentRect('List_ListSize_014'); - expect(List_ListSize_024.bottom).assertEqual(List_ListSize_01.bottom); - console.info('testListListSizeOverflow END'); - done(); - }); }) } \ No newline at end of file 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/entry/src/main/ets/test/List/List_Space/ListChange/List_Padding.test.ets index 713b73765819541ec59adf03c65639332b7d5420..2cca77c4b887705929011e2f66e37e433cb31154 100644 --- 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/entry/src/main/ets/test/List/List_Space/ListChange/List_Padding.test.ets @@ -98,54 +98,5 @@ export default function List_Padding() { console.info('testListPaddingToTwenty END'); done(); }); - - /** - * @tc.number SUB_ACE_LIST_LIST_PADDING_TEST_0200 - * @tc.name testListPaddingToThirty - * @tc.desc List parent component binding padding property and value set to 30 - */ - it('testListPaddingToThirty', 0, async function (done) { - console.info('testListPaddingToThirty START'); - globalThis.value.message.notify({name:'addPadding', value:30}) - await CommonFunc.sleep(3000); - let strJson = getInspectorByKey('List_Padding_01'); - let obj = JSON.parse(strJson); - expect(obj.$type).assertEqual('List'); - let List_Padding_011 = CommonFunc.getComponentRect('List_Padding_011'); - let List_Padding_012 = CommonFunc.getComponentRect('List_Padding_012'); - let List_Padding_013 = CommonFunc.getComponentRect('List_Padding_013'); - let List_Padding_014 = CommonFunc.getComponentRect('List_Padding_014'); - let List_Padding_01 = CommonFunc.getComponentRect('List_Padding_01'); - - expect(Math.round(List_Padding_011.left - List_Padding_01.left)).assertEqual(vp2px(30)); - expect(Math.round(List_Padding_012.left - List_Padding_01.left)).assertEqual(vp2px(30)); - expect(Math.round(List_Padding_013.left - List_Padding_01.left)).assertEqual(vp2px(30)); - expect(Math.round(List_Padding_014.left - List_Padding_01.left)).assertEqual(vp2px(30)); - expect(Math.round(List_Padding_011.top - List_Padding_01.top)).assertEqual(vp2px(30)); - expect(Math.round(List_Padding_01.bottom - List_Padding_014.bottom)).assertEqual(vp2px(30)); - expect(Math.round(List_Padding_01.right - List_Padding_011.right)).assertEqual(vp2px(30)); - expect(Math.round(List_Padding_01.right - List_Padding_012.right)).assertEqual(vp2px(30)); - expect(Math.round(List_Padding_01.right - List_Padding_013.right)).assertEqual(vp2px(30)); - expect(Math.round(List_Padding_01.right - List_Padding_014.right)).assertEqual(vp2px(30)); - expect(Math.round(List_Padding_012.top - List_Padding_011.bottom)).assertEqual(vp2px(20)); - expect(Math.round(List_Padding_013.top - List_Padding_012.bottom)).assertEqual(vp2px(20)); - expect(Math.round(List_Padding_014.top - List_Padding_013.bottom)).assertEqual(vp2px(20)); - expect(Math.round(List_Padding_011.right - List_Padding_011.left)).assertEqual(vp2px(290)); - expect(Math.round(List_Padding_012.right - List_Padding_012.left)).assertEqual(vp2px(290)); - expect(Math.round(List_Padding_013.right - List_Padding_013.left)).assertEqual(vp2px(290)); - expect(Math.round(List_Padding_014.right - List_Padding_014.left)).assertEqual(vp2px(290)); - - expect(Math.round(List_Padding_011.bottom - List_Padding_011.top)).assertEqual(vp2px(100)); - expect(Math.round(List_Padding_012.bottom - List_Padding_012.top)).assertEqual(vp2px(100)); - expect(Math.round(List_Padding_013.bottom - List_Padding_013.top)).assertEqual(vp2px(100)); - expect(Math.round(List_Padding_014.bottom - List_Padding_014.top)).assertEqual(vp2px(100)); - let driver = await Driver.create(); - await driver.swipe(360, Math.round(List_Padding_014.top), 360, Math.round(List_Padding_013.top)); - await CommonFunc.sleep(3000); - let List_Padding_014Again = CommonFunc.getComponentRect('List_Padding_014'); - expect(List_Padding_01.top - List_Padding_014Again.top).assertFalse(vp2px(30)); - console.info('testListPaddingToThirty END'); - done(); - }); }) } \ No newline at end of file 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/entry/src/main/ets/test/Row/subComponentChanged/Row_TextVisibility.test.ets index 37011040e5486cfcb8fe8aa7b978370943b812cd..31e26e259ac6e992a47d14603af36e6d2233c518 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextVisibility.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/subComponentChanged/Row_TextVisibility.test.ets @@ -18,7 +18,7 @@ import router from '@ohos.router'; import CommonFunc from '../../../MainAbility/common/Common'; export default function row_TextVisibilityTest() { describe('Row_TextVisibilityTest', function () { - beforeEach(async function (done) { + beforeAll(async function (done) { console.info("Row_TextVisibilityTest beforeEach start"); let options = { url: 'MainAbility/pages/Row/subComponentChanged/Row_TextVisibility', @@ -149,7 +149,7 @@ export default function row_TextVisibilityTest() { let secondTextStrJson = getInspectorByKey('Row_TextVisibility2'); let secondTextObj = JSON.parse(secondTextStrJson); - expect(secondTextObj.$attrs.visibility).assertEqual("Visibility.visible"); + expect(secondTextObj.$attrs.visibility).assertEqual("Visibility.Visible"); expect(Math.round(firstText.bottom - firstText.top)).assertEqual(vp2px(50)); expect(Math.round(secondText.bottom - secondText.top)).assertEqual(vp2px(100)); 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/entry/src/main/ets/test/Stack/StackItem_change/stack_zIndex.test.ets index 707b596ecb667b01203cb8d2cd2ded443b576d65..c5bef1658849746d2eec9951c99e27e4bdfbe098 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/StackItem_change/stack_zIndex.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Stack/StackItem_change/stack_zIndex.test.ets @@ -59,6 +59,7 @@ export default function Stack_ZIndex() { if (err) { console.log('Failed to save screenshot. Code: ' + JSON.stringify(err)); isTrue = false; + return isTrue; } console.log('Succeeded in saving sreenshot. Pixel bytes number: ' + pixelMap.getPixelBytesNumber()); let PixelBytesNumber = pixelMap.getPixelBytesNumber(); @@ -72,7 +73,7 @@ export default function Stack_ZIndex() { for (var i = 0; i < bufferArr.length; i += 40) { if(bufferArr[i] != 255 || bufferArr[i+1] != 0 || bufferArr[i+2] != 0){ isTrue = false; - return + break; } } } @@ -84,7 +85,7 @@ export default function Stack_ZIndex() { isTrue = false; }; await CommonFunc.sleep(5000); - return isTrue + return isTrue; } beforeEach(async function (done) { console.info("Stack_ZIndex beforeEach start"); @@ -112,102 +113,6 @@ export default function Stack_ZIndex() { await CommonFunc.sleep(2000); console.info("Stack_ZIndex after each called"); }); - /** - * @tc.number SUB_ACE_STACK_ZINDEX_TEST_0100 - * @tc.name testStackZIndexWithAlignmentTopStart - * @tc.desc The stack component sets alignContent to Alignment.TopStart and sets the zIndex of - * the first subcomponent - */ - it('testStackZIndexWithAlignmentTopStart', 0, async function (done) { - console.info('[testStackZIndexWithAlignmentTopStart] START'); - await CommonFunc.sleep(1000); - let strJson = getInspectorByKey('Stack_ZIndex_01'); - let obj = JSON.parse(strJson); - expect(obj.$type).assertEqual('Stack'); - expect(obj.$attrs.alignContent).assertEqual('Alignment.TopStart'); - let Stack_ZIndex_011 = CommonFunc.getComponentRect('Stack_ZIndex_011'); - let Stack_ZIndex_012 = CommonFunc.getComponentRect('Stack_ZIndex_012'); - let Stack_ZIndex_01 = CommonFunc.getComponentRect('Stack_ZIndex_01'); - let num = await imageComparisonAssert(0,0); - await CommonFunc.sleep(1000); - expect(num).assertEqual(true); - expect(Stack_ZIndex_01.top).assertEqual(Stack_ZIndex_011.top); - expect(Stack_ZIndex_01.top).assertEqual(Stack_ZIndex_012.top); - expect(Stack_ZIndex_01.left).assertEqual(Stack_ZIndex_011.left); - expect(Stack_ZIndex_01.left).assertEqual(Stack_ZIndex_012.left); - expect(Math.round(Stack_ZIndex_011.bottom - Stack_ZIndex_011.top)).assertEqual(vp2px(200)); - expect(Math.round(Stack_ZIndex_012.bottom - Stack_ZIndex_012.top)).assertEqual(vp2px(100)); - expect(Math.round(Stack_ZIndex_011.right - Stack_ZIndex_011.left)).assertEqual(vp2px(200)); - expect(Math.round(Stack_ZIndex_012.right - Stack_ZIndex_012.left)).assertEqual(vp2px(100)); - console.info('[testStackZIndexWithAlignmentTopStart] END'); - done(); - }); - /** - * @tc.number SUB_ACE_STACK_ZINDEX_TEST_0200 - * @tc.name testStackZIndexWithAlignmentTop - * @tc.desc The stack component sets alignContent to Alignment.Top and sets the zIndex of - * the first subcomponent - */ - it('testStackZIndexWithAlignmentTop', 0, async function (done) { - console.info('[testStackZIndexWithAlignmentTop] START'); - globalThis.value.message.notify({name:'addAlignContent', value:Alignment.Top}); - await CommonFunc.sleep(1000); - let strJson = getInspectorByKey('Stack_ZIndex_01'); - let obj = JSON.parse(strJson); - expect(obj.$type).assertEqual('Stack'); - expect(obj.$attrs.alignContent).assertEqual('Alignment.Top'); - let Stack_ZIndex_011 = CommonFunc.getComponentRect('Stack_ZIndex_011'); - let Stack_ZIndex_012 = CommonFunc.getComponentRect('Stack_ZIndex_012'); - let Stack_ZIndex_01 = CommonFunc.getComponentRect('Stack_ZIndex_01'); - let theLeft = Stack_ZIndex_012.left; - let num = await imageComparisonAssert(theLeft,0); - await CommonFunc.sleep(1000); - expect(num).assertEqual(true); - expect(Stack_ZIndex_01.top).assertEqual(Stack_ZIndex_011.top); - expect(Stack_ZIndex_01.top).assertEqual(Stack_ZIndex_012.top); - expect(Math.round(Stack_ZIndex_011.left - Stack_ZIndex_01.left)) - .assertEqual(Math.round(Stack_ZIndex_01.right - Stack_ZIndex_011.right)); - expect(Math.round(Stack_ZIndex_012.left - Stack_ZIndex_01.left)) - .assertEqual(Math.round(Stack_ZIndex_01.right - Stack_ZIndex_012.right)); - expect(Math.round(Stack_ZIndex_011.bottom - Stack_ZIndex_011.top)).assertEqual(vp2px(200)); - expect(Math.round(Stack_ZIndex_012.bottom - Stack_ZIndex_012.top)).assertEqual(vp2px(100)); - expect(Math.round(Stack_ZIndex_011.right - Stack_ZIndex_011.left)).assertEqual(vp2px(200)); - expect(Math.round(Stack_ZIndex_012.right - Stack_ZIndex_012.left)).assertEqual(vp2px(100)); - console.info('[testStackZIndexWithAlignmentTop] END'); - done(); - }); - /** - * @tc.number SUB_ACE_STACK_ZINDEX_TEST_0300 - * @tc.name testStackZIndexWithAlignmentTopEnd - * @tc.desc The stack component sets alignContent to Alignment.TopEnd and sets the zIndex of - * the first subcomponent - */ - it('testStackZIndexWithAlignmentTopEnd', 0, async function (done) { - console.info('[testStackZIndexWithAlignmentTopEnd] START'); - globalThis.value.message.notify({name:'addAlignContent', value:Alignment.TopEnd}); - await CommonFunc.sleep(1000); - let strJson = getInspectorByKey('Stack_ZIndex_01'); - let obj = JSON.parse(strJson); - expect(obj.$type).assertEqual('Stack'); - expect(obj.$attrs.alignContent).assertEqual('Alignment.TopEnd'); - let Stack_ZIndex_011 = CommonFunc.getComponentRect('Stack_ZIndex_011'); - let Stack_ZIndex_012 = CommonFunc.getComponentRect('Stack_ZIndex_012'); - let Stack_ZIndex_01 = CommonFunc.getComponentRect('Stack_ZIndex_01'); - let theLeft = Stack_ZIndex_012.left; - let num = await imageComparisonAssert(theLeft,0); - await CommonFunc.sleep(1000); - expect(num).assertEqual(true); - expect(Stack_ZIndex_01.top).assertEqual(Stack_ZIndex_011.top); - expect(Stack_ZIndex_01.top).assertEqual(Stack_ZIndex_012.top); - expect(Stack_ZIndex_01.right).assertEqual(Stack_ZIndex_011.right); - expect(Stack_ZIndex_01.right).assertEqual(Stack_ZIndex_012.right); - expect(Math.round(Stack_ZIndex_011.bottom - Stack_ZIndex_011.top)).assertEqual(vp2px(200)); - expect(Math.round(Stack_ZIndex_012.bottom - Stack_ZIndex_012.top)).assertEqual(vp2px(100)); - expect(Math.round(Stack_ZIndex_011.right - Stack_ZIndex_011.left)).assertEqual(vp2px(200)); - expect(Math.round(Stack_ZIndex_012.right - Stack_ZIndex_012.left)).assertEqual(vp2px(100)); - console.info('[testStackZIndexWithAlignmentTopEnd] END'); - done(); - }); /** * @tc.number SUB_ACE_STACK_ZINDEX_TEST_0400 * @tc.name testStackZIndexWithAlignmentStart 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/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barMode.test.ets index 6a2e2a05abcdb551f3161a43c2c2cbc76925d9fa..d8f0937e5ff673623a359e84aac0d401701a93fe 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barMode.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barMode.test.ets @@ -17,7 +17,7 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from import router from '@ohos.router'; import CommonFunc from '../../../MainAbility/common/Common'; import { UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, - WindowMode, PointerMatrix } from '@ohos.uitest'; + WindowMode, PointerMatrix, UiDirection, MouseButton } from '@ohos.UiTest'; export default function Tabs_barMode() { describe('Tabs_barMode', function () { beforeEach(async function (done) { 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/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barPosition.test.ets index c228de8f25ca3cb6f6561273db4b1338f41c895d..0472c3f14dcabe7713913969fc6e38fcf1548a0b 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barPosition.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barPosition.test.ets @@ -17,7 +17,7 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from import router from '@ohos.router'; import CommonFunc from '../../../MainAbility/common/Common'; import { UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, - WindowMode, PointerMatrix } from '@ohos.uitest'; + WindowMode, PointerMatrix, UiDirection, MouseButton } from '@ohos.UiTest'; export default function Tabs_barPosition() { describe('Tabs_barPosition', function () { beforeEach(async function (done) { 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/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barWidHei.test.ets index 2159219b53466993a31a705f64717082b7ad4cb2..962f1b3b92a3da2a86f29e5a9536df7236b617cb 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barWidHei.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_barWidHei.test.ets @@ -17,7 +17,7 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from import router from '@ohos.router'; import CommonFunc from '../../../MainAbility/common/Common'; import { UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, - WindowMode, PointerMatrix } from '@ohos.uitest'; + WindowMode, PointerMatrix, UiDirection, MouseButton } from '@ohos.UiTest'; export default function Tabs_barWidHei() { describe('Tabs_barWidHei', function () { beforeEach(async function (done) { 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/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_scrollable.test.ets index 670f91bc3357bfa0d45cf8ae2bdc6b2d5582a4dd..e94187637b7a5f8727ccc1c19fbd444aad0c97ad 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_scrollable.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Tabs/Tabs_ParmsChange/Tabs_scrollable.test.ets @@ -17,7 +17,7 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from import router from '@ohos.router'; import CommonFunc from '../../../MainAbility/common/Common'; import { UiComponent, UiDriver, Component, Driver, UiWindow, ON, BY, MatchPattern, DisplayRotation, ResizeDirection, - WindowMode, PointerMatrix } from '@ohos.uitest'; + WindowMode, PointerMatrix, UiDirection, MouseButton } from '@ohos.UiTest'; export default function Tabs_scrollable() { describe('Tabs_scrollable', function () { beforeEach(async function (done) { diff --git a/arkui/ace_ets_layout_test/entry/src/main/module.json b/arkui/ace_ets_layout_test/entry/src/main/module.json index 7e9c2a9d3ad2421142a31d5e5c944877850044d4..52d6a700be21c25233a6d60567e3b453b3ec981e 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/module.json +++ b/arkui/ace_ets_layout_test/entry/src/main/module.json @@ -29,15 +29,31 @@ "entities": [ "entity.system.home" ] - }], - "metadata":[{ - "name":"ArkTSPartialUpdate", - "value":"true" }] }], - "metadata":[{ - "name":"ArkTSPartialUpdate", - "value":"true" - }] + "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/entry/src/main/resources/base/profile/main_pages.json b/arkui/ace_ets_layout_test/entry/src/main/resources/base/profile/main_pages.json index 41e0e57633073820c3361d1dbef5c47218beb360..e578c9e43d0c9b7892f80fc0f749a1312cc79dd5 100644 --- 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 @@ -1,24 +1,113 @@ { "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/FlexPadding", - "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexMargin", "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/FlexVisibility", - "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexAlignSelf", + "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexPadding", "MainAbility/pages/Flex/alignItems/ItemAlign_Auto/FlexTextMargin", - "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_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", @@ -37,6 +126,15 @@ "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", @@ -46,40 +144,178 @@ "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexPadding", "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/FlexTextMargin", "MainAbility/pages/Flex/alignItems/ItemAlign_Stretch/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/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_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/stackSizeChange", + "MainAbility/pages/Stack/Stack_change/stackMarginChange", "MainAbility/pages/Stack/Stack_change/stackNoneSettingWidthHeight", "MainAbility/pages/Stack/Stack_change/stackPaddingChange", - "MainAbility/pages/Stack/Stack_change/stackMarginChange", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperIndex", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperVertical", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopFalse", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperLoopTrue", + "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/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/swiperPadding", + "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/swiperDisableSwipeTrue", - "MainAbility/pages/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse", - "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemSize", - "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadMar", - "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemPadding", - "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemMargin", - "MainAbility/pages/Swiper/Swiper_ItemChange/swiperItemVisibility", - + "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", @@ -115,10 +351,6 @@ "MainAbility/pages/Row/RowNesting/rowNesting_alignItems", "MainAbility/pages/Row/RowNesting/rowNesting_justifyContent", - - "MainAbility/pages/Column/spaceChanged/Column_Space", - "MainAbility/pages/Column/spaceChanged/Column_Space_String", - "MainAbility/pages/Column/spaceChanged/Column_Space_Default", "MainAbility/pages/Column/layoutWeight/layoutWeight_Part", "MainAbility/pages/Column/layoutWeight/layoutWeight_All", "MainAbility/pages/Column/layoutWeight/layoutWeight_Default", @@ -143,71 +375,35 @@ "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/GridTemplatesAllSet/GridTemplateChange/Grid_RowCol_TemplateChange", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_GridSize", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_PadMar", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_Gap", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_LayoutDirection", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_maxCount", - "MainAbility/pages/Grid/GridTemplatesAllSet/GridChange/Grid_RowCol_cellLength", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_NoSpace", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddPadding", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddMargin", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAllSpace", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddAlign", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddVisibility", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddLayoutWeight", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneWidth", - "MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOneMargin", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_NoSpace", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddPadding", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddMargin", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAllSpace", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAlign", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOffset", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddVisibility", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddLayoutWeight", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneWidth", - "MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOneMargin", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_NoSpace", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddPadding", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddMargin", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAllSpace", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAlign", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOffset", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddVisibility", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneWidth", - "MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOneMargin", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_NoSpace", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddPadding", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddMargin", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAllSpace", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddAlign", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOffset", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddVisibility", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddLayoutWeight", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneWidth", - "MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOneMargin", - "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexSize", - "MainAbility/pages/Flex/alignContent/SpaceBetween/Flex_AlignContent_SpaceBetween_FlexPad", - "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_TextSize", - "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_TextVisibility", - "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexSize", - "MainAbility/pages/Flex/alignContent/SpaceAround/Flex_AlignContent_SpaceAround_FlexPad", - "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_TextSize", - "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_TextVisibility", + "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/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/signature/openharmony_sx.p7b b/arkui/ace_ets_layout_test/signature/openharmony_sx.p7b index 7154dfdbb347678fb6d55380335b7b7b68d7029e..acdcc7bce099cabf03f69f8339cbf3c3de9e95bd 100644 Binary files a/arkui/ace_ets_layout_test/signature/openharmony_sx.p7b and b/arkui/ace_ets_layout_test/signature/openharmony_sx.p7b differ