From 4226f5b386a83dc9eb2f0c06f4920ac1be19e036 Mon Sep 17 00:00:00 2001
From: Stephane Delcroix <stephane@delcroix.org>
Date: Tue, 16 Aug 2016 20:33:44 +0200
Subject: [Xaml] Clone node tree on DT, allow markup to be evaluated multiple
 times (#295)

---
 .../MarkupExpressionParserTests.cs                 |  6 ++
 Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml    | 13 +++++
 Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml.cs | 66 ++++++++++++++++++++++
 .../Xamarin.Forms.Xaml.UnitTests.csproj            |  6 ++
 .../XamlLoaderCreateTests.cs                       |  2 +
 5 files changed, 93 insertions(+)
 create mode 100644 Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml
 create mode 100644 Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml.cs

(limited to 'Xamarin.Forms.Xaml.UnitTests')

diff --git a/Xamarin.Forms.Xaml.UnitTests/MarkupExpressionParserTests.cs b/Xamarin.Forms.Xaml.UnitTests/MarkupExpressionParserTests.cs
index 63493030..7361235c 100644
--- a/Xamarin.Forms.Xaml.UnitTests/MarkupExpressionParserTests.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/MarkupExpressionParserTests.cs
@@ -68,7 +68,13 @@ namespace Xamarin.Forms.Xaml.UnitTests
 				throw new NotImplementedException ();
 			}
 
+
 			public List<string> IgnorablePrefixes { get; set; }
+
+			public INode Clone()
+			{
+				throw new NotImplementedException();
+			}
 		}
 
 		[SetUp]
diff --git a/Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml b/Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml
new file mode 100644
index 00000000..738fac60
--- /dev/null
+++ b/Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ListView xmlns="http://xamarin.com/schemas/2014/forms"
+		xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+		xmlns:local="clr-namespace:Xamarin.Forms.Xaml.UnitTests"
+		x:Class="Xamarin.Forms.Xaml.UnitTests.TypeExtension">
+	<ListView.ItemTemplate>
+		<DataTemplate>
+			<ViewCell>
+				<Button Command="{local:Navigate Operation=Forward, Type={x:Type Grid}}" />
+			</ViewCell>
+		</DataTemplate>
+	</ListView.ItemTemplate>
+</ListView>
\ No newline at end of file
diff --git a/Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml.cs
new file mode 100644
index 00000000..6f9ef80a
--- /dev/null
+++ b/Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Input;
+using Xamarin.Forms;
+using NUnit.Framework;
+
+namespace Xamarin.Forms.Xaml.UnitTests
+{
+	public enum NavigationOperation
+	{
+		Forward,
+		Back,
+		Replace,
+	}
+
+	[ContentProperty(nameof(Operation))]
+	public class NavigateExtension : IMarkupExtension<ICommand>
+	{
+		public NavigationOperation Operation { get; set; }
+
+		public Type Type { get; set; }
+
+		public ICommand ProvideValue(IServiceProvider serviceProvider)
+		{
+			return new Command(() => { });
+		}
+
+		object IMarkupExtension.ProvideValue(IServiceProvider serviceProvider)
+		{
+			return ProvideValue(serviceProvider);
+		}
+	}
+
+	public partial class TypeExtension : ListView
+	{
+		public TypeExtension()
+		{
+			InitializeComponent();
+		}
+
+		public TypeExtension(bool useCompiledXaml)
+		{
+			//this stub will be replaced at compile time
+		}
+
+		[TestFixture]
+		public class Tests
+		{
+			[TestCase(false)]
+			[TestCase(true)]
+			public void NestedMarkupExtensionInsideDataTemplate(bool useCompiledXaml)
+			{
+				var listView = new TypeExtension(useCompiledXaml);
+				listView.ItemsSource = new string [2];
+
+				var cell = (ViewCell)listView.TemplatedItems [0];
+				var button = (Button)cell.View;
+				Assert.IsNotNull(button.Command);
+
+				cell = (ViewCell)listView.TemplatedItems [1];
+				button = (Button)cell.View;
+				Assert.IsNotNull(button.Command);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
index 577b68bb..4f67feb1 100644
--- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
+++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
@@ -353,6 +353,9 @@
     <Compile Include="SetValue.xaml.cs">
       <DependentUpon>SetValue.xaml</DependentUpon>
     </Compile>
+    <Compile Include="TypeExtension.xaml.cs">
+      <DependentUpon>TypeExtension.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="..\.nuspec\Xamarin.Forms.Debug.targets" />
@@ -629,6 +632,9 @@
     <EmbeddedResource Include="SetValue.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
+    <EmbeddedResource Include="TypeExtension.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlLoaderCreateTests.cs b/Xamarin.Forms.Xaml.UnitTests/XamlLoaderCreateTests.cs
index 23c72a00..e5486e74 100644
--- a/Xamarin.Forms.Xaml.UnitTests/XamlLoaderCreateTests.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/XamlLoaderCreateTests.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Windows.Input;
 using NUnit.Framework;
+using Xamarin.Forms.Core.UnitTests;
 
 namespace Xamarin.Forms.Xaml.UnitTests
 {
-- 
cgit v1.2.3