diff --git a/tests/app/ui/layouts/safe-area-tests.ts b/tests/app/ui/layouts/safe-area-tests.ts index f2833d412..9329aa103 100644 --- a/tests/app/ui/layouts/safe-area-tests.ts +++ b/tests/app/ui/layouts/safe-area-tests.ts @@ -44,7 +44,6 @@ export class SafeAreaTests extends testModule.UITest { private noop() { // no operation }; - // TODO: End Refactor // Common @@ -68,130 +67,6 @@ export class SafeAreaTests extends testModule.UITest { equal(b, heightPixels, `${layout}.bottom - actual:${b}; expected: ${heightPixels}`); } - // Grid - private getGridViews (template: string) { - let root = parse(template); - return { - root, - grid: root.getViewById("grid") as GridLayout, - cells: [ - [ root.getViewById("cell00") as view.View, root.getViewById("cell01") as view.View, root.getViewById("cell02") as view.View ], - [ root.getViewById("cell10") as view.View, root.getViewById("cell11") as view.View, root.getViewById("cell12") as view.View ], - [ root.getViewById("cell20") as view.View, root.getViewById("cell21") as view.View, root.getViewById("cell22") as view.View ] - ] - }; - }; - - public test_grid_layout_in_full_screen() { - const snippet = ` - - `; - - this.executeSnippet( - this.getGridViews(snippet), - this.noop, - ({ root }) => { this.layout_in_full_screen_test(root); } - ); - } - - public test_component_cells_layout_in_safe_area() { - const snippet = ` - - - - - - - - - - - - `; - - this.executeSnippet( - this.getGridViews(snippet), - this.noop, - ({ root, grid, cells }) => { - const insets = grid.getSafeAreaInsets(); - - equal(left(cells[0][0]), insets.left, `cell00 left actual:<${left(cells[0][0])}> expected:<${insets.left}>`); - equal(left(cells[1][0]), insets.left, `cell10 left actual:<${left(cells[1][0])}> expected:<${insets.left}>`); - equal(left(cells[2][0]), insets.left, `cell20 left actual:<${left(cells[2][0])}> expected:<${insets.left}>`); - - isBelowWith(grid, cells[0][0], insets.top); - isBelowWith(grid, cells[0][1], insets.top); - isBelowWith(grid, cells[0][2], insets.top); - - equal(right(cells[0][2]), width(grid) - insets.right, `cell02 left actual:<${left(cells[0][2])}> expected:<${width(grid) - insets.right}>`); - equal(right(cells[1][2]), width(grid) - insets.right, `cell12 left actual:<${left(cells[1][2])}> expected:<${width(grid) - insets.right}>`); - equal(right(cells[2][2]), width(grid) - insets.right, `cell22 left actual:<${left(cells[2][2])}> expected:<${width(grid) - insets.right}>`); - - isAboveWith(cells[2][0], grid, insets.bottom); - isAboveWith(cells[2][1], grid, insets.bottom); - isAboveWith(cells[2][2], grid, insets.bottom); - - equal(height(cells[0][1]), height(cells[1][1]), `cell height should be equal - cell01<${height(cells[0][1])}> - cell11<${height(cells[1][1])}>`); - equal(height(cells[1][1]), height(cells[2][1]), `cell height should be equal - cell11<${height(cells[1][1])}> - cell21<${height(cells[2][1])}>`); - const sumOfLabelHeightAndInsets = insets.top + height(cells[0][1]) + height(cells[1][1]) + height(cells[2][1]) + insets.bottom; - equal(height(grid), sumOfLabelHeightAndInsets, `grid height<${height(grid)}> sum of labels height and insets<${sumOfLabelHeightAndInsets}>`); - - equal(width(cells[1][0]), width(cells[1][1]), `cell width should be equal - cell10<${width(cells[1][0])}> - cell11<${width(cells[1][1])}>`); - equal(width(cells[1][1]), width(cells[1][2]), `cell width should be equal - cell11<${width(cells[1][1])}> - cell12<${width(cells[1][2])}>`); - const sumOfLabelWidthsAndInsets = insets.left + width(cells[1][0]) + width(cells[1][1]) + width(cells[1][2]) + insets.right; - equal(width(grid), sumOfLabelWidthsAndInsets, `grid width<${width(grid)}> sum of nested grids width and insets<${sumOfLabelWidthsAndInsets}>`); - } - ); - } - - public test_nested_grid_cells_layout_beyond_safe_area() { - const snippet = ` - - - - - - - - - - - - `; - - this.executeSnippet( - this.getGridViews(snippet), - this.noop, - ({ root, grid, cells }) => { - isLeftAlignedWith(grid, cells[0][0]); - isLeftAlignedWith(grid, cells[1][0]); - isLeftAlignedWith(grid, cells[2][0]); - - isTopAlignedWith(grid, cells[0][0]); - isTopAlignedWith(grid, cells[0][1]); - isTopAlignedWith(grid, cells[0][2]); - - isRightAlignedWith(grid, cells[0][2]); - isRightAlignedWith(grid, cells[1][2]); - isRightAlignedWith(grid, cells[2][2]); - - isBottomAlignedWith(grid, cells[2][0]); - isBottomAlignedWith(grid, cells[2][1]); - isBottomAlignedWith(grid, cells[2][2]); - - check(height(cells[0][1]) >= height(cells[1][1]), `cell01 height<${height(cells[0][1])}> not greater or equal cell11 height<${height(cells[1][1])}>`); - check(height(cells[1][1]) <= height(cells[2][1]), `cell11 height<${height(cells[1][1])}> not less or equal cell21 height<${height(cells[2][1])}>`); - const sumOfNestedGridHeights = height(cells[0][1]) + height(cells[1][1]) + height(cells[2][1]); - equal(height(grid), sumOfNestedGridHeights, `grid height<${height(grid)}> sum of nested grids height <${sumOfNestedGridHeights}>`); - - check(width(cells[1][0]) >= width(cells[1][1]), `cell10 width<${width(cells[1][0])}> not greater or equal cell11 width<${width(cells[1][1])}>`); - check(width(cells[1][1]) <= width(cells[1][2]), `cell11 width<${width(cells[1][1])}> not less or equal cell12 width<${width(cells[1][2])}>`); - const sumOfNestedGridWidths = width(cells[1][0]) + width(cells[1][1]) + width(cells[1][2]) - equal(width(grid), sumOfNestedGridWidths, `grid width<${width(grid)}> sum of nested grids width <${sumOfNestedGridWidths}>`); - } - ); - } - // Dock private getDockViews(template: string) { let root = parse(template); @@ -297,6 +172,335 @@ export class SafeAreaTests extends testModule.UITest { } ); } + + // Grid + private getGridViews (template: string) { + let root = parse(template); + return { + root, + grid: root.getViewById("grid") as GridLayout, + cells: [ + [ root.getViewById("cell00") as view.View, root.getViewById("cell01") as view.View, root.getViewById("cell02") as view.View ], + [ root.getViewById("cell10") as view.View, root.getViewById("cell11") as view.View, root.getViewById("cell12") as view.View ], + [ root.getViewById("cell20") as view.View, root.getViewById("cell21") as view.View, root.getViewById("cell22") as view.View ] + ] + }; + }; + + public test_grid_layout_in_full_screen() { + const snippet = ` + + `; + + this.executeSnippet( + this.getGridViews(snippet), + this.noop, + ({ root }) => { this.layout_in_full_screen_test(root); } + ); + } + + public test_component_cells_layout_in_safe_area() { + const snippet = ` + + + + + + + + + + + + `; + + this.executeSnippet( + this.getGridViews(snippet), + this.noop, + ({ root, grid, cells }) => { + const insets = root.getSafeAreaInsets(); + + equal(left(cells[0][0]), insets.left, `cell00 left actual:<${left(cells[0][0])}> expected:<${insets.left}>`); + equal(left(cells[1][0]), insets.left, `cell10 left actual:<${left(cells[1][0])}> expected:<${insets.left}>`); + equal(left(cells[2][0]), insets.left, `cell20 left actual:<${left(cells[2][0])}> expected:<${insets.left}>`); + + isBelowWith(grid, cells[0][0], insets.top); + isBelowWith(grid, cells[0][1], insets.top); + isBelowWith(grid, cells[0][2], insets.top); + + equal(right(cells[0][2]), width(grid) - insets.right, `cell02 left actual:<${left(cells[0][2])}> expected:<${width(grid) - insets.right}>`); + equal(right(cells[1][2]), width(grid) - insets.right, `cell12 left actual:<${left(cells[1][2])}> expected:<${width(grid) - insets.right}>`); + equal(right(cells[2][2]), width(grid) - insets.right, `cell22 left actual:<${left(cells[2][2])}> expected:<${width(grid) - insets.right}>`); + + isAboveWith(cells[2][0], grid, insets.bottom); + isAboveWith(cells[2][1], grid, insets.bottom); + isAboveWith(cells[2][2], grid, insets.bottom); + + equal(height(cells[0][1]), height(cells[1][1]), `cell height should be equal - cell01<${height(cells[0][1])}> - cell11<${height(cells[1][1])}>`); + equal(height(cells[1][1]), height(cells[2][1]), `cell height should be equal - cell11<${height(cells[1][1])}> - cell21<${height(cells[2][1])}>`); + const sumOfLabelHeightAndInsets = insets.top + height(cells[0][1]) + height(cells[1][1]) + height(cells[2][1]) + insets.bottom; + equal(height(grid), sumOfLabelHeightAndInsets, `grid height<${height(grid)}> sum of labels height and insets<${sumOfLabelHeightAndInsets}>`); + + equal(width(cells[1][0]), width(cells[1][1]), `cell width should be equal - cell10<${width(cells[1][0])}> - cell11<${width(cells[1][1])}>`); + equal(width(cells[1][1]), width(cells[1][2]), `cell width should be equal - cell11<${width(cells[1][1])}> - cell12<${width(cells[1][2])}>`); + const sumOfLabelWidthsAndInsets = insets.left + width(cells[1][0]) + width(cells[1][1]) + width(cells[1][2]) + insets.right; + equal(width(grid), sumOfLabelWidthsAndInsets, `grid width<${width(grid)}> sum of nested grids width and insets<${sumOfLabelWidthsAndInsets}>`); + } + ); + } + + public test_nested_grid_cells_layout_beyond_safe_area() { + const snippet = ` + + + + + + + + + + + + `; + + this.executeSnippet( + this.getGridViews(snippet), + this.noop, + ({ root, grid, cells }) => { + isLeftAlignedWith(grid, cells[0][0]); + isLeftAlignedWith(grid, cells[1][0]); + isLeftAlignedWith(grid, cells[2][0]); + + isTopAlignedWith(grid, cells[0][0]); + isTopAlignedWith(grid, cells[0][1]); + isTopAlignedWith(grid, cells[0][2]); + + isRightAlignedWith(grid, cells[0][2]); + isRightAlignedWith(grid, cells[1][2]); + isRightAlignedWith(grid, cells[2][2]); + + isBottomAlignedWith(grid, cells[2][0]); + isBottomAlignedWith(grid, cells[2][1]); + isBottomAlignedWith(grid, cells[2][2]); + + check(height(cells[0][1]) >= height(cells[1][1]), `cell01 height<${height(cells[0][1])}> not greater or equal cell11 height<${height(cells[1][1])}>`); + check(height(cells[1][1]) <= height(cells[2][1]), `cell11 height<${height(cells[1][1])}> not less or equal cell21 height<${height(cells[2][1])}>`); + const sumOfNestedGridHeights = height(cells[0][1]) + height(cells[1][1]) + height(cells[2][1]); + equal(height(grid), sumOfNestedGridHeights, `grid height<${height(grid)}> sum of nested grids height <${sumOfNestedGridHeights}>`); + + check(width(cells[1][0]) >= width(cells[1][1]), `cell10 width<${width(cells[1][0])}> not greater or equal cell11 width<${width(cells[1][1])}>`); + check(width(cells[1][1]) <= width(cells[1][2]), `cell11 width<${width(cells[1][1])}> not less or equal cell12 width<${width(cells[1][2])}>`); + const sumOfNestedGridWidths = width(cells[1][0]) + width(cells[1][1]) + width(cells[1][2]) + equal(width(grid), sumOfNestedGridWidths, `grid width<${width(grid)}> sum of nested grids width <${sumOfNestedGridWidths}>`); + } + ); + } + + // Stack + private getStackViews(template: string) { + let root = parse(template); + return { + root, + child0: root.getViewById("child0") as view.View, + child1: root.getViewById("child1") as view.View + }; + }; + + public test_stack_in_full_screen() { + const snippet = ` + + `; + + this.executeSnippet( + this.getStackViews(snippet), + this.noop, + ({ root }) => { this.layout_in_full_screen_test(root); } + ); + } + + public test_stack_horizontal_children_components_in_safe_area() { + const snippet = ` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + `; + + this.executeSnippet( + this.getStackViews(snippet), + this.noop, + ({ root, child0, child1 }) => { + const insets = root.getSafeAreaInsets(); + equal(left(child0), insets.left, `${child0}.left - actual: ${left(child0)} expected: ${insets.left}`); + equal(top(child0), insets.top, `${child0}.top - actual: ${top(child0)} expected: ${insets.top}`); + equal(bottom(child0), height(root) - insets.bottom, `${child0}.bottom - actual: ${bottom(child0)} expected: ${height(root) - insets.bottom}`); + isLeftWith(child0, child1, width(child0)); + } + ); + } + + public test_stack_vertical_children_components_in_safe_area() { + const snippet = ` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + `; + + this.executeSnippet( + this.getStackViews(snippet), + this.noop, + ({ root, child0, child1 }) => { + const insets = root.getSafeAreaInsets(); + equal(left(child0), insets.left, `${child0}.left - actual: ${left(child0)} expected: ${insets.left}`); + equal(top(child0), insets.top, `${child0}.top - actual: ${top(child0)} expected: ${insets.top}`); + equal(right(child0), width(root) - insets.right, `${child0}.right - actual: ${right(child0)} expected: ${width(root) - insets.right}`); + isBelowWith(child0, child1, height(child0)); + } + ); + } + + public test_stack_nested_layouts_beyond_safe_area() { + const snippet = ` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + `; + + this.executeSnippet( + this.getStackViews(snippet), + this.noop, + ({ root, child0, child1 }) => { + isLeftAlignedWith(root, child0); + isTopAlignedWith(root, child0); + isRightAlignedWith(root, child0); + } + ); + } } export function createTestCase(): SafeAreaTests {