Prep Page for removal of InternalsVisibleTo (#150)

9 files changed, 58 insertions, 45 deletions

diff --git a/Xamarin.Forms.Core.UnitTests/ContentViewUnitTest.cs b/Xamarin.Forms.Core.UnitTests/ContentViewUnitTest.cs
index 9d7a12e0..73bb531b 100644
--- a/Xamarin.Forms.Core.UnitTests/ContentViewUnitTest.cs
+++ b/Xamarin.Forms.Core.UnitTests/ContentViewUnitTest.cs
@@ -280,7 +280,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			contentView.Content = child;
 			contentView.Platform = platform;
 
-			Assert.AreEqual (child, contentView.LogicalChildren[0]);
+			Assert.AreEqual (child, ((IElementController)contentView).LogicalChildren[0]);
 		}
 
 		class SimpleTemplate : StackLayout
@@ -303,7 +303,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			contentView.ControlTemplate = new ControlTemplate (typeof (SimpleTemplate));
 			contentView.Platform = platform;
 
-			Assert.That (contentView.LogicalChildren[0], Is.TypeOf<SimpleTemplate> ());
+			Assert.That (((IElementController)contentView).LogicalChildren[0], Is.TypeOf<SimpleTemplate> ());
 		}
 
 		[Test]
@@ -318,7 +318,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			contentView.Content = child;
 			contentView.Platform = platform;
 
-			Assume.That (contentView.LogicalChildren[0], Is.TypeOf<SimpleTemplate> ());
+			Assume.That (((IElementController)contentView).LogicalChildren[0], Is.TypeOf<SimpleTemplate> ());
 			Assert.That (contentView.Descendants (), Contains.Item (child));
 		}
 
@@ -337,8 +337,8 @@ namespace Xamarin.Forms.Core.UnitTests
 			var bc = "Test";
 			contentView.BindingContext = bc;
 
-			Assert.AreNotEqual (bc, contentView.LogicalChildren[0].BindingContext);
-			Assert.IsNull (contentView.LogicalChildren[0].BindingContext);
+			Assert.AreNotEqual (bc, ((IElementController)contentView).LogicalChildren[0].BindingContext);
+			Assert.IsNull (((IElementController)contentView).LogicalChildren[0].BindingContext);
 		}
 
 		[Test]
diff --git a/Xamarin.Forms.Core.UnitTests/ControlTemplateTests.cs b/Xamarin.Forms.Core.UnitTests/ControlTemplateTests.cs
index ffced2d2..f0d22d1c 100644
--- a/Xamarin.Forms.Core.UnitTests/ControlTemplateTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/ControlTemplateTests.cs
@@ -70,7 +70,11 @@ namespace Xamarin.Forms.Core.UnitTests
 
 			var label = new Label ();
 			testView.Content = label;
-			var originalPresenter = (ContentPresenter)testView.LogicalChildren[0].LogicalChildren[0];
+
+			var child1 = ((IElementController)testView).LogicalChildren[0];
+			var child2 = ((IElementController)child1).LogicalChildren[0];
+
+			var originalPresenter = (ContentPresenter)child2;
 
 			Assert.AreEqual (label, originalPresenter.Content);
 
@@ -83,7 +87,11 @@ namespace Xamarin.Forms.Core.UnitTests
 		public void NestedTemplateBindings ()
 		{
 			var testView = new TestView ();
-			var label = (Label)testView.LogicalChildren[0].LogicalChildren[0];
+
+			var child1 = ((IElementController)testView).LogicalChildren[0];
+			var child2 = ((IElementController)child1).LogicalChildren[0];
+
+			var label = (Label)child2;
 
 			testView.Platform = new UnitPlatform ();
 			Assert.IsNull (label.Text);
@@ -101,7 +109,11 @@ namespace Xamarin.Forms.Core.UnitTests
 
 			parentView.Content = childView;
 			childView.Content = new Button ();
-			var childPresenter = (ContentPresenter)childView.LogicalChildren[0].LogicalChildren[1];
+
+			var child1 = ((IElementController)childView).LogicalChildren[0];
+			var child2 = ((IElementController)child1).LogicalChildren[1];
+
+			var childPresenter = (ContentPresenter)child2;
 
 			parentView.ControlTemplate = new ControlTemplate (typeof (ContentControl));
 			Assert.IsNotNull (childPresenter.Content);
@@ -171,7 +183,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			page.ControlTemplate = new ControlTemplate (typeof (TestContent));
 			page.SetBinding (TestPage.NameProperty, "Name");
 
-			var entry = ((ContentView)page.LogicalChildren[0]).Content as Entry;
+			var entry = ((ContentView)((IElementController)page).LogicalChildren[0]).Content as Entry;
 			((IElementController)entry).SetValueFromRenderer (Entry.TextProperty, "Bar");
 			viewModel.Name = "Raz";
 
diff --git a/Xamarin.Forms.Core.UnitTests/ElementTests.cs b/Xamarin.Forms.Core.UnitTests/ElementTests.cs
index 6bffe338..8ac782e7 100644
--- a/Xamarin.Forms.Core.UnitTests/ElementTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/ElementTests.cs
@@ -31,7 +31,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			get { return internalChildren; }
 		}
 
