diff options
| author | kingces95 <kingces95@users.noreply.github.com> | 2017-04-11 14:02:06 -0400 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2017-04-11 19:02:06 +0100 |
| commit | 093a4efa2da9cb681890158ca8ee9bb6f30b0a8c (patch) | |
| tree | ccc17255876e40d2c845d7b2c62dfc930156729d /Xamarin.Forms.Core.UnitTests | |
| parent | 7458ca37330f424bf7fb1447580b0fa9c34c6db4 (diff) | |
| download | xamarin-forms-093a4efa2da9cb681890158ca8ee9bb6f30b0a8c.tar.gz xamarin-forms-093a4efa2da9cb681890158ca8ee9bb6f30b0a8c.tar.bz2 xamarin-forms-093a4efa2da9cb681890158ca8ee9bb6f30b0a8c.zip | |
Implicit impl of controller ifaces (#807)
* Simplify ICtrl callsites
* Rebase fix
Diffstat (limited to 'Xamarin.Forms.Core.UnitTests')
4 files changed, 8 insertions, 8 deletions
diff --git a/Xamarin.Forms.Core.UnitTests/CellTests.cs b/Xamarin.Forms.Core.UnitTests/CellTests.cs index e7c6266b..0006b4cf 100644 --- a/Xamarin.Forms.Core.UnitTests/CellTests.cs +++ b/Xamarin.Forms.Core.UnitTests/CellTests.cs @@ -44,7 +44,7 @@ namespace Xamarin.Forms.Core.UnitTests bool emitted = false; cell.Appearing += (sender, args) => emitted = true; - ((ICellController)cell).SendAppearing (); + cell.SendAppearing (); Assert.True (emitted); Assert.True (cell.OnAppearingSent); Assert.False (cell.OnDisappearingSent); @@ -58,7 +58,7 @@ namespace Xamarin.Forms.Core.UnitTests bool emitted = false; cell.Disappearing += (sender, args) => emitted = true; - ((ICellController)cell).SendDisappearing (); + cell.SendDisappearing (); Assert.True (emitted); Assert.False (cell.OnAppearingSent); Assert.True (cell.OnDisappearingSent); @@ -159,7 +159,7 @@ namespace Xamarin.Forms.Core.UnitTests var cell = new ViewCell { Parent = lv }; int numberOfCalls = 0; - ((ICellController)cell).ForceUpdateSizeRequested += (object sender, System.EventArgs e) => { numberOfCalls++; }; + cell.ForceUpdateSizeRequested += (object sender, System.EventArgs e) => { numberOfCalls++; }; cell.ForceUpdateSize (); cell.ForceUpdateSize (); @@ -178,7 +178,7 @@ namespace Xamarin.Forms.Core.UnitTests var cell = new ViewCell { Parent = lv }; int numberOfCalls = 0; - ((ICellController)cell).ForceUpdateSizeRequested += (object sender, System.EventArgs e) => { numberOfCalls++; }; + cell.ForceUpdateSizeRequested += (object sender, System.EventArgs e) => { numberOfCalls++; }; cell.ForceUpdateSize (); diff --git a/Xamarin.Forms.Core.UnitTests/ImageTests.cs b/Xamarin.Forms.Core.UnitTests/ImageTests.cs index 1e14eb3c..36777748 100644 --- a/Xamarin.Forms.Core.UnitTests/ImageTests.cs +++ b/Xamarin.Forms.Core.UnitTests/ImageTests.cs @@ -249,9 +249,9 @@ namespace Xamarin.Forms.Core.UnitTests { if (initialLoad && Element.Source != null) { initialLoad = false; - ((IImageController)Element).SetIsLoading(true); + Element.SetIsLoading(true); await (Element.Source as UriImageSource).GetStreamAsync (); - ((IImageController)Element).SetIsLoading(false); + Element.SetIsLoading(false); } } diff --git a/Xamarin.Forms.Core.UnitTests/NavigationMenuUnitTests.cs b/Xamarin.Forms.Core.UnitTests/NavigationMenuUnitTests.cs index 8ed5e738..ed16e551 100644 --- a/Xamarin.Forms.Core.UnitTests/NavigationMenuUnitTests.cs +++ b/Xamarin.Forms.Core.UnitTests/NavigationMenuUnitTests.cs @@ -183,7 +183,7 @@ namespace Xamarin.Forms.Core.UnitTests }; menu.Add (child); - ((INavigationMenuController)menu).SendTargetSelected (child); + menu.SendTargetSelected (child); Assert.True (pushed); Assert.AreEqual (child, navForm.CurrentPage); diff --git a/Xamarin.Forms.Core.UnitTests/OpenGLViewUnitTests.cs b/Xamarin.Forms.Core.UnitTests/OpenGLViewUnitTests.cs index e095914c..4a658323 100644 --- a/Xamarin.Forms.Core.UnitTests/OpenGLViewUnitTests.cs +++ b/Xamarin.Forms.Core.UnitTests/OpenGLViewUnitTests.cs @@ -11,7 +11,7 @@ namespace Xamarin.Forms.Core.UnitTests var view = new OpenGLView (); bool displayed = false; - ((IOpenGlViewController)view).DisplayRequested += (s, o) => displayed = true; + view.DisplayRequested += (s, o) => displayed = true; view.Display (); Assert.True (displayed); |