diff --git a/src/libraries/System.Runtime/tests/System/Attributes.cs b/src/libraries/System.Runtime/tests/System/Attributes.cs index 65db042cb59f3..3dda3f56b3566 100644 --- a/src/libraries/System.Runtime/tests/System/Attributes.cs +++ b/src/libraries/System.Runtime/tests/System/Attributes.cs @@ -283,27 +283,6 @@ private static void GenericAttributesTestHelper(Func[]), closedGenericAttributes.GetType()); } - - [Fact] - public static void GetCustomAttributesBehaviorMemberInfoReturnsStringArray() - { - FieldInfo field = new CustomFieldInfo(new[] { "a" }); - Assert.Throws(() => Attribute.GetCustomAttributes(field)); - } - - [Fact] - public static void GetCustomAttributesBehaviorMemberInfoReturnsAttributeInObjectArray() - { - FieldInfo field = new CustomFieldInfo(new object[] { new TestAttribute(0) }); - Assert.Throws(() => Attribute.GetCustomAttributes(field)); - } - - [Fact] - public static void GetCustomAttributesBehaviorMemberInfoReturnsStringAndAttributeInObjectArray() - { - FieldInfo field = new CustomFieldInfo(new object[] { "a", new TestAttribute(0) }); - Assert.Throws(() => Attribute.GetCustomAttributes(field)); - } } public static class GetCustomAttribute @@ -937,33 +916,4 @@ public void Method([GenericAttribute] int parameter) [GenericAttribute] public event Action Event; } - - public class CustomFieldInfo : FieldInfo - { - private readonly object[] _customAttributes; - - public CustomFieldInfo(object[] customAttributes) - { - this._customAttributes = customAttributes; - } - - public override FieldAttributes Attributes => default; - public override RuntimeFieldHandle FieldHandle => default; - public override Type FieldType => typeof(object); - public override Type DeclaringType => null; - public override string Name => "custom"; - public override Type ReflectedType => null; - - public override object[] GetCustomAttributes(bool inherit) => this._customAttributes; - - public override object[] GetCustomAttributes(Type attributeType, bool inherit) => this._customAttributes; - - public override object GetValue(object obj) => null; - - public override bool IsDefined(Type attributeType, bool inherit) => false; - - public override void SetValue(object obj, object value, BindingFlags invokeAttr, Binder binder, System.Globalization.CultureInfo culture) - { - } - } } diff --git a/src/tests/reflection/GenericAttribute/GenericAttributeTests.cs b/src/tests/reflection/GenericAttribute/GenericAttributeTests.cs index 01d81cc7ac1d0..b1dcd6bbbe397 100644 --- a/src/tests/reflection/GenericAttribute/GenericAttributeTests.cs +++ b/src/tests/reflection/GenericAttribute/GenericAttributeTests.cs @@ -22,6 +22,13 @@ static int Main(string[] args) Assert(!CustomAttributeExtensions.GetCustomAttributes(assembly, typeof(SingleAttribute<>)).GetEnumerator().MoveNext()); */ + // Module module = programTypeInfo.Module; + // AssertAny(CustomAttributeExtensions.GetCustomAttributes(module), a => a is SingleAttribute); + // Assert(CustomAttributeExtensions.GetCustomAttributes(module, typeof(SingleAttribute)).GetEnumerator().MoveNext()); + // Assert(CustomAttributeExtensions.GetCustomAttributes(module, typeof(SingleAttribute)).GetEnumerator().MoveNext()); + // Assert(!CustomAttributeExtensions.GetCustomAttributes(module, typeof(SingleAttribute<>)).GetEnumerator().MoveNext()); + // Assert(!CustomAttributeExtensions.GetCustomAttributes(module, typeof(SingleAttribute<>)).GetEnumerator().MoveNext()); + TypeInfo programTypeInfo = typeof(Class).GetTypeInfo(); Assert(CustomAttributeExtensions.GetCustomAttribute>(programTypeInfo) != null); Assert(((ICustomAttributeProvider)programTypeInfo).GetCustomAttributes(typeof(SingleAttribute), true) != null); @@ -157,13 +164,6 @@ static int Main(string[] args) Assert(!CustomAttributeExtensions.GetCustomAttributes(programTypeInfo, typeof(MultiAttribute<>), true).GetEnumerator().MoveNext()); Assert(!((ICustomAttributeProvider)programTypeInfo).GetCustomAttributes(typeof(MultiAttribute<>), true).GetEnumerator().MoveNext()); - Module module = programTypeInfo.Module; - AssertAny(CustomAttributeExtensions.GetCustomAttributes(module), a => a is SingleAttribute); - Assert(CustomAttributeExtensions.GetCustomAttributes(module, typeof(SingleAttribute)).GetEnumerator().MoveNext()); - Assert(CustomAttributeExtensions.GetCustomAttributes(module, typeof(SingleAttribute)).GetEnumerator().MoveNext()); - Assert(!CustomAttributeExtensions.GetCustomAttributes(module, typeof(SingleAttribute<>)).GetEnumerator().MoveNext()); - Assert(!CustomAttributeExtensions.GetCustomAttributes(module, typeof(SingleAttribute<>)).GetEnumerator().MoveNext()); - // Test coverage for CustomAttributeData api surface var a1_data = CustomAttributeData.GetCustomAttributes(programTypeInfo); AssertAny(a1_data, a => a.AttributeType == typeof(SingleAttribute));