Add instructions and test attributes for 38827; fixes #2304

Add instructions for test 36393; fixes #2267

Add missing image for Android to 39963 test; fixes #2333;
Also remove automated test, since it requires manual review; fixes #2330;
Correct typo, remove copy/paste comments;

Add instructions to test 39853; fixes #2328

Add instructions for test 39829; fixes #2326;
Remove automated test for 39829;

Add instructions to test 36846; fixes #2289

Author: hartez

Xamarin.Forms.ControlGallery.Android/Assets/test.jpg

@@ -346,6 +346,9 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\red_button.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\test.jpg" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Import Project="..\packages\Xamarin.Insights.1.11.4\build\MonoAndroid10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.11.4\build\MonoAndroid10\Xamarin.Insights.targets')" />

Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj

@@ -17,10 +17,19 @@ public class Bugzilla36393 : TestContentPage
 	{
 		protected override void Init()
 		{
+			var instructions = new Label
+			{
+				Text =
+					"If running on Android, all of the Label, Entry, Editor, and SearchBar text sizes below should be"
+					+ " the same size."
+					+ " If they are not, the test has failed."
+					+ " This test should be ignored on non-Android platforms."
+			};
+
 			var label = new Label { FontSize = 18 };
-			var entry = new Entry { };
-			var editor = new Editor { };
-			var searchBar = new SearchBar { };
+			var entry = new Entry();
+			var editor = new Editor();
+			var searchBar = new SearchBar();
 
 			label.Text = $"I am label. FontSize:{label.FontSize}";
 			entry.Text = $"I am entry. FontSize:{entry.FontSize}";
@@ -29,17 +38,8 @@ protected override void Init()
 
 			Content = new StackLayout
 			{
-				Children = { label, entry, editor, searchBar }
+				Children = { instructions, label, entry, editor, searchBar }
 			};
 		}
-
-#if UITEST
-		[Test]
-		[Category(UITestCategories.ManualReview)]
-		public void FontSizeComparisonTest()
-		{
-			RunningApp.Screenshot("If all of the font sizes are visibly the same size, this test has passed.");
-		}
-#endif
 	}
 }

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36393.cs

@@ -7,17 +7,12 @@
 using NUnit.Framework;
 #endif
 
