Skip to content

Commit c3a7c81

Browse files
ADjenkovdtopuzov
authored andcommitted
chore(layout-changed): update layoutChanged event tests delay
1 parent 0fc1547 commit c3a7c81

3 files changed

Lines changed: 9 additions & 50 deletions

File tree

tests/app/ui/helper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export function waitUntilNavigatedTo(page: Page, action: Function) {
163163

164164
page.on("navigatedTo", navigatedTo);
165165
action();
166-
TKUnit.waitUntilReady(() => completed, 100);
166+
TKUnit.waitUntilReady(() => completed, 5);
167167
}
168168

169169
export function waitUntilNavigatedFrom(action: Function) {

tests/app/ui/tab-view/tab-view-root-tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function waitUntilNavigatedTo(pages: Page[], action: Function) {
1515

1616
pages.forEach(page => page.on("navigatedTo", navigatedTo));
1717
action();
18-
TKUnit.waitUntilReady(() => completed === pages.length, 100);
18+
TKUnit.waitUntilReady(() => completed === pages.length, 5);
1919
}
2020

2121
function createPage(i: number) {

tests/app/ui/view/view-tests-layout-event.ts

Lines changed: 7 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function test_event_LayoutChanged_GetActualSize() {
1515
buttonLayoutChanged = true;
1616
});
1717

18-
TKUnit.waitUntilReady(() => buttonLayoutChanged);
18+
TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
1919
TKUnit.assert(views[1].getActualSize().height > 0);
2020
TKUnit.assert(views[1].getActualSize().width > 0);
2121
};
@@ -32,7 +32,7 @@ export function test_event_LayoutChanged_Listeners() {
3232
buttonLayoutChanged = true;
3333
});
3434

35-
TKUnit.waitUntilReady(() => buttonLayoutChanged);
35+
TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
3636
TKUnit.assertFalse(views[0].hasListeners(View.layoutChangedEvent));
3737
TKUnit.assert(views[1].hasListeners(View.layoutChangedEvent));
3838
};
@@ -61,54 +61,13 @@ export function test_event_LayoutChanged_IsRaised() {
6161
stackLayout.addChild(button);
6262
newPage.content = stackLayout;
6363

64-
TKUnit.waitUntilReady(() => stackLayoutChanged && buttonLayoutChanged);
64+
TKUnit.waitUntilReady(() => stackLayoutChanged && buttonLayoutChanged, 5);
6565
TKUnit.assert(stackLayoutChanged);
6666
TKUnit.assert(buttonLayoutChanged);
6767

6868
newPage.content = null;
6969
};
7070

71-
export function test_event_LayoutChanged_IsRaised_StackLayout_ChildAdded() {
72-
helper.clearPage();
73-
let newPage = helper.getCurrentPage();
74-
75-
let stackLayoutChangedCount = 0;
76-
let button1LayoutChangedCount = 0;
77-
let button2LayoutChanged = false;
78-
79-
let stackLayout = new StackLayout();
80-
81-
// StackLayout should not be stretched in order to layout again when new button added.
82-
stackLayout.verticalAlignment = "top";
83-
let button1 = new Button();
84-
let button2 = new Button();
85-
86-
stackLayout.on(View.layoutChangedEvent, (data) => {
87-
stackLayoutChangedCount++;
88-
});
89-
90-
button1.on(View.layoutChangedEvent, (data) => {
91-
button1LayoutChangedCount++;
92-
});
93-
94-
button2.on(View.layoutChangedEvent, (data) => {
95-
button2LayoutChanged = true;
96-
});
97-
98-
stackLayout.addChild(button1);
99-
newPage.content = stackLayout;
100-
101-
TKUnit.waitUntilReady(() => stackLayout.isLoaded);
102-
stackLayout.addChild(button2);
103-
104-
TKUnit.waitUntilReady(() => button2LayoutChanged);
105-
TKUnit.assertEqual(stackLayoutChangedCount, 2);
106-
TKUnit.assertEqual(button1LayoutChangedCount, 1);
107-
TKUnit.assert(button2LayoutChanged);
108-
109-
newPage.content = null;
110-
};
111-
11271
export function test_event_LayoutChanged_IsRaised_ChildMarginChanged() {
11372
const test = function (views: Array<View>) {
11473
let stackLayoutChanged = false;
@@ -124,7 +83,7 @@ export function test_event_LayoutChanged_IsRaised_ChildMarginChanged() {
12483

12584
(<Button>views[2]).marginTop = 50;
12685

127-
TKUnit.waitUntilReady(() => buttonLayoutChanged);
86+
TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
12887

12988
TKUnit.assert(stackLayoutChanged);
13089
TKUnit.assert(buttonLayoutChanged);
@@ -148,7 +107,7 @@ export function test_event_LayoutChanged_IsRaised_ParentMarginChanged() {
148107

149108
(<Button>views[2]).marginTop = 50;
150109

151-
TKUnit.waitUntilReady(() => buttonLayoutChanged);
110+
TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
152111

153112
TKUnit.assert(stackLayoutChanged);
154113
TKUnit.assert(buttonLayoutChanged);
@@ -176,7 +135,7 @@ export function test_event_LayoutChanged_IsNotRaised_TransformChanged() {
176135
button.rotate += 50;
177136
button.height = 200;
178137

179-
TKUnit.waitUntilReady(() => button.height === 200);
138+
TKUnit.waitUntilReady(() => button.height === 200, 5);
180139

181140
TKUnit.assertEqual(stackLayoutChangedCount, 1);
182141
TKUnit.assertEqual(buttonLayoutChangedCount, 1);
@@ -200,7 +159,7 @@ export function test_event_LayoutChanged_IsRaised_StackLayout_SizeChanged() {
200159

201160
(<StackLayout>views[1]).height = 100;
202161

203-
TKUnit.waitUntilReady(() => buttonLayoutChanged);
162+
TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
204163

205164
TKUnit.assert(stackLayoutChanged);
206165
TKUnit.assert(buttonLayoutChanged);

0 commit comments

Comments
 (0)