diff --git a/tests/apitest/src/DelegateAndDataSourceTest.cs b/tests/apitest/src/DelegateAndDataSourceTest.cs index 2a1929ac86..bcd3f5b578 100644 --- a/tests/apitest/src/DelegateAndDataSourceTest.cs +++ b/tests/apitest/src/DelegateAndDataSourceTest.cs @@ -123,8 +123,6 @@ namespace Xamarin.Mac.Tests if (IntPtr.Size == 4 && PlatformHelper.CheckSystemVersion(10, 13)) // Removed from 32-bit in macOS 10.13 return true; break; - case "QTMovie": - return TestRuntime.CheckSystemVersion (PlatformName.MacOSX, 10, 14, 4); // Broke in macOS 10.14.4. case "AVCaptureView": // Deallocating a AVCaptureView makes it trigger a permission dialog, which we don't want, so just skip this type. return true; @@ -132,7 +130,7 @@ namespace Xamarin.Mac.Tests switch (t.Namespace) { case "QTKit": - return TestRuntime.CheckSystemVersion (PlatformName.MacOSX, 10, 15); // QTKit is gone in 10.15. + return true; // QTKit has been removed from macos. } return false; diff --git a/tests/introspection/ApiCtorInitTest.cs b/tests/introspection/ApiCtorInitTest.cs index b715d1cde2..5edc8c0273 100644 --- a/tests/introspection/ApiCtorInitTest.cs +++ b/tests/introspection/ApiCtorInitTest.cs @@ -118,16 +118,18 @@ namespace Introspection { case "CKSubscription": case "MPSCnnConvolutionState": return true; - case "QTMovie": - return TestRuntime.CheckSystemVersion (PlatformName.MacOSX, 10, 14, 4); // Broke in macOS 10.14.4. } -#if __IOS__ switch (type.Namespace) { +#if __IOS__ case "WatchKit": return true; // WatchKit has been removed from iOS. - } +#elif MONOMAC + case "QTKit": + return true; // QTKit has been removed from macos. #endif + } + // skip types that we renamed / rewrite since they won't behave correctly (by design) if (SkipDueToRejectedTypes (type)) return true; diff --git a/tests/introspection/Mac/MacApiFieldTest.cs b/tests/introspection/Mac/MacApiFieldTest.cs index 0fdd230345..313aa73fb8 100644 --- a/tests/introspection/Mac/MacApiFieldTest.cs +++ b/tests/introspection/Mac/MacApiFieldTest.cs @@ -52,6 +52,9 @@ namespace Introspection { if (!Mac.CheckSystemVersion (10, 12) || IntPtr.Size != 8) return true; break; + case "MonoMac.QTKit": // QTKit has been removed from macOS + case "QTKit": + return true; } return false; } diff --git a/tests/introspection/Mac/MacApiWeakPropertyTest.cs b/tests/introspection/Mac/MacApiWeakPropertyTest.cs index cacd3b5b09..45e219fdc1 100644 --- a/tests/introspection/Mac/MacApiWeakPropertyTest.cs +++ b/tests/introspection/Mac/MacApiWeakPropertyTest.cs @@ -20,6 +20,13 @@ namespace Introspection { case "VNImageOptions": return true; } + + switch (type.Namespace) { + case "MonoMac.QTKit": // QTKit has been removed from macOS + case "QTKit": + return true; + } + return base.Skip (type); } }