-		internal override ReadOnlyCollection<Element> LogicalChildren
+		internal override ReadOnlyCollection<Element> LogicalChildrenInternal
 		{
 			get { return new ReadOnlyCollection<Element> (internalChildren); }
 		}
diff --git a/Xamarin.Forms.Core.UnitTests/GridTests.cs b/Xamarin.Forms.Core.UnitTests/GridTests.cs
index 359d2b5b..fa92b566 100644
--- a/Xamarin.Forms.Core.UnitTests/GridTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/GridTests.cs
@@ -771,7 +771,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			};
 
 			layout.Children.Remove (labela0);
-			Assert.False (layout.LogicalChildren.Contains (labela0));
+			Assert.False (((IElementController)layout).LogicalChildren.Contains (labela0));
 		}
 
 		[Test]
diff --git a/Xamarin.Forms.Core.UnitTests/GroupViewUnitTests.cs b/Xamarin.Forms.Core.UnitTests/GroupViewUnitTests.cs
index fe823b1a..215b1355 100644
--- a/Xamarin.Forms.Core.UnitTests/GroupViewUnitTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/GroupViewUnitTests.cs
@@ -10,7 +10,7 @@ namespace Xamarin.Forms.Core.UnitTests
 	{
 		protected override void LayoutChildren (double x, double y, double width, double height)
 		{
-			foreach (var child in LogicalChildren.Cast<View>()) {
+			foreach (var child in ((IElementController)this).LogicalChildren.Cast<View>()) {
 				var result = new Rectangle (x, y, 0, 0);
 				var request = child.GetSizeRequest (double.PositiveInfinity, double.PositiveInfinity);
 				result.Width = request.Request.Width;
@@ -42,11 +42,11 @@ namespace Xamarin.Forms.Core.UnitTests
 
 			view.RaiseChild (child1);
 
-			Assert.AreEqual (child1, view.LogicalChildren [2]);
+			Assert.AreEqual (child1, ((IElementController)view).LogicalChildren [2]);
 			Assert.True (reordered);
 
 			view.RaiseChild (child2);
-			Assert.AreEqual (child2, view.LogicalChildren [2]);
+			Assert.AreEqual (child2, ((IElementController)view).LogicalChildren [2]);
 		}
 
 		[Test]
@@ -87,11 +87,11 @@ namespace Xamarin.Forms.Core.UnitTests
 
 			view.LowerChild (child3);
 
-			Assert.AreEqual (child3, view.LogicalChildren [0]);
+			Assert.AreEqual (child3, ((IElementController)view).LogicalChildren [0]);
 			Assert.True (reordered);
 
 			view.LowerChild (child2);
-			Assert.AreEqual (child2, view.LogicalChildren [0]);
+			Assert.AreEqual (child2, ((IElementController)view).LogicalChildren [0]);
 		}
 
 		[Test]
@@ -126,7 +126,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			view.Children.Add (child1);
 
 			Assert.True (added);
-			Assert.AreEqual (child1, view.LogicalChildren [0]);
+			Assert.AreEqual (child1, ((IElementController)view).LogicalChildren [0]);
 		}
 
 		[Test]
@@ -142,7 +142,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			view.Children.Add (child1);
 
 			Assert.False (added);
-			Assert.AreEqual (child1, view.LogicalChildren [0]);
+			Assert.AreEqual (child1, ((IElementController)view).LogicalChildren [0]);
 		}
 
 		[Test]
@@ -159,7 +159,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			view.Children.Remove (child1);
 
 			Assert.True (removed);
-			Assert.False (view.LogicalChildren.Any ());
+			Assert.False (((IElementController)view).LogicalChildren.Any ());
 		}
 
 		[Test]
@@ -177,7 +177,7 @@ namespace Xamarin.Forms.Core.UnitTests
 				view.Children.Add (child);
 
 			int i = 0;
-			foreach (var child in view.LogicalChildren) {
+			foreach (var child in ((IElementController)view).LogicalChildren) {
 				Assert.AreEqual (children[i], child);
 				i++;
 			}
@@ -198,7 +198,7 @@ namespace Xamarin.Forms.Core.UnitTests
 				view.Children.Add (child);
 
 			int i = 0;
-			var enumerator = (view.LogicalChildren as IEnumerable).GetEnumerator ();
+			var enumerator = (((IElementController)view).LogicalChildren as IEnumerable).GetEnumerator ();
 			while (enumerator.MoveNext ()) {
 				Assert.AreEqual (children [i], enumerator.Current as View);
 				i++;
@@ -216,10 +216,10 @@ namespace Xamarin.Forms.Core.UnitTests
 				}
 			};
 
