Allow duplicate issue numbers per tracker (#1127)

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

@@ -9,7 +9,8 @@ using NUnit.Framework;
 namespace Xamarin.Forms.Controls.Issues
 {
 	[Preserve(AllMembers = true)]
-	[Issue(IssueTracker.Bugzilla, 53179, "PopAsync crashing after RemovePage when support packages are updated to 25.1.1", PlatformAffected.Android)]
+	[Issue(IssueTracker.Bugzilla, 53179, 
+		"PopAsync crashing after RemovePage when support packages are updated to 25.1.1", PlatformAffected.Android)]
 	public class Bugzilla53179 : TestNavigationPage
 	{
 		class TestPage : ContentPage

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

@@ -14,10 +14,10 @@ namespace Xamarin.Forms.Controls.Issues
 #endif
 
 	[Preserve(AllMembers = true)]
-	[Issue(IssueTracker.None, 0101100101, 
+	[Issue(IssueTracker.Bugzilla, 53179, 
 		"PopAsync crashing after RemovePage when support packages are updated to 25.1.1",
-		PlatformAffected.Android)]
+		PlatformAffected.Android, issueTestNumber: 1)]
-	public class PopAfterRemove : TestNavigationPage
+	public class Bugzilla53179_1 : TestNavigationPage
 	{
 		ContentPage _intermediate1;
 		ContentPage _intermediate2;

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

@@ -15,8 +15,9 @@ namespace Xamarin.Forms.Controls.Issues
 #endif
 
 	[Preserve(AllMembers = true)]
-	[Issue(IssueTracker.None, 1134, "Removing page during OnAppearing throws exception", PlatformAffected.Android)]
+	[Issue(IssueTracker.Bugzilla, 53179, "Removing page during OnAppearing throws exception", PlatformAffected.Android,
-	public class RemovePageOnAppearing : TestContentPage
+		issueTestNumber: 2)]
+	public class Bugzilla53179_2 : TestContentPage
 	{
 		const string Success = "Success";
 

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

@@ -111,7 +111,7 @@ namespace Xamarin.Forms.Controls
 				typeIssueAttribute.IssueNumber != 1461 &&
 				typeIssueAttribute.IssueNumber != 342)
 			{
-				cellName = typeIssueAttribute.IssueTracker.ToString().Substring(0, 1) + typeIssueAttribute.IssueNumber.ToString();
+				cellName = typeIssueAttribute.DisplayName;
 			}
 			else {
 				cellName = typeIssueAttribute.Description;

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems

@@ -276,7 +276,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla39829.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla39458.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla39853.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RemovePageOnAppearing.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Bugzilla53179_2.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ScrollViewIsEnabled.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)PlatformSpecifics_iOSTranslucentNavBarX.xaml.cs">
       <DependentUpon>PlatformSpecifics_iOSTranslucentNavBarX.xaml</DependentUpon>
@@ -284,6 +284,7 @@
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)PopAfterRemove.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)RestartAppTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Bugzilla53179_1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)TestPages\ScreenshotConditionalApp.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla41842.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla42277.cs" />
@@ -753,4 +754,4 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
+</Project>

Xamarin.Forms.Controls/TestCases.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -93,6 +94,8 @@ namespace Xamarin.Forms.Controls
 				return page;
 			}
 
+			
+
 			public TestCaseScreen ()
 			{
 				AutomationId = "TestCasesIssueList";
@@ -102,28 +105,31 @@ namespace Xamarin.Forms.Controls
 				var assembly = typeof (TestCases).GetTypeInfo ().Assembly;
 
 				var issueModels = 
-					from typeInfo in assembly.DefinedTypes.Select (o => o.AsType ().GetTypeInfo ())
+					(from typeInfo in assembly.DefinedTypes.Select (o => o.AsType ().GetTypeInfo ())
 					where typeInfo.GetCustomAttribute<IssueAttribute> () != null
-					let attribute = (IssueAttribute)typeInfo.GetCustomAttribute<IssueAttribute> ()
+					let attribute = typeInfo.GetCustomAttribute<IssueAttribute> ()
 					select new {
 						IssueTracker = attribute.IssueTracker,
 						IssueNumber = attribute.IssueNumber,
-						Name = attribute.IssueTracker.ToString ().Substring(0, 1) + attribute.IssueNumber.ToString (),
+						IssueTestNumber = attribute.IssueTestNumber,
+						Name = attribute.DisplayName,
 						Description = attribute.Description,
 						Action = ActivatePageAndNavigate (attribute, typeInfo.AsType ())
-					};
+					}).ToList();
 
 				var root = new TableRoot ();
 				var section = new TableSection ("Bug Repro");
 				root.Add (section);
 
 				var duplicates = new HashSet<string> ();
-				issueModels.ForEach (im => {
+				issueModels.ForEach (im =>
+				{
 					if (duplicates.Contains (im.Name) && !IsExempt (im.Name)) {
-						throw new NotSupportedException ("Please provide unique tracker + issue number combo: " + im.IssueTracker.ToString () + im.IssueNumber.ToString ());
+						throw new NotSupportedException ("Please provide unique tracker + issue number combo: " 
-					} else {
+							+ im.IssueTracker.ToString () + im.IssueNumber.ToString () + im.IssueTestNumber.ToString());
-						duplicates.Add (im.Name);
 					}
+
+					duplicates.Add (im.Name);
 				});
 
 				var githubIssueCells = 

Xamarin.Forms.CustomAttributes/TestAttributes.cs

@@ -48,33 +48,44 @@ namespace Xamarin.Forms.CustomAttributes
 	{
 		bool _modal;
 
-		public IssueAttribute (IssueTracker issueTracker, int issueNumber, string description, NavigationBehavior navigationBehavior = NavigationBehavior.Default)
+		public IssueAttribute (IssueTracker issueTracker, int issueNumber, string description, 
+			NavigationBehavior navigationBehavior = NavigationBehavior.Default, int issueTestNumber = 0)
 		{
 			IssueTracker = issueTracker;
 			IssueNumber = issueNumber;
 			Description = description;
 			PlatformsAffected = PlatformAffected.Default;
 			NavigationBehavior = navigationBehavior;
+			IssueTestNumber = issueTestNumber;
 		}
 
-		public IssueAttribute (IssueTracker issueTracker, int issueNumber, string description, PlatformAffected platformsAffected, NavigationBehavior navigationBehavior = NavigationBehavior.Default)
+		public IssueAttribute (IssueTracker issueTracker, int issueNumber, string description, 
+			PlatformAffected platformsAffected, NavigationBehavior navigationBehavior = NavigationBehavior.Default, 
+			int issueTestNumber = 0)
 		{
 			IssueTracker = issueTracker;
 			IssueNumber = issueNumber;
 			Description = description;
 			PlatformsAffected = platformsAffected;
 			NavigationBehavior = navigationBehavior;
+			IssueTestNumber = issueTestNumber;
 		}
 
 		public IssueTracker IssueTracker { get; }
 
 		public int IssueNumber { get; }
 
+		public int IssueTestNumber { get; }
+
 		public string Description { get; }
 
 		public PlatformAffected PlatformsAffected { get; }
 
 		public NavigationBehavior NavigationBehavior { get; }
+
+		public string DisplayName => IssueTestNumber == 0
+			? $"{IssueTracker.ToString().Substring(0, 1)}{IssueNumber}"
+			: $"{IssueTracker.ToString().Substring(0, 1)}{IssueNumber} ({IssueTestNumber})";
 	}
 
 	[Conditional ("DEBUG")]