[Xaml] x:Static in x:Arguments (#288)

* [Xaml] Support x:Static as x:Arguments

* [XamlC] allow x:Static in x:Arguments

* fix typo, remove commented code

1 files changed, 29 insertions, 1 deletions

diff --git a/Xamarin.Forms.Xaml.UnitTests/FactoryMethods.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/FactoryMethods.xaml.cs
index 42f359b7..9fa4e924 100644
--- a/Xamarin.Forms.Xaml.UnitTests/FactoryMethods.xaml.cs
+++ b/Xamarin.Forms.Xaml.UnitTests/FactoryMethods.xaml.cs
@@ -1,5 +1,6 @@
 using Xamarin.Forms;
 using NUnit.Framework;
+using Xamarin.Forms.Core.UnitTests;
 
 namespace Xamarin.Forms.Xaml.UnitTests
 {
@@ -16,11 +17,16 @@ namespace Xamarin.Forms.Xaml.UnitTests
 			Content = "default ctor";
 		}
 
-		public MockFactory (string arg0, string arg1)
+		public MockFactory(string arg0, string arg1)
 		{
 			Content = "alternate ctor " + arg0 + arg1;
 		}
 
+		public MockFactory(string arg0)
+		{
+			Content = "alternate ctor " + arg0;
+		}
+
 		public MockFactory (int arg)
 		{
 			Content = "int ctor " + arg.ToString ();
@@ -63,6 +69,12 @@ namespace Xamarin.Forms.Xaml.UnitTests
 		[TestFixture]
 		public class Tests
 		{
+			[SetUp]
+			public void SetUp()
+			{
+				Device.PlatformServices = new MockPlatformServices();
+			}
+
 			[TestCase (false)]
 			[TestCase (true)]
 			public void TestDefaultCtor (bool useCompiledXaml)
@@ -110,6 +122,22 @@ namespace Xamarin.Forms.Xaml.UnitTests
 				var layout = new FactoryMethods (useCompiledXaml);
 				Assert.AreEqual ("factory 42foo", layout.v5.Content.Content);
 			}
+
+			[TestCase(false)]
+			[TestCase(true)]
+			public void TestCtorWithxStatic(bool useCompiledXaml)
+			{
+				var layout = new FactoryMethods(useCompiledXaml);
+				Assert.AreEqual("alternate ctor Property", layout.v6.Content.Content);
+			}
+
+			[TestCase(false)]
+			[TestCase(true)]
+			public void TestCtorWithxStaticAttribute(bool useCompiledXaml)
+			{
+				var layout = new FactoryMethods(useCompiledXaml);
+				Assert.AreEqual("alternate ctor Property", layout.v7.Content.Content);
+			}
 		}
 	}
 }
\ No newline at end of file