From 2079201006696fcf215cbb0edb1efc71eefb202f Mon Sep 17 00:00:00 2001
From: SvetoslavTsenov <tsenov.svetoslav@gmail.com>
Date: Tue, 16 May 2017 17:19:52 +0300
Subject: [PATCH] Include  test case for item 4151

---
 .../modal-page-hidden-action-bar.ts           |  2 +-
 .../app/ui-tests-app/action-bar/modal-page.ts | 19 +++++++++++++-
 .../ui-tests-app/action-bar/modal-page.xml    |  3 +++
 .../modal-test-hidden-action-bar.ts           |  2 +-
 .../action-bar/modal-test-with-action-bar.ts  |  1 +
 .../action-bar/modal-test-with-action-bar.xml | 26 +++++++++----------
 6 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/apps/app/ui-tests-app/action-bar/modal-page-hidden-action-bar.ts b/apps/app/ui-tests-app/action-bar/modal-page-hidden-action-bar.ts
index 3641aaa7b..11905e11c 100644
--- a/apps/app/ui-tests-app/action-bar/modal-page-hidden-action-bar.ts
+++ b/apps/app/ui-tests-app/action-bar/modal-page-hidden-action-bar.ts
@@ -7,5 +7,5 @@ export function onShownModally(args: ShownModallyData) {
 }
 
 export function onTap() {
-    closeCallback("sample text");
+    closeCallback("sample text\n");
 }
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/action-bar/modal-page.ts b/apps/app/ui-tests-app/action-bar/modal-page.ts
index 3641aaa7b..72163758d 100644
--- a/apps/app/ui-tests-app/action-bar/modal-page.ts
+++ b/apps/app/ui-tests-app/action-bar/modal-page.ts
@@ -1,4 +1,7 @@
 import { ShownModallyData } from "tns-core-modules/ui/page";
+import { Button } from "tns-core-modules/ui/button";
+import { Label } from "tns-core-modules/ui/label"
+import { Page } from "tns-core-modules/ui/page"
 
 let closeCallback: Function;
 
@@ -7,5 +10,19 @@ export function onShownModally(args: ShownModallyData) {
 }
 
 export function onTap() {
-    closeCallback("sample text");
+    closeCallback("sample text\n");
+}
+
+export function change(args){
+     var button:Button =<Button>args.object;
+
+    var page:Page =<Page> button.parent;
+    
+    console.log("---------------------page-------------------------")
+    console.log(page)
+     var label:Label = <Label> page.getViewById("label1");
+     label.text="fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo";
+
+     var label2:Label = <Label> page.getViewById("label2");
+     label2.text="foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo";
 }
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/action-bar/modal-page.xml b/apps/app/ui-tests-app/action-bar/modal-page.xml
index 3c46fdbdc..280bb39d6 100644
--- a/apps/app/ui-tests-app/action-bar/modal-page.xml
+++ b/apps/app/ui-tests-app/action-bar/modal-page.xml
@@ -1,5 +1,8 @@
 <Page showingModally="onShownModally">
     <StackLayout id="layout" >
+        <Label backgroundColor="green" id="label1" text="short" textWrap="true" />
+        <Label backgroundColor="red" id="label2" text="" textWrap="true" />
+        <Button text="Change text" tap="change" />
         <Button text="Close" tap="onTap" />
     </StackLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/action-bar/modal-test-hidden-action-bar.ts b/apps/app/ui-tests-app/action-bar/modal-test-hidden-action-bar.ts
index c862372fa..59ac98c38 100644
--- a/apps/app/ui-tests-app/action-bar/modal-test-hidden-action-bar.ts
+++ b/apps/app/ui-tests-app/action-bar/modal-test-hidden-action-bar.ts
@@ -4,7 +4,7 @@ import { topmost } from "tns-core-modules/ui/frame";
 
 export function btnClick(args: EventData) {
     (<Page>args.object).page.showModal("ui-tests-app/action-bar/modal-page", "", function (arg: string) {
-        // ...
+        console.log("Callback args: " + arg);
     }, true);
 }
 
diff --git a/apps/app/ui-tests-app/action-bar/modal-test-with-action-bar.ts b/apps/app/ui-tests-app/action-bar/modal-test-with-action-bar.ts
index afa6731ec..f8f297b82 100644
--- a/apps/app/ui-tests-app/action-bar/modal-test-with-action-bar.ts
+++ b/apps/app/ui-tests-app/action-bar/modal-test-with-action-bar.ts
@@ -5,6 +5,7 @@ import { topmost } from "tns-core-modules/ui/frame";
 export function btnClick(args: EventData) {
     (<Page>args.object).page.showModal("ui-tests-app/action-bar/modal-page-hidden-action-bar", "", function (arg: string) {
         // ...
+        console.log("Callback args: " + arg);
     }, true);
 }
 
diff --git a/apps/app/ui-tests-app/action-bar/modal-test-with-action-bar.xml b/apps/app/ui-tests-app/action-bar/modal-test-with-action-bar.xml
index a8e373ad2..43fc81092 100644
--- a/apps/app/ui-tests-app/action-bar/modal-test-with-action-bar.xml
+++ b/apps/app/ui-tests-app/action-bar/modal-test-with-action-bar.xml
@@ -1,15 +1,15 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd">
-  <Page.actionBar>
-      <ActionBar backgroundColor="green" title="Main View" icon="">
-          <NavigationButton text="Back" icon="" tap="" />
-          <ActionBar.actionItems>
-              <ActionItem icon="" text="Left" tap="" ios.position="left" />
-              <ActionItem icon="" text="Right" tap="" ios.position="right" />
-          </ActionBar.actionItems>
-      </ActionBar>
-  </Page.actionBar>
-  <StackLayout>
-    <button text="Open Modal" tap="btnClick" />
-    <button text="Go Back" tap="btnBack" />
-  </StackLayout>
+    <Page.actionBar>
+        <ActionBar backgroundColor="green" title="Main View" icon="">
+            <NavigationButton text="Back" icon="" tap="" />
+            <ActionBar.actionItems>
+                <ActionItem icon="" text="Left" tap="" ios.position="left" />
+                <ActionItem icon="" text="Right" tap="" ios.position="right" />
+            </ActionBar.actionItems>
+        </ActionBar>
+    </Page.actionBar>
+    <StackLayout>
+        <button text="Open Modal" tap="btnClick" />
+        <button text="Go Back" tap="btnBack" />
+    </StackLayout>
 </Page>
\ No newline at end of file