javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 19:26:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(layout-changed): update layoutChanged event tests delay

Browse Source
This commit is contained in:
ADjenkov
2018-05-22 09:55:24 +03:00
committed by Dimitar Topuzov
parent 0fc1547a19
commit c3a7c815e5
3 changed files with 9 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/ui/helper.ts
View File

@ -163,7 +163,7 @@ export function waitUntilNavigatedTo(page: Page, action: Function) {
page.on("navigatedTo", navigatedTo); page.on("navigatedTo", navigatedTo);
action(); action();
TKUnit.waitUntilReady(() => completed, 100); TKUnit.waitUntilReady(() => completed, 5);
} }
export function waitUntilNavigatedFrom(action: Function) { export function waitUntilNavigatedFrom(action: Function) {

2
tests/app/ui/tab-view/tab-view-root-tests.ts
View File

@ -15,7 +15,7 @@ function waitUntilNavigatedTo(pages: Page[], action: Function) {
pages.forEach(page => page.on("navigatedTo", navigatedTo)); pages.forEach(page => page.on("navigatedTo", navigatedTo));
action(); action();
TKUnit.waitUntilReady(() => completed === pages.length, 100); TKUnit.waitUntilReady(() => completed === pages.length, 5);
} }
function createPage(i: number) { function createPage(i: number) {

55
tests/app/ui/view/view-tests-layout-event.ts
View File

@ -15,7 +15,7 @@ export function test_event_LayoutChanged_GetActualSize() {
buttonLayoutChanged = true; buttonLayoutChanged = true;
}); });
TKUnit.waitUntilReady(() => buttonLayoutChanged); TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
TKUnit.assert(views[1].getActualSize().height > 0); TKUnit.assert(views[1].getActualSize().height > 0);
TKUnit.assert(views[1].getActualSize().width > 0); TKUnit.assert(views[1].getActualSize().width > 0);
}; };
@ -32,7 +32,7 @@ export function test_event_LayoutChanged_Listeners() {
buttonLayoutChanged = true; buttonLayoutChanged = true;
}); });
TKUnit.waitUntilReady(() => buttonLayoutChanged); TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
TKUnit.assertFalse(views[0].hasListeners(View.layoutChangedEvent)); TKUnit.assertFalse(views[0].hasListeners(View.layoutChangedEvent));
TKUnit.assert(views[1].hasListeners(View.layoutChangedEvent)); TKUnit.assert(views[1].hasListeners(View.layoutChangedEvent));
}; };
@ -61,54 +61,13 @@ export function test_event_LayoutChanged_IsRaised() {
stackLayout.addChild(button); stackLayout.addChild(button);
newPage.content = stackLayout; newPage.content = stackLayout;
TKUnit.waitUntilReady(() => stackLayoutChanged && buttonLayoutChanged); TKUnit.waitUntilReady(() => stackLayoutChanged && buttonLayoutChanged, 5);
TKUnit.assert(stackLayoutChanged); TKUnit.assert(stackLayoutChanged);
TKUnit.assert(buttonLayoutChanged); TKUnit.assert(buttonLayoutChanged);
newPage.content = null; newPage.content = null;
}; };
export function test_event_LayoutChanged_IsRaised_StackLayout_ChildAdded() {
helper.clearPage();
let newPage = helper.getCurrentPage();
let stackLayoutChangedCount = 0;
let button1LayoutChangedCount = 0;
let button2LayoutChanged = false;
let stackLayout = new StackLayout();
// StackLayout should not be stretched in order to layout again when new button added.
stackLayout.verticalAlignment = "top";
let button1 = new Button();
let button2 = new Button();
stackLayout.on(View.layoutChangedEvent, (data) => {
stackLayoutChangedCount++;
});
button1.on(View.layoutChangedEvent, (data) => {
button1LayoutChangedCount++;
});
button2.on(View.layoutChangedEvent, (data) => {
button2LayoutChanged = true;
});
stackLayout.addChild(button1);
newPage.content = stackLayout;
TKUnit.waitUntilReady(() => stackLayout.isLoaded);
stackLayout.addChild(button2);
TKUnit.waitUntilReady(() => button2LayoutChanged);
TKUnit.assertEqual(stackLayoutChangedCount, 2);
TKUnit.assertEqual(button1LayoutChangedCount, 1);
TKUnit.assert(button2LayoutChanged);
newPage.content = null;
};
export function test_event_LayoutChanged_IsRaised_ChildMarginChanged() { export function test_event_LayoutChanged_IsRaised_ChildMarginChanged() {
const test = function (views: Array<View>) { const test = function (views: Array<View>) {
let stackLayoutChanged = false; let stackLayoutChanged = false;
@ -124,7 +83,7 @@ export function test_event_LayoutChanged_IsRaised_ChildMarginChanged() {
(<Button>views[2]).marginTop = 50; (<Button>views[2]).marginTop = 50;
TKUnit.waitUntilReady(() => buttonLayoutChanged); TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
TKUnit.assert(stackLayoutChanged); TKUnit.assert(stackLayoutChanged);
TKUnit.assert(buttonLayoutChanged); TKUnit.assert(buttonLayoutChanged);
@ -148,7 +107,7 @@ export function test_event_LayoutChanged_IsRaised_ParentMarginChanged() {
(<Button>views[2]).marginTop = 50; (<Button>views[2]).marginTop = 50;
TKUnit.waitUntilReady(() => buttonLayoutChanged); TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
TKUnit.assert(stackLayoutChanged); TKUnit.assert(stackLayoutChanged);
TKUnit.assert(buttonLayoutChanged); TKUnit.assert(buttonLayoutChanged);
@ -176,7 +135,7 @@ export function test_event_LayoutChanged_IsNotRaised_TransformChanged() {
button.rotate += 50; button.rotate += 50;
button.height = 200; button.height = 200;
TKUnit.waitUntilReady(() => button.height === 200); TKUnit.waitUntilReady(() => button.height === 200, 5);
TKUnit.assertEqual(stackLayoutChangedCount, 1); TKUnit.assertEqual(stackLayoutChangedCount, 1);
TKUnit.assertEqual(buttonLayoutChangedCount, 1); TKUnit.assertEqual(buttonLayoutChangedCount, 1);
@ -200,7 +159,7 @@ export function test_event_LayoutChanged_IsRaised_StackLayout_SizeChanged() {
(<StackLayout>views[1]).height = 100; (<StackLayout>views[1]).height = 100;
TKUnit.waitUntilReady(() => buttonLayoutChanged); TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
TKUnit.assert(stackLayoutChanged); TKUnit.assert(stackLayoutChanged);
TKUnit.assert(buttonLayoutChanged); TKUnit.assert(buttonLayoutChanged);