diff options
| author | Stephane Delcroix <stephane@delcroix.org> | 2017-01-12 21:05:41 +0100 |
|---|---|---|
| committer | Jason Smith <jason.smith@xamarin.com> | 2017-01-12 12:05:41 -0800 |
| commit | b6cb64e4930de9b16309f2d30c6bb0a2177048fd (patch) | |
| tree | ae15f36d3e0e60cac6305f90520ad778de9c6ee3 /Xamarin.Forms.Core.UnitTests/ViewUnitTests.cs | |
| parent | 3af99cbbe145a876cc9839af0adead83695b5445 (diff) | |
| download | xamarin-forms-b6cb64e4930de9b16309f2d30c6bb0a2177048fd.tar.gz xamarin-forms-b6cb64e4930de9b16309f2d30c6bb0a2177048fd.tar.bz2 xamarin-forms-b6cb64e4930de9b16309f2d30c6bb0a2177048fd.zip | |
[C] new OnPlatform mechanism (#658)
* [C] Obsolete TargetPlatform
* [Xaml] support and test the new syntax
* blind fix windows platforms
Diffstat (limited to 'Xamarin.Forms.Core.UnitTests/ViewUnitTests.cs')
| -rw-r--r-- | Xamarin.Forms.Core.UnitTests/ViewUnitTests.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Xamarin.Forms.Core.UnitTests/ViewUnitTests.cs b/Xamarin.Forms.Core.UnitTests/ViewUnitTests.cs index 9e7f0546..3bea3725 100644 --- a/Xamarin.Forms.Core.UnitTests/ViewUnitTests.cs +++ b/Xamarin.Forms.Core.UnitTests/ViewUnitTests.cs @@ -103,7 +103,7 @@ namespace Xamarin.Forms.Core.UnitTests bool android = false; bool winphone = false; - Device.OS = TargetPlatform.iOS; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.iOS; Device.OnPlatform ( iOS: () => ios = true, @@ -124,7 +124,7 @@ namespace Xamarin.Forms.Core.UnitTests bool android = false; bool winphone = false; - Device.OS = TargetPlatform.Android; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.Android; Device.OnPlatform ( iOS: () => ios = true, @@ -145,7 +145,7 @@ namespace Xamarin.Forms.Core.UnitTests bool android = false; bool winphone = false; - Device.OS = TargetPlatform.WinPhone; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.WinPhone; Device.OnPlatform ( iOS: () => ios = true, @@ -165,7 +165,7 @@ namespace Xamarin.Forms.Core.UnitTests bool ios = false; bool android = false; - Device.OS = TargetPlatform.Android; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.Android; Device.OnPlatform ( iOS: () => ios = false, @@ -179,7 +179,7 @@ namespace Xamarin.Forms.Core.UnitTests public void TestOnPlatformNoOpWithoutDefault () { bool any = false; - Device.OS = TargetPlatform.Other; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = "Other"; Device.OnPlatform ( iOS: () => any = true, @@ -194,7 +194,7 @@ namespace Xamarin.Forms.Core.UnitTests { bool defaultExecuted = false; - Device.OS = TargetPlatform.iOS; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.iOS; Device.OnPlatform ( Android: () => { }, @@ -209,7 +209,7 @@ namespace Xamarin.Forms.Core.UnitTests { bool defaultExecuted = false; - Device.OS = TargetPlatform.Android; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.Android; Device.OnPlatform ( iOS: () => { }, @@ -224,7 +224,7 @@ namespace Xamarin.Forms.Core.UnitTests { bool defaultExecuted = false; - Device.OS = TargetPlatform.WinPhone; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.WinPhone; Device.OnPlatform ( iOS: () => { }, @@ -239,7 +239,7 @@ namespace Xamarin.Forms.Core.UnitTests { bool defaultExecuted = false; - Device.OS = TargetPlatform.Other; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = "Other"; Device.OnPlatform ( iOS: () => { }, @@ -432,16 +432,16 @@ namespace Xamarin.Forms.Core.UnitTests [Test] public void TestOnPlatformGeneric () { - Device.OS = TargetPlatform.WinPhone; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.WinPhone; Assert.AreEqual (3, Device.OnPlatform (1, 2, 3)); - Device.OS = TargetPlatform.iOS; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.iOS; Assert.AreEqual (1, Device.OnPlatform (1, 2, 3)); - Device.OS = TargetPlatform.Android; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = Device.Android; Assert.AreEqual (2, Device.OnPlatform (1, 2, 3)); - Device.OS = TargetPlatform.Other; + ((MockPlatformServices)Device.PlatformServices).RuntimePlatform = "Other"; Assert.AreEqual (1, Device.OnPlatform (1, 2, 3)); } |