From ea1ebd2c9497110f3b245db8070c82d170ff6550 Mon Sep 17 00:00:00 2001
From: Peter Staev <peter@tangrasoft.com>
Date: Mon, 15 Feb 2016 12:18:32 +0200
Subject: [PATCH] tests for #1488

---
 CrossPlatformModules.csproj                   |  6 +++
 .../ui/action-bar/action-bar-tests-common.ts  | 52 +++++++++++++++++++
 apps/ui-tests-app/action-bar/action-view.ts   |  5 ++
 apps/ui-tests-app/action-bar/action-view.xml  | 19 +++++++
 apps/ui-tests-app/mainPage.ts                 |  1 +
 tsconfig.json                                 |  1 +
 6 files changed, 84 insertions(+)
 create mode 100644 apps/ui-tests-app/action-bar/action-view.ts
 create mode 100644 apps/ui-tests-app/action-bar/action-view.xml

diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 760e382c0..0ffa03671 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -222,6 +222,9 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="apps\tests\pages\tab-view.xml" />
+    <Content Include="apps\ui-tests-app\action-bar\action-view.xml">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="apps\ui-tests-app\action-bar\system-icons.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -255,6 +258,9 @@
       <SubType>Designer</SubType>
     </Content>
     <TypeScriptCompile Include="apps\ui-tests-app\animations\background.ts" />
+    <TypeScriptCompile Include="apps\ui-tests-app\action-bar\action-view.ts">
+      <DependentUpon>action-view.xml</DependentUpon>
+    </TypeScriptCompile>
     <TypeScriptCompile Include="apps\ui-tests-app\pages\touch-event.ts" />
     <Content Include="apps\ui-tests-app\pages\touch-event.xml">
       <SubType>Designer</SubType>
diff --git a/apps/tests/ui/action-bar/action-bar-tests-common.ts b/apps/tests/ui/action-bar/action-bar-tests-common.ts
index 00bb42ba8..2c4b888e1 100644
--- a/apps/tests/ui/action-bar/action-bar-tests-common.ts
+++ b/apps/tests/ui/action-bar/action-bar-tests-common.ts
@@ -118,6 +118,27 @@ import actionBarModule = require("ui/action-bar");
 //The value should be a string such as 'ic_menu_search' if you want to display the built-in Android Menu Search icon for example.
 //For a full list of Android drawable names, please visit http://androiddrawables.com
 //
+// ## Displaying Custom View in Action Items
+//```XML
+// <Page>
+//   <Page.actionBar>
+//     <ActionBar>
+//       <ActionBar.actionItems>
+//			<ActionItem>
+//			  <ActionItem.actionView>
+//				  <StackLayout orientation="horizontal">
+//				    <Label text="Green" color="green"/>
+//				    <Label text="Red" color="red"/>
+//				  </StackLayout>
+//			  </ActionItem.actionView>
+//			</ActionItem>
+//       </ActionBar.actionItems>
+//     </ActionBar>
+//   </Page.actionBar>
+//   ...
+// </Page>
+//```
+//
 // ## Setting Navigation Button
 //```XML
 // <Page>
@@ -197,6 +218,37 @@ export function test_actionItem_page_property_inXML() {
     TKUnit.assertEqual(actionItem.page, p, "actionItem.page");
 };
 