-			Assert.AreEqual (2, group.LogicalChildren.Count);
-			Assert.IsTrue (group.LogicalChildren.Contains (view1));
-			Assert.IsTrue (group.LogicalChildren.Contains (view2));
-			Assert.AreEqual (view1, group.LogicalChildren[0]);
+			Assert.AreEqual (2, ((IElementController)group).LogicalChildren.Count);
+			Assert.IsTrue (((IElementController)group).LogicalChildren.Contains (view1));
+			Assert.IsTrue (((IElementController)group).LogicalChildren.Contains (view2));
+			Assert.AreEqual (view1, ((IElementController)group).LogicalChildren[0]);
 		}
 
 		[Test]
diff --git a/Xamarin.Forms.Core.UnitTests/MultiPageTests.cs b/Xamarin.Forms.Core.UnitTests/MultiPageTests.cs
index 3d9faad5..72939142 100644
--- a/Xamarin.Forms.Core.UnitTests/MultiPageTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/MultiPageTests.cs
@@ -47,7 +47,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			container.Children.Add (CreateContainedPage());
 
 			Assert.AreEqual (2, childCount);
-			Assert.AreEqual (2, page.LogicalChildren.Count);
+			Assert.AreEqual (2, ((IElementController)page).LogicalChildren.Count);
 			Assert.AreEqual (2, pagesAdded);
 		}
 
@@ -71,7 +71,7 @@ namespace Xamarin.Forms.Core.UnitTests
 
 			Assert.AreEqual (2, removeCount);
 			Assert.AreEqual (2, childCount);
-			Assert.AreEqual (2, page.LogicalChildren.Count);
+			Assert.AreEqual (2, ((IElementController)page).LogicalChildren.Count);
 		}
 
 		[Test]
diff --git a/Xamarin.Forms.Core.UnitTests/NavigationUnitTest.cs b/Xamarin.Forms.Core.UnitTests/NavigationUnitTest.cs
index a6abee55..f43e7019 100644
--- a/Xamarin.Forms.Core.UnitTests/NavigationUnitTest.cs
+++ b/Xamarin.Forms.Core.UnitTests/NavigationUnitTest.cs
@@ -216,8 +216,10 @@ namespace Xamarin.Forms.Core.UnitTests
 			var root = new ContentPage ();
 			var nav = new NavigationPage (root);
 
-			Assert.AreEqual (root, nav.LogicalChildren[0]);
+
 			Assert.AreEqual (1, ((INavigationPageController)nav).StackDepth);
+			Assert.AreEqual (root, ((IElementController)nav).LogicalChildren[0]);
+
 		}
 
 		[Test]
diff --git a/Xamarin.Forms.Core.UnitTests/NotifiedPropertiesTests.cs b/Xamarin.Forms.Core.UnitTests/NotifiedPropertiesTests.cs
index ede7e0de..fcc9d976 100644
--- a/Xamarin.Forms.Core.UnitTests/NotifiedPropertiesTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/NotifiedPropertiesTests.cs
@@ -119,7 +119,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			new PropertyTestCase<Page, Color> ("BackgroundColor", v => v.BackgroundColor, (v, o) => v.BackgroundColor = o, () => default(Color), new Color (0, 1, 0)),
 			new PropertyTestCase<Page, string> ("Title", v => v.Title, (v, o) => v.Title = o, () => null, "Foo"),
 			new PropertyTestCase<Page, bool> ("IsBusy", v => v.IsBusy, (v, o) => v.IsBusy = o, () => false, true),
-			new PropertyTestCase<Page, bool> ("IgnoresContainerArea", v => v.IgnoresContainerArea, (v, o) => v.IgnoresContainerArea = o, () => false, true),
+			new PropertyTestCase<Page, bool> ("IgnoresContainerArea", v => ((IPageController)v).IgnoresContainerArea, (v, o) => ((IPageController)v).IgnoresContainerArea = o, () => false, true),
 			new PropertyTestCase<Page, Thickness> ("Padding", v => v.Padding, (v, o) => v.Padding = o, () => default(Thickness), new Thickness (12)),
 			new PropertyTestCase<Picker, string> ("Title", v=>v.Title, (v, o) =>v.Title = o, () => null, "FooBar"),
 			new PropertyTestCase<Picker, int> ("SelectedIndex", v=>v.SelectedIndex, (v, o) =>v.SelectedIndex = o, () => -1, 2, ()=>new Picker{Items= {"Foo", "Bar", "Baz", "Qux"}}),
