1 files changed, 65 insertions, 0 deletions
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewObjectDisposed.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewObjectDisposed.cs
new file mode 100644
index 00000000..8cd4bcbc
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewObjectDisposed.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+
+#if UITEST
+using Xamarin.UITest;
+using NUnit.Framework;
+#endif
+
+namespace Xamarin.Forms.Controls.Issues
+{
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.None, 0, "Object Disposed Exception in ScrollViewContainer", PlatformAffected.Android)]
+	public class ScrollViewObjectDisposed : TestContentPage
+	{
+		const string Instructions = "Tap the button. If the app does not crash and the red label displays \"Success\", this test has passed.";
+		const string Success = "Success";
+		const string TestButtonId = "TestButtonId";
+
+		Label _status = new Label() { Text = "Test is running...", BackgroundColor = Color.Red, TextColor = Color.White };
+
+		ScrollView _scroll = new ScrollView();
+
+		protected override void Init()
+		{
+			_scroll.Content = _status;
+
+			InitTest();
+		}
+
+		void InitTest()
+		{
+
+			Button nextButton = new Button { Text = "Next", AutomationId = TestButtonId };
+			nextButton.Clicked += NextButton_Clicked;
+
+			StackLayout stack = new StackLayout
+			{
+				Children = { new Label { Text = Instructions }, _scroll, nextButton }
+			};
+
+			Content = stack;
+		}
+
+		void NextButton_Clicked(object sender, EventArgs e)
+		{
+			_status.Text = "";
+
+			InitTest();
+
+			_status.Text = Success;
+		}
+
+#if UITEST
+		[Test]
+		public void ScrollViewObjectDisposedTest ()
+		{
+			RunningApp.Tap(q => q.Marked(TestButtonId));
+			RunningApp.WaitForElement(q => q.Marked(Success));
+		}
+#endif
+	}
+}
+\ No newline at end of file