javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed two android tests to account for small emulator screens and floating density

Browse Source
This commit is contained in:
Hristo Hristov
2017-11-06 17:02:44 +02:00
parent 501b954c47
commit 2e2467ce5d
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/app/ui/layouts/grid-layout-tests.ts
View File

@ -681,10 +681,10 @@ export class GridLayoutTest extends testModule.UITest<RemovalTrackingGridLayout>
} }
public test_columns_widths() { public test_columns_widths() {
this.testView.width = { value: 400, unit: "px" }; this.testView.width = { value: 300, unit: "px" };
this.testView.height = { value: 600, unit: "px" }; this.testView.height = { value: 400, unit: "px" };
let grid = new GridLayout(); const grid = new GridLayout();
this.testView.addChild(grid); this.testView.addChild(grid);
grid.horizontalAlignment = "left"; grid.horizontalAlignment = "left";
grid.verticalAlignment = "top"; grid.verticalAlignment = "top";
@ -697,23 +697,23 @@ export class GridLayoutTest extends testModule.UITest<RemovalTrackingGridLayout>
grid.addRow(new ItemSpec(layoutHelper.dp(100), "pixel")); grid.addRow(new ItemSpec(layoutHelper.dp(100), "pixel"));
grid.addRow(new ItemSpec(2, "star")); grid.addRow(new ItemSpec(2, "star"));
let btn = new Button(); const btn = new Button();
btn.width = { value: 300, unit: "px" }; btn.width = { value: 200, unit: "px" };
btn.height = { value: 500, unit: "px" }; btn.height = { value: 300, unit: "px" };
grid.addChild(btn); grid.addChild(btn);
GridLayout.setColumnSpan(btn, 3); GridLayout.setColumnSpan(btn, 3);
GridLayout.setRowSpan(btn, 3); GridLayout.setRowSpan(btn, 3);
this.waitUntilTestElementLayoutIsValid(); this.waitUntilTestElementLayoutIsValid();
var cols = grid.getColumns(); var cols = grid.getColumns();
TKUnit.assertAreClose(cols[0].actualLength, layoutHelper.dp(67), DELTA, "Column[0] actual length should be 67"); TKUnit.assertAreClose(cols[0].actualLength, layoutHelper.dp(33), DELTA, "Column[0] actual length should be 67");
TKUnit.assertAreClose(cols[1].actualLength, layoutHelper.dp(100), DELTA, "Column[1] actual length should be 100"); TKUnit.assertAreClose(cols[1].actualLength, layoutHelper.dp(100), DELTA, "Column[1] actual length should be 100");
TKUnit.assertAreClose(cols[2].actualLength, layoutHelper.dp(133), DELTA, "Column[2] actual length should be 133"); TKUnit.assertAreClose(cols[2].actualLength, layoutHelper.dp(67), DELTA, "Column[2] actual length should be 133");
var rows = grid.getRows(); var rows = grid.getRows();
TKUnit.assertAreClose(rows[0].actualLength, layoutHelper.dp(133), DELTA, "Row[0] actual length should be 133"); TKUnit.assertAreClose(rows[0].actualLength, layoutHelper.dp(67), DELTA, "Row[0] actual length should be 133");
TKUnit.assertAreClose(rows[1].actualLength, layoutHelper.dp(100), DELTA, "Row[1] actual length should be 100"); TKUnit.assertAreClose(rows[1].actualLength, layoutHelper.dp(100), DELTA, "Row[1] actual length should be 100");
TKUnit.assertAreClose(rows[2].actualLength, layoutHelper.dp(267), DELTA, "Row[2] actual length should be 267"); TKUnit.assertAreClose(rows[2].actualLength, layoutHelper.dp(133), DELTA, "Row[2] actual length should be 267");
} }
} }

2
tests/app/ui/scroll-view/scroll-view-tests.ts
View File

@ -172,7 +172,7 @@ class ScrollLayoutTest extends UITest<ScrollView> {
helper.goBack(); helper.goBack();
// Check horizontalOffset after navigation // Check horizontalOffset after navigation
TKUnit.assertEqual(this.testView.horizontalOffset, 100, "this.testView.horizontalOffset after navigation"); TKUnit.assertEqual(this.testView.horizontalOffset, offset, "this.testView.horizontalOffset after navigation");
} }
public test_scrollView_vertical_raised_scroll_event() { public test_scrollView_vertical_raised_scroll_event() {