Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tests] Update some tests after bumping to Xcode 16.3. #22275

Merged
merged 1 commit into from
Mar 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions tests/dotnet/UnitTests/AppIconTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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}");
Expand Down Expand Up @@ -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}");
Expand Down Expand Up @@ -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}");
Expand Down
1 change: 1 addition & 0 deletions tests/dotnet/UnitTests/AssetsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/dotnet/UnitTests/MlaunchTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
};
Expand Down
5 changes: 3 additions & 2 deletions tests/dotnet/UnitTests/ProjectTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Loading