diff --git a/Xamarin.Forms.Core.UnitTests/PageTests.cs b/Xamarin.Forms.Core.UnitTests/PageTests.cs
index f44d004f..74b56d8a 100644
--- a/Xamarin.Forms.Core.UnitTests/PageTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/PageTests.cs
@@ -22,8 +22,8 @@ namespace Xamarin.Forms.Core.UnitTests
 			var child = new Label ();
 			Page root = new ContentPage {Content = child};
 
-			Assert.AreEqual (root.LogicalChildren.Count, 1);
-			Assert.AreSame (root.LogicalChildren.First (), child);
+			Assert.AreEqual (((IElementController)root).LogicalChildren.Count, 1);
+			Assert.AreSame (((IElementController)root).LogicalChildren.First (), child);
 		}
 
 		[Test]
@@ -257,8 +257,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			page.Layout (new Rectangle (0, 0, 800, 800));
 
 			Assert.AreEqual (new Rectangle (0, 0, 800, 800), child.Bounds);
-
-			page.ContainerArea = new Rectangle (10, 10, 30, 30);
+			((IPageController)page).ContainerArea = new Rectangle (10, 10, 30, 30);
 
 			Assert.AreEqual (new Rectangle (10, 10, 30, 30), child.Bounds);
 
@@ -315,7 +314,7 @@ namespace Xamarin.Forms.Core.UnitTests
 
 			Assert.That (sent, Is.False, "Busy message sent while not visible");
 
-			page.SendAppearing();
+			((IPageController)page).SendAppearing();
 
 			Assert.That (sent, Is.True, "Busy message not sent when visible");
 		}
@@ -324,7 +323,7 @@ namespace Xamarin.Forms.Core.UnitTests
 		public void BusySentWhenBusyPageDisappears()
 		{
 			var page = new ContentPage { IsBusy = true };
-			page.SendAppearing();
+			((IPageController)page).SendAppearing();
 
 			var sent = false;
 			MessagingCenter.Subscribe<Page, bool> (this, Page.BusySetSignalName, (p, b) => {
@@ -332,7 +331,7 @@ namespace Xamarin.Forms.Core.UnitTests
 				sent = true;
 			});
 
-			page.SendDisappearing();
+			((IPageController)page).SendDisappearing();
 
 			Assert.That (sent, Is.True, "Busy message not sent when visible");
 		}
@@ -344,7 +343,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			MessagingCenter.Subscribe<Page, bool> (this, Page.BusySetSignalName, (p, b) => sent = true);
 
 			var page = new ContentPage();
-			page.SendAppearing();
+			((IPageController)page).SendAppearing();
 
 			Assert.That (sent, Is.False, "Busy message sent appearing while not busy");
 
@@ -408,7 +407,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			bool sent = false;
 			page.Appearing += (sender, args) => sent = true;
 
-			page.SendAppearing ();
+			((IPageController)page).SendAppearing ();
 
 			Assert.True (sent);
 		}
@@ -418,12 +417,12 @@ namespace Xamarin.Forms.Core.UnitTests
 		{
 			var page = new ContentPage ();
 
-			page.SendAppearing ();
+			((IPageController)page).SendAppearing ();
 
 			bool sent = false;
 			page.Disappearing += (sender, args) => sent = true;
 
-			page.SendDisappearing ();
+			((IPageController)page).SendDisappearing ();
 
 			Assert.True (sent);
 		}
@@ -436,8 +435,8 @@ namespace Xamarin.Forms.Core.UnitTests
 			int countAppearing = 0;
 			page.Appearing += (sender, args) => countAppearing++;
 
-			page.SendAppearing ();
-			page.SendAppearing ();
+			((IPageController)page).SendAppearing ();
+			((IPageController)page).SendAppearing ();
 
 			Assert.That (countAppearing, Is.EqualTo(1));
 		}
@@ -465,7 +464,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			};
 			navPage.Appearing += (sender, e) => sentNav = true;
 
-			navPage.SendAppearing ();
+			((IPageController)navPage).SendAppearing ();
 
 			Assert.True (sentNav);
 			Assert.True (sent);
@@ -478,7 +477,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			var page = new ContentPage ();
 
 			var navPage = new NavigationPage (page);
-			navPage.SendAppearing ();
+			((IPageController)navPage).SendAppearing ();
 
 			bool sentNav = false;
 			bool sent = false;
@@ -489,7 +488,7 @@ namespace Xamarin.Forms.Core.UnitTests
 				if (sent)
 					sentNav = true;
 			};
-			navPage.SendDisappearing ();
+			((IPageController)navPage).SendDisappearing ();
 
 			Assert.True (sentNav);
 			Assert.True (sent);