From c9dfc0e32bb8e2c9099804c52e3d9c8bf40622c6 Mon Sep 17 00:00:00 2001 From: Manuel de la Pena Date: Mon, 30 Dec 2024 09:17:32 -0500 Subject: [PATCH] [RGen] Fix failing tests after a PR merge race. (#21864) Two PRs changed the same test, one update the string, the other one added new tests. The CI ran but it was not merged with main resulting in the tests passing in the PR but failing on main --- .../DataModel/EnumMemberCodeChangesTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/rgen/Microsoft.Macios.Generator.Tests/DataModel/EnumMemberCodeChangesTests.cs b/tests/rgen/Microsoft.Macios.Generator.Tests/DataModel/EnumMemberCodeChangesTests.cs index 48d9b9273f04..6860f97c2726 100644 --- a/tests/rgen/Microsoft.Macios.Generator.Tests/DataModel/EnumMemberCodeChangesTests.cs +++ b/tests/rgen/Microsoft.Macios.Generator.Tests/DataModel/EnumMemberCodeChangesTests.cs @@ -162,7 +162,7 @@ public IEnumerator GetEnumerator () fieldData: new ("x", "libName", EnumValue.None), symbolAvailability: builder.ToImmutable (), attributes: []); - yield return [availabilityEnum, "{ Name: 'EnumValue' SymbolAvailability: [{ Platform: iOS Supported: '0.0' Unsupported: [], Obsoleted: [] }] FieldData: { SymbolName: 'x' LibraryName: 'libName', Flags: 'None' } Attributes: [] }"]; + yield return [availabilityEnum, "{ Name: 'EnumValue' SymbolAvailability: [{ Platform: 'iOS', Supported: '0.0', Unsupported: [], Obsoleted: [] }] FieldData: { SymbolName: 'x' LibraryName: 'libName', Flags: 'None' } Attributes: [] }"]; var attrsEnum = new EnumMember ( name: "EnumValue", @@ -172,7 +172,7 @@ public IEnumerator GetEnumerator () new ("Attribute1"), new ("Attribute2"), ]); - yield return [attrsEnum, "{ Name: 'EnumValue' SymbolAvailability: [{ Platform: iOS Supported: '0.0' Unsupported: [], Obsoleted: [] }] FieldData: { SymbolName: 'x' LibraryName: 'libName', Flags: 'None' } Attributes: [{ Name: Attribute1, Arguments: [] }, { Name: Attribute2, Arguments: [] }] }"]; + yield return [attrsEnum, "{ Name: 'EnumValue' SymbolAvailability: [{ Platform: 'iOS', Supported: '0.0', Unsupported: [], Obsoleted: [] }] FieldData: { SymbolName: 'x' LibraryName: 'libName', Flags: 'None' } Attributes: [{ Name: Attribute1, Arguments: [] }, { Name: Attribute2, Arguments: [] }] }"]; } IEnumerator IEnumerable.GetEnumerator ()