From 2eedf9fd582c5ff3f7d3d3aec23c2f62ce1da18a Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Mon, 3 Mar 2025 09:28:25 +0100 Subject: [PATCH] [tests] Update some tests after bumping to Xcode 16.3. --- tests/dotnet/UnitTests/AppIconTest.cs | 34 +++++++++++++++++++++++++++ tests/dotnet/UnitTests/AssetsTest.cs | 1 + tests/dotnet/UnitTests/MlaunchTest.cs | 2 +- tests/dotnet/UnitTests/ProjectTest.cs | 5 ++-- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/tests/dotnet/UnitTests/AppIconTest.cs b/tests/dotnet/UnitTests/AppIconTest.cs index 8b592b136075..e8bea97b7c7e 100644 --- a/tests/dotnet/UnitTests/AppIconTest.cs +++ b/tests/dotnet/UnitTests/AppIconTest.cs @@ -106,8 +106,21 @@ public void IncludeAllIcons (ApplePlatform platform, string runtimeIdentifiers) expectedAssets.Add ("PackedImage:ZZZZPackedAsset-2.1.0-gamut0"); break; case ApplePlatform.MacCatalyst: + expectedAssets.Add ("Icon Image:Icon1024.png"); + expectedAssets.Add ("Icon Image:Icon128.png"); + expectedAssets.Add ("Icon Image:Icon16.png"); + expectedAssets.Add ("Icon Image:Icon256.png"); + expectedAssets.Add ("Icon Image:Icon32.png"); + expectedAssets.Add ("Icon Image:Icon512.png"); + expectedAssets.Add ("Icon Image:Icon64.png"); expectedAssets.Add ("Image:Icon16.png"); + expectedAssets.Add ("Image:Icon16.png"); + expectedAssets.Add ("Image:Icon32.png"); expectedAssets.Add ("Image:Icon32.png"); + expectedAssets.Add ("MultiSized Image:AlternateAppIcons"); + expectedAssets.Add ("MultiSized Image:AppIcons"); + expectedAssets.Add ("PackedImage:ZZZZPackedAsset-1.1.0-gamut0"); + expectedAssets.Add ("PackedImage:ZZZZPackedAsset-2.1.0-gamut0"); break; default: throw new ArgumentOutOfRangeException ($"Unknown platform: {platform}"); @@ -286,8 +299,18 @@ public void AlternateAppIcon (ApplePlatform platform, string runtimeIdentifiers) expectedAssets.Add ("PackedImage:ZZZZPackedAsset-2.1.0-gamut0"); break; case ApplePlatform.MacCatalyst: + expectedAssets.Add ("Icon Image:Icon1024.png"); + expectedAssets.Add ("Icon Image:Icon128.png"); + expectedAssets.Add ("Icon Image:Icon16.png"); + expectedAssets.Add ("Icon Image:Icon256.png"); + expectedAssets.Add ("Icon Image:Icon32.png"); + expectedAssets.Add ("Icon Image:Icon512.png"); + expectedAssets.Add ("Icon Image:Icon64.png"); expectedAssets.Add ("Image:Icon16.png"); expectedAssets.Add ("Image:Icon32.png"); + expectedAssets.Add ("MultiSized Image:AppIcons"); + expectedAssets.Add ("PackedImage:ZZZZPackedAsset-1.1.0-gamut0"); + expectedAssets.Add ("PackedImage:ZZZZPackedAsset-2.1.0-gamut0"); break; default: throw new ArgumentOutOfRangeException ($"Unknown platform: {platform}"); @@ -354,8 +377,19 @@ public void AlternateAppIcons (ApplePlatform platform, string runtimeIdentifiers expectedAssets.Add ("PackedImage:ZZZZPackedAsset-2.1.0-gamut0"); break; case ApplePlatform.MacCatalyst: + expectedAssets.Add ("Icon Image:Icon1024.png"); + expectedAssets.Add ("Icon Image:Icon128.png"); + expectedAssets.Add ("Icon Image:Icon16.png"); + expectedAssets.Add ("Icon Image:Icon256.png"); + expectedAssets.Add ("Icon Image:Icon32.png"); + expectedAssets.Add ("Icon Image:Icon512.png"); + expectedAssets.Add ("Icon Image:Icon64.png"); expectedAssets.Add ("Image:Icon16.png"); expectedAssets.Add ("Image:Icon32.png"); + expectedAssets.Add ("MultiSized Image:AppIcons"); + expectedAssets.Add ("MultiSized Image:AlternateAppIcons"); + expectedAssets.Add ("PackedImage:ZZZZPackedAsset-1.1.0-gamut0"); + expectedAssets.Add ("PackedImage:ZZZZPackedAsset-2.1.0-gamut0"); break; default: throw new ArgumentOutOfRangeException ($"Unknown platform: {platform}"); diff --git a/tests/dotnet/UnitTests/AssetsTest.cs b/tests/dotnet/UnitTests/AssetsTest.cs index 6ecf003f6995..29c5254e6251 100644 --- a/tests/dotnet/UnitTests/AssetsTest.cs +++ b/tests/dotnet/UnitTests/AssetsTest.cs @@ -274,6 +274,7 @@ static bool TryGetTarget (JsonElement item, JsonElement assetType, XCAssetTarget "Icon Image:Icon32.png", "Icon Image:Icon512.png", "Icon Image:Icon64.png", + "MultiSized Image:AlternateAppIcons", "MultiSized Image:AppIcons", "PackedImage:ZZZZPackedAsset-1.1.0-gamut0", "PackedImage:ZZZZPackedAsset-2.1.0-gamut0", diff --git a/tests/dotnet/UnitTests/MlaunchTest.cs b/tests/dotnet/UnitTests/MlaunchTest.cs index f61bcb46b07f..198d8f432c7d 100644 --- a/tests/dotnet/UnitTests/MlaunchTest.cs +++ b/tests/dotnet/UnitTests/MlaunchTest.cs @@ -52,7 +52,7 @@ public void GetMlaunchInstallArguments (ApplePlatform platform, string runtimeId public static object [] GetMlaunchRunArgumentsTestCases () { return new object [] { - new object [] {ApplePlatform.iOS, "iossimulator-x64;iossimulator-arm64", $":v2:runtime=com.apple.CoreSimulator.SimRuntime.iOS-{SdkVersions.iOS.Replace('.', '-')},devicetype=com.apple.CoreSimulator.SimDeviceType.iPhone-16-Pro" }, + new object [] {ApplePlatform.iOS, "iossimulator-x64;iossimulator-arm64", $":v2:runtime=com.apple.CoreSimulator.SimRuntime.iOS-{SdkVersions.iOS.Replace('.', '-')},devicetype=com.apple.CoreSimulator.SimDeviceType.iPhone-16e" }, new object [] {ApplePlatform.iOS, "ios-arm64", "" }, new object [] {ApplePlatform.TVOS, "tvossimulator-arm64", $":v2:runtime=com.apple.CoreSimulator.SimRuntime.tvOS-{SdkVersions.TVOS.Replace('.', '-')},devicetype=com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-3rd-generation-1080p" }, }; diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs index 47dcaa1ff7e6..8b8ead100e13 100644 --- a/tests/dotnet/UnitTests/ProjectTest.cs +++ b/tests/dotnet/UnitTests/ProjectTest.cs @@ -2632,11 +2632,11 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl "/usr/lib/swift/libswiftDarwin.dylib", "/usr/lib/swift/libswiftDataDetection.dylib", "/usr/lib/swift/libswiftDispatch.dylib", - "/usr/lib/swift/libswiftFileProvider.dylib", "/usr/lib/swift/libswiftFoundation.dylib", "/usr/lib/swift/libswiftMetal.dylib", "/usr/lib/swift/libswiftObjectiveC.dylib", "/usr/lib/swift/libswiftos.dylib", + "/usr/lib/swift/libswiftOSLog.dylib", "/usr/lib/swift/libswiftQuartzCore.dylib", "/usr/lib/swift/libswiftUIKit.dylib", "/usr/lib/swift/libswiftUniformTypeIdentifiers.dylib", @@ -2758,6 +2758,7 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl "/usr/lib/swift/libswiftMetal.dylib", "/usr/lib/swift/libswiftObjectiveC.dylib", "/usr/lib/swift/libswiftos.dylib", + "/usr/lib/swift/libswiftOSLog.dylib", "/usr/lib/swift/libswiftQuartzCore.dylib", "/usr/lib/swift/libswiftUIKit.dylib", "/usr/lib/swift/libswiftUniformTypeIdentifiers.dylib", @@ -2930,6 +2931,7 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl "/usr/lib/swift/libswiftCoreFoundation.dylib", "/usr/lib/swift/libswiftCoreImage.dylib", "/usr/lib/swift/libswiftDarwin.dylib", + "/usr/lib/swift/libswiftDataDetection.dylib", "/usr/lib/swift/libswiftDispatch.dylib", "/usr/lib/swift/libswiftFoundation.dylib", "/usr/lib/swift/libswiftIOKit.dylib", @@ -3119,7 +3121,6 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl "/usr/lib/swift/libswiftDarwin.dylib", "/usr/lib/swift/libswiftDataDetection.dylib", "/usr/lib/swift/libswiftDispatch.dylib", - "/usr/lib/swift/libswiftFileProvider.dylib", "/usr/lib/swift/libswiftFoundation.dylib", "/usr/lib/swift/libswiftIOKit.dylib", "/usr/lib/swift/libswiftMetal.dylib",