+export function test_actionItem_actionView_inXML() {
+    var p = <PageModule.Page>builder.parse(
+        "<Page> <Page.actionBar> <ActionBar> <ActionItem> <ActionItem.actionView>" +
+        "<Label/>" +
+        "</ActionItem.actionView> </ActionItem> </ActionBar> </Page.actionBar> </Page>");
+
+    var label = <LabelModule.Label>p.actionBar.actionItems.getItemAt(0).actionView;
+    TKUnit.assert(label instanceof LabelModule.Label, "ActionItem.actionView not loaded correctly");
+};
+
+export function test_actionItem_actionView_inherit_bindingContext_inXML() {
+    var p = <PageModule.Page>builder.parse(
+        "<Page> <Page.actionBar> <ActionBar> <ActionItem> <ActionItem.actionView>" +
+        "<Label text=\"{{ myProp }} \" />" +
+        "</ActionItem.actionView> </ActionItem> </ActionBar> </Page.actionBar> </Page>");
+    p.bindingContext = { myProp: "success" };
+
+    var label = <LabelModule.Label>p.actionBar.actionItems.getItemAt(0).actionView;
+    TKUnit.assert(label instanceof LabelModule.Label, "ActionItem.actionView not loaded correctly");
+    TKUnit.assertEqual(label.text, "success", "ActionItem.actionView");
+};
+
+export function test_ActionBar_is_not_empty_when_actionItem_actionView_is_set() {
+    var p = <PageModule.Page>builder.parse(
+        "<Page> <Page.actionBar> <ActionBar> <ActionItem> <ActionItem.actionView>" +
+        "<Label text=\"test\" />" +
+        "</ActionItem.actionView> </ActionItem> </ActionBar> </Page.actionBar> </Page>");
+
+    TKUnit.assertFalse(p.actionBar._isEmpty(), "ActionItem.actionView is set but ActionBar reports empty");
+};
+
 export function test_navigationButton_inherit_bindingContext_inXML() {
     var p = <PageModule.Page>builder.parse(
         "<Page> <Page.actionBar> <ActionBar>" +
diff --git a/apps/ui-tests-app/action-bar/action-view.ts b/apps/ui-tests-app/action-bar/action-view.ts
new file mode 100644
index 000000000..ac77dc39d
--- /dev/null
+++ b/apps/ui-tests-app/action-bar/action-view.ts
@@ -0,0 +1,5 @@
+import frame = require("ui/frame");
+
+export function navigate(args) {
+    frame.topmost().navigate("action-bar/clean");
+}
\ No newline at end of file
diff --git a/apps/ui-tests-app/action-bar/action-view.xml b/apps/ui-tests-app/action-bar/action-view.xml
new file mode 100644
index 000000000..9e8d414c9
--- /dev/null
+++ b/apps/ui-tests-app/action-bar/action-view.xml
@@ -0,0 +1,19 @@
+<Page>
+  <Page.actionBar>
+    <ActionBar>
+      <ActionBar.actionItems>
+        <ActionItem>
+          <ActionItem.actionView>
+            <StackLayout orientation="horizontal">
+              <Label text="Green" color="green"/>
+              <Label text="Red" color="red"/>
+            </StackLayout>
+          </ActionItem.actionView>
+        </ActionItem>
+      </ActionBar.actionItems>
+    </ActionBar>
+  </Page.actionBar>
+  <StackLayout>
+    <Button text="go to cleared page" tap="navigate"/>
+  </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/ui-tests-app/mainPage.ts b/apps/ui-tests-app/mainPage.ts
index f51cb64fc..c9ea5ee93 100644
--- a/apps/ui-tests-app/mainPage.ts
+++ b/apps/ui-tests-app/mainPage.ts
@@ -36,6 +36,7 @@ examples.set("actColor", "action-bar/color");
 examples.set("actBG", "action-bar/background");
 examples.set("actStyle", "action-bar/all");
 examples.set("actIcons", "action-bar/system-icons");
+examples.set("actView", "action-bar/action-view");
 
 examples.set("basics", "bindings/basics");
 examples.set("xmlbasics", "bindings/xmlbasics");
diff --git a/tsconfig.json b/tsconfig.json
index 261d57187..61614eadd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -343,6 +343,7 @@
         "apps/ui-tests-app/action-bar/clean.ts",
         "apps/ui-tests-app/action-bar/color.ts",
         "apps/ui-tests-app/action-bar/system-icons.ts",
+        "apps/ui-tests-app/action-bar/action-view.ts",
         "apps/ui-tests-app/animations/background.ts",
         "apps/ui-tests-app/app.ts",
         "apps/ui-tests-app/bindings/basics.ts",