-// Apply the default category of "Issues" to all of the tests in this assembly
-// We use this as a catch-all for tests which haven't been individually categorized
-#if UITEST
-[assembly: NUnit.Framework.Category("Issues")]
-#endif
-
 namespace Xamarin.Forms.Controls.Issues
 {
 	[Preserve(AllMembers = true)]
-	[Issue(IssueTracker.Bugzilla, 36846, "ActionBar does not dismiss when content which called it is removed", PlatformAffected.Android)]
-	public class Bugzilla36846 : TestNavigationPage // or TestMasterDetailPage, etc ...
+	[Issue(IssueTracker.Bugzilla, 36846, "ActionBar does not dismiss when content which called it is removed", 
+		PlatformAffected.Android)]
+	public class Bugzilla36846 : TestNavigationPage 
 	{
 		protected override void Init()
 		{
@@ -39,6 +34,16 @@ public ListWithLongPress()
 				Orientation = StackOrientation.Vertical
 			};
 
+			var instructions = new Label
+			{
+				Text = "This test only applies to Android. " 
+						+ "Long press one of the items in the list. The Action Bar should appear. "
+						+ "Tap the 'Clear List' button. The list should clear and the Action Bar should disappear. "
+						+ "If the action bar remains, this test has failed."
+			};
+
+			stackLayout.Children.Add(instructions);
+
 			var listView = new ListView
 			{
 				HasUnevenRows = true,

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36846.cs

@@ -16,7 +16,7 @@
 	                       HorizontalOptions="FillAndExpand"
                          AutomationId="LoginPageIdentifier"
 	                       FontSize="Large"
-	                       Text="Sign in with your Xamarin account to save and sync favorites and session feedback. Sign in with your Xamarin account to save and sync favorites and session feedback. Sign in with your Xamarin account to save and sync favorites and session feedback. Sign in with your Xamarin account to save and sync favorites and session feedback."/>
+	                       Text="This text should be wrapping. If it is not, the test has failed. This text should be wrapping. If it is not, the test has failed. This text should be wrapping. If it is not, the test has failed. This text should be wrapping. If it is not, the test has failed. This text should be wrapping. If it is not, the test has failed."/>
 
 	        </StackLayout>
 	    </Grid>

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38827.xaml

@@ -5,9 +5,13 @@
 using System.Threading.Tasks;
 
 using Xamarin.Forms;
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
 
 namespace Xamarin.Forms.Controls.Issues
 {
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Bugzilla, 38827, "UWP - Text not wrapping")]
 	public partial class Bugzilla38827 : ContentPage
 	{
 		public Bugzilla38827 ()

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38827.xaml.cs

@@ -11,30 +11,28 @@
 namespace Xamarin.Forms.Controls.Issues
 {
 	[Preserve(AllMembers = true)]
-	[Issue(IssueTracker.Bugzilla, 39829, "RowHeight of ListView is not working for UWP", PlatformAffected.WinRT)]
+	[Issue(IssueTracker.Bugzilla, 39829, "RowHeight of ListView is not working for UWP", PlatformAffected.UWP)]
 	public class Bugzilla39829 : TestContentPage
 	{
 		protected override void Init()
 		{
 			Title = "Master";
+
+			var instructions = new Label 
+			{ 
+				Text = "The text items in the list below should be spaced far apart vertically. " 
+					+ "If they are close together, this test has failed."
+
+			};
+
 			var listView = new ListView
 			{
 				RowHeight = 150,
 				AutomationId = "listview",
-				ItemsSource = new string[] { "Test1", "Test2", "Test3", "Test4", "Test5", "Test6", }
+				ItemsSource = new[] { "Test1", "Test2", "Test3", "Test4", "Test5", "Test6", }
 			};
 
-			Content = listView;
+			Content = new StackLayout { Children = { instructions, listView } };
 		}
-
-#if UITEST
-		[Test]
-		[Category("ManualReview")]
-		public void Bugzilla39829Test()
-		{
-			RunningApp.WaitForElement(q => q.Marked("listview"));
-			RunningApp.Screenshot("If there isn't substantial space between the list items, this test has failed.");
-		}
-#endif
 	}
 }

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39829.cs

@@ -6,7 +6,7 @@
 namespace Xamarin.Forms.Controls
 {
 	[Preserve(AllMembers = true)]
-	[Issue(IssueTracker.Bugzilla, 39853, "BorderRadius ignored on UWP", PlatformAffected.WinRT)]
+	[Issue(IssueTracker.Bugzilla, 39853, "BorderRadius ignored on UWP", PlatformAffected.UWP)]
 	public class Bugzilla39853 : TestContentPage
 	{
 		public class RoundedButton : Xamarin.Forms.Button
@@ -24,7 +24,7 @@ public RoundedButton(int radius)
 				BorderColor = Color.White;
 				TextColor = Color.Purple;
 				Text = "YAY";
-				Image = new FileImageSource { File = "crimson.jpg" };
+				//Image = new FileImageSource { File = "crimson.jpg" };
 			}
 
 			public new int BorderRadius
@@ -79,11 +79,19 @@ public RoundedButton(int radius)
 #pragma warning restore
 				}
 			}
-
 		}
+
 		protected override void Init()
 		{
-			Content = new RoundedButton(100);
+			var layout = new StackLayout();
+
+			var instructions = new Label { Text = "The button below should be round. " 
+												+ "If it has any right angles, the test has failed."};
+
+			layout.Children.Add(instructions);
+			layout.Children.Add(new RoundedButton(100));
+
+			Content = layout;
 		}
 	}
 }

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39853.cs

@@ -12,7 +12,7 @@ namespace Xamarin.Forms.Controls.Issues
 {
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Bugzilla, 39963, "iOS WebView has wrong scrolling size when loading local html content with images")]
-	public class Bugzilla39963 : TestContentPage // or TestMasterDetailPage, etc ...
+	public class Bugzilla39963 : TestContentPage 
 	{
 		protected override void Init()
 		{
@@ -21,19 +21,15 @@ protected override void Init()
 						<p><img src='test.jpg' /></p>
 						<p>After starting (not re-entering!) the app in landscape, scroll down to see a black area which is not supposed to be there.</p>
 						<p>After starting (not re-entering!) the app in portrait, scroll to the right to see a black area which is not supposed to be there.</p>
-						<p>This only happends when a local image is loaded.</p>
+						<p>This only happens when a local image is loaded.</p>
 						</body></html>";
 
 			var workingHtml = @"<html><body>
 						<p></p>
 						<p>Without local image, everything works fine.</p>
 						</body></html>";
 
-			// Initialize ui here instead of ctor
 			WebView webView = new WebView {
-				//Source = new UrlWebViewSource {
-				//	Url = "https://blog.xamarin.com/",
-				//},
 				Source = new HtmlWebViewSource() {
 					Html = notWorkingHtml
 				},
@@ -43,15 +39,5 @@ protected override void Init()
 
 			Content = webView;
 		}
-
-#if UITEST
-		[Test]
-		public void Bugzilla39963Test()
-		{
-			RunningApp.Screenshot("I am at Bugzilla39963");
-			RunningApp.SwipeRightToLeft();
-			RunningApp.Screenshot("Do we see a black bar");
-		}
-#endif
 	}
 }