diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.ets index b4ce1625ca9467310b6c19e8d2e8c3cb5cd09824..d6fe6fa52f001e685d83a4e7a18b87870a56d59f 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.ets @@ -32,6 +32,6 @@ struct Grid_Row_Direction_Row { }.borderColor(color).borderWidth(2).key('DirectionRow_' + index) }) }.key('DirectionRow_001') - }.width('80pv').height(200) + }.width('80vp').height(200) } } \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.ets index ecb98dfcb53297daf19ad84878a99228044c0ec4..d49885d7df02b1ed4dd7142f32038fb4d48fdb90 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.ets @@ -32,6 +32,6 @@ struct Grid_Row_Direction_RowReverse { }.borderColor(color).borderWidth(2).key('DirectionRowReverse_' + index) }) }.key('DirectionRowReverse_001') - }.width('80pv').height(200) + }.width('80vp').height(200) } } \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.ets index d7cba508349713ea35d0fffd1fa1405eb352c4bf..21b06406507443cbd95763f861feecdb5daeccb9 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.ets @@ -32,6 +32,6 @@ struct Gutter_Length_Resource { }.borderColor(color).borderWidth(2).key('Length_Resource_' + index) }) }.key('Length_Resource001') - }.width('80pv').height(200) + }.width('80vp').height(200) } } \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.ets index 184d8b40d25653b11ceab685f64eeb5403cd5630..fc5f0e0457caaf5f581dabbd2e1bc262efd5f832 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.ets @@ -54,6 +54,6 @@ struct Grid_Row_GutterOption_Default { }.borderColor(color).borderWidth(2).key('GutterOptionChange_' + index) }) }.key('GutterOptionChange_001') - }.width('80pv').height(200) + }.width('80vp').height(200) } } \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.ets index 1af1e2ffcad5e66cc988d3ad3b9be9300eee1120..c7905d29dca9448b51a7888f54fc5b55fa92bfa8 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.ets @@ -52,6 +52,6 @@ struct Grid_Row_GutterOption_Number { }) } .key('Length_Number001') - }.width('80pv').height(200) + }.width('80vp').height(200) } } \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.ets index 9986b9af8d5e3740f805cebfee21388600f51777..d68b86397bb419d8a881766cb013bf774d4a0e1c 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.ets @@ -51,6 +51,6 @@ struct Grid_Row_GutterOption_String { }.borderColor(color).borderWidth(2).key('Grid_Row_GutterOption_String' + index) }) } - }.width('80pv').height(200) + }.width('80vp').height(200) } } \ No newline at end of file diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Type.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Type.test.ets index 7b9cbc539a76d61c621e6403991397f83b339254..8012aea90403302fbd9a58e376f3b4de3a86c12c 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Type.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Type.test.ets @@ -283,9 +283,14 @@ export default function flexBasis_Type() { let Column_flexBasis_02 = CommonFunc.getComponentRect('Column_flexBasis_02'); console.log('assert position') expect(Math.round(Column_flexBasis_021.left - Column_flexBasis_02.left)).assertEqual(Math.round(Column_flexBasis_02.right - Column_flexBasis_021.right)); + console.log('Column_flexBasis_021.left - Column_flexBasis_02.left', + Column_flexBasis_021.left - Column_flexBasis_02.left) expect(Math.round(Column_flexBasis_022.left - Column_flexBasis_02.left)).assertEqual(Math.round(Column_flexBasis_02.right - Column_flexBasis_022.right)); + console.log('Column_flexBasis_022.left - Column_flexBasis_02.left', + Column_flexBasis_022.left - Column_flexBasis_02.left) expect(Math.round(Column_flexBasis_023.left - Column_flexBasis_02.left)).assertEqual(Math.round(Column_flexBasis_02.right - Column_flexBasis_023.right)); - expect(Math.round(Column_flexBasis_022.top - Column_flexBasis_021.bottom)).assertEqual(Math.round(Column_flexBasis_023.top - Column_flexBasis_022.bottom)) + console.log('Column_flexBasis_023.left - Column_flexBasis_02.left', + Column_flexBasis_023.left - Column_flexBasis_02.left) + expect(Math.round(Column_flexBasis_022.top - Column_flexBasis_021.bottom)).assertEqual(Math.round(Column_flexBasis_023.top - Column_flexBasis_022.bottom)); + console.log('Column_flexBasis_022.top - Column_flexBasis_021.bottom', + Column_flexBasis_022.top - Column_flexBasis_021.bottom) + console.log('assert space') expect(Math.round(Column_flexBasis_022.top - Column_flexBasis_021.bottom)).assertEqual(vp2px(10)); expect(Math.round(Column_flexBasis_023.top - Column_flexBasis_022.bottom)).assertEqual(vp2px(10)); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_String.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_String.test.ets index a8bf6a43037ea332266a39ddb55aaf2a78f809af..368d09e46d155d1d1937c57c21c41f7f7e55f9fd 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_String.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_String.test.ets @@ -174,6 +174,9 @@ export default function Column_Space_String() { expect(Math.round(Column_Space_String_012.left - Column_Space_String_01.left)).assertEqual(Math.round(Column_Space_String_01.right - Column_Space_String_012.right)); expect(Math.round(Column_Space_String_013.left - Column_Space_String_01.left)).assertEqual(Math.round(Column_Space_String_01.right - Column_Space_String_013.right)); expect(Math.round(Column_Space_String_012.top - Column_Space_String_011.bottom)).assertEqual(Math.round(Column_Space_String_013.top - Column_Space_String_012.bottom)) + console.log('Column_Space_String_011.left - Column_Space_String_01.left', + Column_Space_String_011.left - Column_Space_String_01.left) + console.log('Column_Space_String_012.left - Column_Space_String_01.left', + Column_Space_String_012.left - Column_Space_String_01.left) + console.log('Column_Space_String_013.left - Column_Space_String_01.left', + Column_Space_String_013.left - Column_Space_String_01.left) console.log('assert space') expect(Math.round(Column_Space_String_012.top - Column_Space_String_011.bottom)).assertEqual(Math.round(lpx2px(50))); expect(Math.round(Column_Space_String_013.top - Column_Space_String_012.bottom)).assertEqual(Math.round(lpx2px(50))); @@ -390,6 +393,9 @@ export default function Column_Space_String() { expect(Math.round(Column_Space_String_012.left - Column_Space_String_01.left)).assertEqual(Math.round(Column_Space_String_01.right - Column_Space_String_012.right)); expect(Math.round(Column_Space_String_013.left - Column_Space_String_01.left)).assertEqual(Math.round(Column_Space_String_01.right - Column_Space_String_013.right)); expect(Math.round(Column_Space_String_012.top - Column_Space_String_011.bottom)).assertEqual(Math.round(Column_Space_String_013.top - Column_Space_String_012.bottom)) + console.log('Column_Space_String_011.left - Column_Space_String_01.left', + Column_Space_String_011.left - Column_Space_String_01.left) + console.log('Column_Space_String_012.left - Column_Space_String_01.left', + Column_Space_String_012.left - Column_Space_String_01.left) + console.log('Column_Space_String_013.left - Column_Space_String_01.left', + Column_Space_String_013.left - Column_Space_String_01.left) console.log('assert space') expect(Math.round(Column_Space_String_012.top - Column_Space_String_011.bottom)).assertEqual(10); expect(Math.round(Column_Space_String_013.top - Column_Space_String_012.bottom)).assertEqual(10); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Type.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Type.test.ets index b365fd893f7c9fb341f4689e3805efa134249dd7..09a586af1a61486008b104d548bd386170a6d099 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Type.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Type.test.ets @@ -305,7 +305,10 @@ export default function Row_flexBasis_Type() { expect(Math.round(Row_flexBasis_Type_021.top - Row_flexBasis_Type_02.top)).assertEqual(Math.round(Row_flexBasis_Type_02.bottom - Row_flexBasis_Type_021.bottom)); expect(Math.round(Row_flexBasis_Type_022.top - Row_flexBasis_Type_02.top)).assertEqual(Math.round(Row_flexBasis_Type_02.bottom - Row_flexBasis_Type_022.bottom)); expect(Math.round(Row_flexBasis_Type_023.top - Row_flexBasis_Type_02.top)).assertEqual(Math.round(Row_flexBasis_Type_02.bottom - Row_flexBasis_Type_023.bottom)); - + console.log('Row_flexBasis_Type_021.top - Row_flexBasis_Type_02.top', + Row_flexBasis_Type_021.top - Row_flexBasis_Type_02.top) + console.log('Row_flexBasis_Type_022.top - Row_flexBasis_Type_02.top', + Row_flexBasis_Type_022.top - Row_flexBasis_Type_02.top) + console.log('Row_flexBasis_Type_023.top - Row_flexBasis_Type_02.top', + Row_flexBasis_Type_023.top - Row_flexBasis_Type_02.top) + console.log('assert space') expect(Math.round(Row_flexBasis_Type_022.left - Row_flexBasis_Type_021.right)).assertEqual(vp2px(10)); expect(Math.round(Row_flexBasis_Type_023.left - Row_flexBasis_Type_022.right)).assertEqual(vp2px(10)); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_String.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_String.test.ets index 2ba5d231965dd549f6b3f42affc8bde301f8e599..f323636cfcacd2fa62337acf03cf85790c72429e 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_String.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_String.test.ets @@ -220,6 +220,9 @@ export default function Row_Space_String() { expect(Math.round(Row_Space_String_011.top - Row_Space_String_01.top)).assertEqual(Math.round(Row_Space_String_01.bottom - Row_Space_String_011.bottom)); expect(Math.round(Row_Space_String_012.top - Row_Space_String_01.top)).assertEqual(Math.round(Row_Space_String_01.bottom - Row_Space_String_012.bottom)); expect(Math.round(Row_Space_String_013.top - Row_Space_String_01.top)).assertEqual(Math.round(Row_Space_String_01.bottom - Row_Space_String_013.bottom)); + console.log('Row_Space_String_011.top - Row_Space_String_01.top', + Row_Space_String_011.top - Row_Space_String_01.top) + console.log('Row_Space_String_012.top - Row_Space_String_01.top', + Row_Space_String_012.top - Row_Space_String_01.top) + console.log('Row_Space_String_013.top - Row_Space_String_01.top', + Row_Space_String_013.top - Row_Space_String_01.top) console.log('assert space') expect(Math.round(Row_Space_String_012.left - Row_Space_String_011.right)).assertEqual(Math.round(lpx2px(70))); @@ -459,6 +462,9 @@ export default function Row_Space_String() { expect(Math.round(Row_Space_String_011.top - Row_Space_String_01.top)).assertEqual(Math.round(Row_Space_String_01.bottom - Row_Space_String_011.bottom)); expect(Math.round(Row_Space_String_012.top - Row_Space_String_01.top)).assertEqual(Math.round(Row_Space_String_01.bottom - Row_Space_String_012.bottom)); expect(Math.round(Row_Space_String_013.top - Row_Space_String_01.top)).assertEqual(Math.round(Row_Space_String_01.bottom - Row_Space_String_013.bottom)); + console.log('Row_Space_String_011.top - Row_Space_String_01.top', + Row_Space_String_011.top - Row_Space_String_01.top) + console.log('Row_Space_String_012.top - Row_Space_String_01.top', + Row_Space_String_012.top - Row_Space_String_01.top) + console.log('Row_Space_String_013.top - Row_Space_String_01.top', + Row_Space_String_013.top - Row_Space_String_01.top) console.log('assert space') expect(Math.round(Row_Space_String_012.left - Row_Space_String_011.right)).assertEqual(10);