diff options
author | Stephane Delcroix <stephane@delcroix.org> | 2017-04-06 23:37:59 +0200 |
---|---|---|
committer | Jason Smith <jason.smith@xamarin.com> | 2017-04-06 14:37:59 -0700 |
commit | 1a7aea41ffa43a652e053a5b2e34b76a371a598d (patch) | |
tree | 0d17c794f88b178513904a93688d6ea859c33913 /Xamarin.Forms.Xaml.UnitTests | |
parent | ab0fabac610b5c24c086c1cbf5e88b1d48511f2a (diff) | |
download | xamarin-forms-1a7aea41ffa43a652e053a5b2e34b76a371a598d.tar.gz xamarin-forms-1a7aea41ffa43a652e053a5b2e34b76a371a598d.tar.bz2 xamarin-forms-1a7aea41ffa43a652e053a5b2e34b76a371a598d.zip |
More Xaml generic support (#857)
* [XamlG] allow x:Name on nested generic types
* [Xaml*] fail on undeclared xmlns
* [XamlC] allow x:Arguments on generic ctors
Diffstat (limited to 'Xamarin.Forms.Xaml.UnitTests')
-rw-r--r-- | Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml | 10 | ||||
-rw-r--r-- | Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs | 9 |
2 files changed, 17 insertions, 2 deletions
diff --git a/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml b/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml index da224282..0fe02287 100644 --- a/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml +++ b/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" @@ -16,6 +16,14 @@ <scg:Dictionary x:TypeArguments="sys:String, sys:String" x:Key="dict"/> <scgs:Queue x:TypeArguments="scg:KeyValuePair(sys:String,sys:String)" x:Key="queue"/> <scg:List x:TypeArguments="x:String" x:Key="stringList"/> + <scg:List x:TypeArguments="scg:KeyValuePair(x:String,x:String)" x:Key="TestList" x:Name="TestListMember" > + <scg:KeyValuePair x:TypeArguments="x:String,x:String" > + <x:Arguments> + <x:String>TheKey</x:String> + <x:String>TheValue</x:String> + </x:Arguments> + </scg:KeyValuePair> + </scg:List> </ResourceDictionary> </ContentPage.Resources> </ContentPage>
\ No newline at end of file diff --git a/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs index 5a62b9fa..6171b327 100644 --- a/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs +++ b/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs @@ -56,7 +56,14 @@ namespace Xamarin.Forms.Xaml.UnitTests { var layout = new GenericsTests (useCompiledXaml); var list = layout.FindByName<List<Button>> ("myList"); - Assert.NotNull (list); + Assert.That(list, Is.Not.Null); + Assert.That(list, Is.TypeOf<List<Button>>()); + + var nestedGenericList = layout.TestListMember; + Assert.That(nestedGenericList, Is.Not.Null); + Assert.That(nestedGenericList, Is.TypeOf<List<KeyValuePair<string, string>>>()); + + Assert.That(nestedGenericList.Count, Is.EqualTo(1)); } [TestCase (false)] |