diff options
author | Stephane Delcroix <stephane@delcroix.org> | 2017-01-25 15:45:02 +0100 |
---|---|---|
committer | Kangho Hur <kangho.hur@samsung.com> | 2017-03-24 13:15:10 +0900 |
commit | 537e376b79120c216331be581805f7652ee6d2d2 (patch) | |
tree | 70040d16d75530ca3d0117e4104b2ff555dae519 | |
parent | 45ce925a114af5d6b2f007e3b40a34b43d71006a (diff) | |
download | xamarin-forms-537e376b79120c216331be581805f7652ee6d2d2.tar.gz xamarin-forms-537e376b79120c216331be581805f7652ee6d2d2.tar.bz2 xamarin-forms-537e376b79120c216331be581805f7652ee6d2d2.zip |
[Xaml] passing test for bz42531
3 files changed, 81 insertions, 0 deletions
diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml b/Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml new file mode 100644 index 00000000..49c473ca --- /dev/null +++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" + xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" + x:Class="Xamarin.Forms.Xaml.UnitTests.Bz42531"> + <ListView x:Name="lv"> + <ListView.ItemTemplate> + <DataTemplate> + <ViewCell> + <StackLayout Orientation="Horizontal"> + <StackLayout.Resources> + <ResourceDictionary> + <Style TargetType="Label"> + <Setter Property="HorizontalOptions" Value="Center"/> + </Style> + </ResourceDictionary> + </StackLayout.Resources> + <Label Text="Example1"/> + <Label Text="2..."/> + </StackLayout> + </ViewCell> + </DataTemplate> + </ListView.ItemTemplate> + </ListView> +</ContentPage>
\ No newline at end of file diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml.cs new file mode 100644 index 00000000..380cef6a --- /dev/null +++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using NUnit.Framework; +using Xamarin.Forms; +using Xamarin.Forms.Core.UnitTests; + +namespace Xamarin.Forms.Xaml.UnitTests +{ + public partial class Bz42531 : ContentPage + { + public Bz42531() + { + InitializeComponent(); + } + + public Bz42531(bool useCompiledXaml) + { + //this stub will be replaced at compile time + } + + [TestFixture] + class Tests + { + [SetUp] + public void Setup() + { + Device.PlatformServices = new MockPlatformServices(); + } + + [TearDown] + public void TearDown() + { + Device.PlatformServices = null; + } + + [TestCase(true)] + [TestCase(false)] + public void RDInDataTemplates(bool useCompiledXaml) + { + var p = new Bz42531(useCompiledXaml); + ListView lv = p.lv; + var template = lv.ItemTemplate; + var cell = template.CreateContent(null, lv) as ViewCell; + var sl = cell.View as StackLayout; + Assert.AreEqual(1, sl.Resources.Count); + var label = sl.Children[0] as Label; + Assert.AreEqual(LayoutOptions.Center, label.HorizontalOptions); + } + } + } +}
\ 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 edd19e40..89a348b1 100644 --- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj +++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj @@ -430,6 +430,9 @@ <Compile Include="Issues\Bz51567.xaml.cs"> <DependentUpon>Bz51567.xaml</DependentUpon> </Compile> + <Compile Include="Issues\Bz42531.xaml.cs"> + <DependentUpon>Bz42531.xaml</DependentUpon> + </Compile> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="..\.nuspec\Xamarin.Forms.Debug.targets" /> @@ -781,6 +784,9 @@ <EmbeddedResource Include="Issues\Bz51567.xaml"> <Generator>MSBuild:UpdateDesignTimeXaml</Generator> </EmbeddedResource> + <EmbeddedResource Include="Issues\Bz42531.xaml"> + <Generator>MSBuild:UpdateDesignTimeXaml</Generator> + </EmbeddedResource> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> |