From dc9f7dabf21b2c8410878beefea4e967b695a4c7 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 14 Jan 2022 22:38:10 +0000 Subject: Fix expected warnings for tests Some of the tests were updated to expectd no extra unmatched warnings in one branch, and had UnrecognizedReflectionAccessPattern replaced by ExpectedWarning in another branch. These needed to be updated to have multiple ExpectedWarnings attributes when multiple warnings are being produced. --- .../DataFlow/GenericParameterDataFlow.cs | 3 +- .../DataFlow/LocalDataFlow.cs | 6 +++ .../DataFlow/MemberTypes.cs | 61 ++++++++++++++++++++-- .../DataFlow/UnresolvedMembers.cs | 3 +- 4 files changed, 67 insertions(+), 6 deletions(-) (limited to 'test/Mono.Linker.Tests.Cases/DataFlow') diff --git a/test/Mono.Linker.Tests.Cases/DataFlow/GenericParameterDataFlow.cs b/test/Mono.Linker.Tests.Cases/DataFlow/GenericParameterDataFlow.cs index 668259001..f94b62a0c 100644 --- a/test/Mono.Linker.Tests.Cases/DataFlow/GenericParameterDataFlow.cs +++ b/test/Mono.Linker.Tests.Cases/DataFlow/GenericParameterDataFlow.cs @@ -360,7 +360,8 @@ namespace Mono.Linker.Tests.Cases.DataFlow public void PublicMethodsMethodParameter (TypeRequiresPublicMethods param) { } public TypeRequiresPublicFields PublicFieldsMethodReturnValue () { return null; } - [ExpectedWarning ("IL2091", nameof (TypeRequiresPublicMethods))] + [ExpectedWarning ("IL2091", nameof (TypeRequiresPublicMethods))] // Return value + [ExpectedWarning ("IL2091", nameof (TypeRequiresPublicMethods))] // Compiler generated local variable public TypeRequiresPublicMethods PublicMethodsMethodReturnValue () { return null; } public void PublicFieldsMethodLocalVariable () diff --git a/test/Mono.Linker.Tests.Cases/DataFlow/LocalDataFlow.cs b/test/Mono.Linker.Tests.Cases/DataFlow/LocalDataFlow.cs index 75f162786..1a6f6d5bb 100644 --- a/test/Mono.Linker.Tests.Cases/DataFlow/LocalDataFlow.cs +++ b/test/Mono.Linker.Tests.Cases/DataFlow/LocalDataFlow.cs @@ -233,6 +233,12 @@ namespace Mono.Linker.Tests.Cases.DataFlow ProducedBy = ProducedBy.Trimmer)] [ExpectedWarning ("IL2072", nameof (DataFlowStringExtensions) + "." + nameof (DataFlowStringExtensions.RequiresPublicMethods) + "(String)", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2072", nameof (DataFlowStringExtensions) + "." + nameof (DataFlowStringExtensions.RequiresPublicMethods) + "(String)", + ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2072", nameof (DataFlowStringExtensions) + "." + nameof (DataFlowStringExtensions.RequiresPublicConstructors) + "(String)", + ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2072", nameof (DataFlowStringExtensions) + "." + nameof (DataFlowStringExtensions.RequiresPublicConstructors) + "(String)", + ProducedBy = ProducedBy.Trimmer)] [ExpectedWarning ("IL2072", nameof (DataFlowStringExtensions) + "." + nameof (DataFlowStringExtensions.RequiresPublicConstructors) + "(String)", ProducedBy = ProducedBy.Trimmer)] public static void TestBranchSwitch () diff --git a/test/Mono.Linker.Tests.Cases/DataFlow/MemberTypes.cs b/test/Mono.Linker.Tests.Cases/DataFlow/MemberTypes.cs index f71f65b81..94b565d39 100644 --- a/test/Mono.Linker.Tests.Cases/DataFlow/MemberTypes.cs +++ b/test/Mono.Linker.Tests.Cases/DataFlow/MemberTypes.cs @@ -15,10 +15,63 @@ namespace Mono.Linker.Tests.Cases.DataFlow [ExpectedNoWarnings] public class MemberTypes { - // Some of the types below declare delegates and will mark all members on them, this includes the Delegate .ctor(object, string) which has RUC - [ExpectedWarning ("IL2026", nameof (System.Delegate), ProducedBy = ProducedBy.Trimmer)] - // Some of the types below declare delegates and will mark all members on them, this includes the Delegate .ctor(Type, string) which has DAM annotations - [ExpectedWarning ("IL2111", nameof (System.Delegate), ProducedBy = ProducedBy.Trimmer)] + // Some of the types below declare delegates and will mark all members on them, this includes the Delegate .ctor(object, string) which has RUC and other members + [ExpectedWarning ("IL2026", nameof (Delegate) + ".Delegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate) + ".Delegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate) + ".Delegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate) + ".Delegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate) + ".Delegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (MulticastDelegate) + ".MulticastDelegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (MulticastDelegate) + ".MulticastDelegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (MulticastDelegate) + ".MulticastDelegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (MulticastDelegate) + ".MulticastDelegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2026", nameof (MulticastDelegate) + ".MulticastDelegate", ProducedBy = ProducedBy.Trimmer)] + // Some of the types below declare delegates and will mark all members on them, this includes the Delegate .ctor(Type, string) which has DAM annotations and other members + [ExpectedWarning ("IL2111", nameof (Delegate) + ".Delegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate) + ".Delegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate) + ".Delegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate) + ".Delegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate) + ".Delegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate.CreateDelegate), ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (MulticastDelegate) + ".MulticastDelegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (MulticastDelegate) + ".MulticastDelegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (MulticastDelegate) + ".MulticastDelegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (MulticastDelegate) + ".MulticastDelegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (MulticastDelegate) + ".MulticastDelegate", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate) + ".BindToMethodName", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate) + ".BindToMethodName", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate) + ".BindToMethodName", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate) + ".BindToMethodName", ProducedBy = ProducedBy.Trimmer)] + [ExpectedWarning ("IL2111", nameof (Delegate) + ".BindToMethodName", ProducedBy = ProducedBy.Trimmer)] public static void Main () { RequirePublicParameterlessConstructor (typeof (PublicParameterlessConstructorType)); diff --git a/test/Mono.Linker.Tests.Cases/DataFlow/UnresolvedMembers.cs b/test/Mono.Linker.Tests.Cases/DataFlow/UnresolvedMembers.cs index 13d964157..de6707416 100644 --- a/test/Mono.Linker.Tests.Cases/DataFlow/UnresolvedMembers.cs +++ b/test/Mono.Linker.Tests.Cases/DataFlow/UnresolvedMembers.cs @@ -43,7 +43,8 @@ namespace Mono.Linker.Tests.Cases.DataFlow { } [Kept] - [ExpectedWarning ("IL2066", "TypeWithUnresolvedGenericArgument")] + [ExpectedWarning ("IL2066", "TypeWithUnresolvedGenericArgument")] // Local variable type + [ExpectedWarning ("IL2066", "TypeWithUnresolvedGenericArgument")] // Called method declaring type [ExpectedWarning ("IL2066", nameof (MethodWithUnresolvedGenericArgument))] static void UnresolvedGenericArgument () { -- cgit v1.2.3