From fa5f323c88e6fc0441a0f282dfbc9006a5467c5d Mon Sep 17 00:00:00 2001
From: Sebastien Pouliot <sebastien.pouliot@gmail.com>
Date: Wed, 4 Aug 2021 16:40:14 -0400
Subject: [PATCH] [tests][intro] Fix protocol results for macOS 12 beta
 (#12347)

IOW move some custom checks from iOS to the base class that also
covers macOS.
---
 tests/introspection/ApiProtocolTest.cs        | 18 ++++++++++++++++++
 tests/introspection/iOS/iOSApiProtocolTest.cs | 16 ----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/tests/introspection/ApiProtocolTest.cs b/tests/introspection/ApiProtocolTest.cs
index c0b36a9c529c..b5fb6c816b2e 100644
--- a/tests/introspection/ApiProtocolTest.cs
+++ b/tests/introspection/ApiProtocolTest.cs
@@ -129,6 +129,10 @@ protected virtual bool Skip (Type type, string protocolName)
 					return true;
 				// Xcode 13
 				case "HKVerifiableClinicalRecord":
+				case "PKDeferredPaymentSummaryItem":
+				case "PKRecurringPaymentSummaryItem":
+				case "PKStoredValuePassProperties":
+				case "SNTimeDurationConstraint": // Conformance not in headers
 					return true;
 				}
 				break;
@@ -250,6 +254,13 @@ protected virtual bool Skip (Type type, string protocolName)
 					return true;
 				// Xcode 12.5
 				case "GCDualSenseGamepad":
+				// Xcode 13
+				case "PKDeferredPaymentSummaryItem":
+				case "PKPaymentRequestCouponCodeUpdate":
+				case "PKRecurringPaymentSummaryItem":
+				case "PKStoredValuePassBalance":
+				case "PKStoredValuePassProperties":
+				case "SNTimeDurationConstraint": // Conformance not in headers
 					return true;
 				}
 				break;
@@ -367,6 +378,13 @@ protected virtual bool Skip (Type type, string protocolName)
 					return true;
 				// Xcode 12.5
 				case "GCDualSenseGamepad":
+				// xcode 13
+				case "PKDeferredPaymentSummaryItem":
+				case "PKPaymentRequestCouponCodeUpdate":
+				case "PKRecurringPaymentSummaryItem":
+				case "PKStoredValuePassBalance":
+				case "PKStoredValuePassProperties":
+				case "SNTimeDurationConstraint": // Conformance not in headers
 					return true;
 				}
 				break;
diff --git a/tests/introspection/iOS/iOSApiProtocolTest.cs b/tests/introspection/iOS/iOSApiProtocolTest.cs
index a26eef66a0d2..9b454b5d1f1f 100644
--- a/tests/introspection/iOS/iOSApiProtocolTest.cs
+++ b/tests/introspection/iOS/iOSApiProtocolTest.cs
@@ -441,12 +441,6 @@ protected override bool Skip (Type type, string protocolName)
 				case "ARSkeletonDefinition": // device only
 				case "ARVideoFormat": // device only
 				case "NSMergePolicy":
-				case "SNTimeDurationConstraint": // Conformance not in headers
-				case "PKDeferredPaymentSummaryItem":
-				case "PKPaymentRequestCouponCodeUpdate":
-				case "PKRecurringPaymentSummaryItem":
-				case "PKStoredValuePassBalance":
-				case "PKStoredValuePassProperties":
 				case "SFSafariViewControllerPrewarmingToken": // conformance not in headers
 				case "SRTextInputSession": // conformance not in headers
 					return true;
@@ -688,12 +682,6 @@ protected override bool Skip (Type type, string protocolName)
 				case "ARSkeletonDefinition": // device only
 				case "ARVideoFormat": // device only
 				case "NSMergePolicy":
-				case "SNTimeDurationConstraint": // Conformance not in headers
-				case "PKDeferredPaymentSummaryItem":
-				case "PKPaymentRequestCouponCodeUpdate":
-				case "PKRecurringPaymentSummaryItem":
-				case "PKStoredValuePassBalance":
-				case "PKStoredValuePassProperties":
 				case "SFSafariViewControllerPrewarmingToken": // conformance not in headers
 				case "SRTextInputSession": // conformance not in headers
 					return true;
@@ -779,10 +767,6 @@ protected override bool Skip (Type type, string protocolName)
 				case "NSMappingModel":
 				case "NSMergePolicy":
 				case "NSPropertyMapping":
-				case "SNTimeDurationConstraint": // Conformance not in headers"
-				case "PKDeferredPaymentSummaryItem":
-				case "PKRecurringPaymentSummaryItem":
-				case "PKStoredValuePassProperties":
 					return true;
 				}
 				break;