diff options
| author | Marek Safar <marek.safar@gmail.com> | 2021-05-17 19:55:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-17 19:55:06 +0300 |
| commit | 4aaf7c406f169a4fe51897f5fcb4f72dfadff2d4 (patch) | |
| tree | df45e620dee75ea0afc2a5f3d2868657804e5a05 /test/Mono.Linker.Tests | |
| parent | e44c48c6d0d9ad7071636e06a1996d91246a55ce (diff) | |
Improve testing infra to not rely on hardcoded names (#2034)
Diffstat (limited to 'test/Mono.Linker.Tests')
| -rw-r--r-- | test/Mono.Linker.Tests/TestCasesRunner/AssemblyChecker.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/Mono.Linker.Tests/TestCasesRunner/AssemblyChecker.cs b/test/Mono.Linker.Tests/TestCasesRunner/AssemblyChecker.cs index bca2b26bb..eab25a226 100644 --- a/test/Mono.Linker.Tests/TestCasesRunner/AssemblyChecker.cs +++ b/test/Mono.Linker.Tests/TestCasesRunner/AssemblyChecker.cs @@ -624,7 +624,7 @@ namespace Mono.Linker.Tests.TestCasesRunner if (expectKeptAll) { foreach (var srcField in possibleInitializerFields) { - var linkedField = linkedImplementationDetails.Fields.FirstOrDefault (f => f.Name == srcField.Name); + var linkedField = linkedImplementationDetails.Fields.FirstOrDefault (f => f.InitialValue.SequenceEqual (srcField.InitialValue)); VerifyInitializerField (srcField, linkedField); } } else { @@ -633,7 +633,7 @@ namespace Mono.Linker.Tests.TestCasesRunner Assert.Fail ($"Invalid expected index `{index}` in {src}. Value must be between 0 and {expectedIndicies.Length}"); var srcField = possibleInitializerFields[index]; - var linkedField = linkedImplementationDetails.Fields.FirstOrDefault (f => f.Name == srcField.Name); + var linkedField = linkedImplementationDetails.Fields.FirstOrDefault (f => f.InitialValue.SequenceEqual (srcField.InitialValue)); VerifyInitializerField (srcField, linkedField); } @@ -735,14 +735,14 @@ namespace Mono.Linker.Tests.TestCasesRunner Assert.Fail ($"Missing expected type {originalCompilerGeneratedBufferType}"); // Have to verify the field before the type - var originalElementField = originalCompilerGeneratedBufferType.Fields.FirstOrDefault (f => f.Name == "FixedElementField"); + var originalElementField = originalCompilerGeneratedBufferType.Fields.FirstOrDefault (); if (originalElementField == null) Assert.Fail ($"Could not locate original compiler generated FixedElementField on {originalCompilerGeneratedBufferType}"); - var linkedField = linkedCompilerGeneratedBufferType?.Fields.FirstOrDefault (l => l.Name == originalElementField.Name); + var linkedField = linkedCompilerGeneratedBufferType?.Fields.FirstOrDefault (); VerifyFieldKept (originalElementField, linkedField); verifiedGeneratedFields.Add (originalElementField.FullName); - linkedMembers.Remove (originalElementField.FullName); + linkedMembers.Remove (linkedField.FullName); VerifyTypeDefinitionKept (originalCompilerGeneratedBufferType, linkedCompilerGeneratedBufferType); verifiedGeneratedTypes.Add (originalCompilerGeneratedBufferType.FullName); |