[release/6.0.3xx] [tests] Backport a few introspection fixes. (#15288)

This is a backport of #15230 and #15265.

Author: rolfbjarne

tests/introspection/ApiProtocolTest.cs

@@ -485,8 +485,26 @@ protected virtual bool Skip (Type type, string protocolName)
 					if (!TestRuntime.CheckXcodeVersion (11,0))
 						return true;
 					break;
+				case "VNRecognizedText":
+					// Conformance added in Xcode 13
+					if (!TestRuntime.CheckXcodeVersion (13, 0))
+						return true;
+					break;
 				}
 				break;
+			case "NSUserActivityRestoring":
+				return true;
+#if __MACCATALYST__
+			case "UIScrollViewDelegate":
+				// The headers say PKCanvasViewDelegate implements UIScrollViewDelegate
+				if (type.Name == "PKCanvasViewDelegate")
+					return true;
+				break;
+#endif
+			case "NSExtensionRequestHandling":
+				if (type.Name == "HMChipServiceRequestHandler") // Apple removed this class
+					return true;
+				break;
 			}
 			return false;
 		}
@@ -714,7 +732,9 @@ public void GeneralCase ()
 
 					if (t.IsPublic && !ConformTo (klass.Handle, protocol)) {
 						// note: some internal types, e.g. like UIAppearance subclasses, return false (and there's not much value in changing this)
-						list.Add ($"Type {t.FullName} (native: {klass.Name}) does not conform {protocolName}");
+						var msg = $"Type {t.FullName} (native: {klass.Name}) does not conform {protocolName}";
+						list.Add (msg);
+						ReportError (msg);
 					}
 				}
 			}

tests/introspection/Mac/MacApiProtocolTest.cs

@@ -19,10 +19,19 @@
 namespace Introspection {
 
 	[TestFixture]
-	public class MonoMacFixtures : ApiProtocolTest {
+	public class MacApiProtocolTest : ApiProtocolTest {
 
 		protected override bool Skip (Type type)
 		{
+#if !NET
+			switch (type.Namespace) {
+			case "Chip":
+				// The Chip framework is not stable, it's been added and removed and added and removed a few times already, so just skip verifying the entire framework.
+				// This is legacy Xamarin only, because we removed the framework for .NET.
+				return true;
+			}
+#endif
+
 			switch (type.Name) {
 #if !NET
 			case "NSDraggingInfo":

tests/introspection/Mac/MacApiSelectorTest.cs

@@ -114,6 +114,12 @@ protected override bool Skip (Type type)
 				if (Mac.CheckSystemVersion (10, 15))
 					return true;
 				break;
+#if !NET
+			case "Chip":
+				// The Chip framework is not stable, it's been added and removed and added and removed a few times already, so just skip verifying the entire framework.
+				// This is legacy Xamarin only, because we removed the framework for .NET.
+				return true;
+#endif
 			}
 
 			return base.Skip (type);

tests/introspection/iOS/iOSApiProtocolTest.cs

@@ -171,6 +171,8 @@ protected override bool Skip (Type type, string protocolName)
 				break;
 #endif
 			case "UIAccessibilityElement":
+				if (protocolName == "UIResponderStandardEditActions" && !TestRuntime.CheckXcodeVersion (11, 0))
+					return true;
 				if (protocolName == "UIUserActivityRestoring")
 					return true;
 				break;
@@ -199,6 +201,7 @@ protected override bool Skip (Type type, string protocolName)
 			case "UIStepper":
 			case "UISwitch":
 			case "ASAuthorizationAppleIdButton":
+			case "INUIAddVoiceShortcutButton":
 				if (protocolName == "UIContextMenuInteractionDelegate")
 					return !TestRuntime.CheckXcodeVersion (12, 0);
 				break;