From c3a7c815e57df3559d55d23971482832090ba8f8 Mon Sep 17 00:00:00 2001
From: ADjenkov <ADjenkov>
Date: Tue, 22 May 2018 09:55:24 +0300
Subject: [PATCH] chore(layout-changed): update layoutChanged event tests delay

---
 tests/app/ui/helper.ts                       |  2 +-
 tests/app/ui/tab-view/tab-view-root-tests.ts |  2 +-
 tests/app/ui/view/view-tests-layout-event.ts | 55 +++-----------------
 3 files changed, 9 insertions(+), 50 deletions(-)

diff --git a/tests/app/ui/helper.ts b/tests/app/ui/helper.ts
index 7a6d20f4c..7dd9851fc 100644
--- a/tests/app/ui/helper.ts
+++ b/tests/app/ui/helper.ts
@@ -163,7 +163,7 @@ export function waitUntilNavigatedTo(page: Page, action: Function) {
 
     page.on("navigatedTo", navigatedTo);
     action();
-    TKUnit.waitUntilReady(() => completed, 100);
+    TKUnit.waitUntilReady(() => completed, 5);
 }
 
 export function waitUntilNavigatedFrom(action: Function) {
diff --git a/tests/app/ui/tab-view/tab-view-root-tests.ts b/tests/app/ui/tab-view/tab-view-root-tests.ts
index 399964256..0e1376226 100644
--- a/tests/app/ui/tab-view/tab-view-root-tests.ts
+++ b/tests/app/ui/tab-view/tab-view-root-tests.ts
@@ -15,7 +15,7 @@ function waitUntilNavigatedTo(pages: Page[], action: Function) {
 
     pages.forEach(page => page.on("navigatedTo", navigatedTo));
     action();
-    TKUnit.waitUntilReady(() => completed === pages.length, 100);
+    TKUnit.waitUntilReady(() => completed === pages.length, 5);
 }
 
 function createPage(i: number) {
diff --git a/tests/app/ui/view/view-tests-layout-event.ts b/tests/app/ui/view/view-tests-layout-event.ts
index 5786ee6c5..f250b13d4 100644
--- a/tests/app/ui/view/view-tests-layout-event.ts
+++ b/tests/app/ui/view/view-tests-layout-event.ts
@@ -15,7 +15,7 @@ export function test_event_LayoutChanged_GetActualSize() {
             buttonLayoutChanged = true;
         });
 
-        TKUnit.waitUntilReady(() => buttonLayoutChanged);
+        TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
         TKUnit.assert(views[1].getActualSize().height > 0);
         TKUnit.assert(views[1].getActualSize().width > 0);
     };
@@ -32,7 +32,7 @@ export function test_event_LayoutChanged_Listeners() {
             buttonLayoutChanged = true;
         });
 
-        TKUnit.waitUntilReady(() => buttonLayoutChanged);
+        TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
         TKUnit.assertFalse(views[0].hasListeners(View.layoutChangedEvent));
         TKUnit.assert(views[1].hasListeners(View.layoutChangedEvent));
     };
@@ -61,54 +61,13 @@ export function test_event_LayoutChanged_IsRaised() {
     stackLayout.addChild(button);
     newPage.content = stackLayout;
 
-    TKUnit.waitUntilReady(() => stackLayoutChanged && buttonLayoutChanged);
+    TKUnit.waitUntilReady(() => stackLayoutChanged && buttonLayoutChanged, 5);
     TKUnit.assert(stackLayoutChanged);
     TKUnit.assert(buttonLayoutChanged);
 
     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() {
     const test = function (views: Array<View>) {
         let stackLayoutChanged = false;
@@ -124,7 +83,7 @@ export function test_event_LayoutChanged_IsRaised_ChildMarginChanged() {
 
         (<Button>views[2]).marginTop = 50;
 
-        TKUnit.waitUntilReady(() => buttonLayoutChanged);
+        TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
 
         TKUnit.assert(stackLayoutChanged);
         TKUnit.assert(buttonLayoutChanged);
@@ -148,7 +107,7 @@ export function test_event_LayoutChanged_IsRaised_ParentMarginChanged() {
 
         (<Button>views[2]).marginTop = 50;
 
-        TKUnit.waitUntilReady(() => buttonLayoutChanged);
+        TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
 
         TKUnit.assert(stackLayoutChanged);
         TKUnit.assert(buttonLayoutChanged);
@@ -176,7 +135,7 @@ export function test_event_LayoutChanged_IsNotRaised_TransformChanged() {
         button.rotate += 50;
         button.height = 200;
 
-        TKUnit.waitUntilReady(() => button.height === 200);
+        TKUnit.waitUntilReady(() => button.height === 200, 5);
 
         TKUnit.assertEqual(stackLayoutChangedCount, 1);
         TKUnit.assertEqual(buttonLayoutChangedCount, 1);
@@ -200,7 +159,7 @@ export function test_event_LayoutChanged_IsRaised_StackLayout_SizeChanged() {
 
         (<StackLayout>views[1]).height = 100;
 
-        TKUnit.waitUntilReady(() => buttonLayoutChanged);
+        TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
 
         TKUnit.assert(stackLayoutChanged);
         TKUnit.assert(buttonLayoutChanged);