From b8d7410659c18816ff77cd2f22144397a5ba2ce8 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 6 Oct 2021 18:12:27 -0500 Subject: [PATCH] Remove SkipOn NetFramework attributes in System.Reflection.Emit tests These tests are not run on netfx, so these attributes are just clutter. --- .../tests/AssemblyBuilderTests.cs | 14 +------------- .../ParameterBuilderSetConstant.cs | 12 ++---------- .../TypeBuilder/TypeBuilderDefineMethodOverride.cs | 2 -- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs b/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs index d507a9450eda8..7b9050df231dd 100644 --- a/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs +++ b/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs @@ -91,7 +91,6 @@ public void DefineDynamicAssembly_NullName_ThrowsArgumentNullException() } [Theory] - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "The coreclr doesn't support Save or ReflectionOnly AssemblyBuilders.")] [InlineData((AssemblyBuilderAccess)2)] // Save (not supported) [InlineData((AssemblyBuilderAccess)2 | AssemblyBuilderAccess.Run)] // RunAndSave (not supported) [InlineData((AssemblyBuilderAccess)6)] // ReflectionOnly (not supported) @@ -174,18 +173,7 @@ public void DefineDynamicModule_InvalidName_ThrowsArgumentException(string name) } [Fact] - [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework, "The coreclr only supports AssemblyBuilders with one module.")] - public void DefineDynamicModule_NetFxModuleAlreadyDefined_ThrowsInvalidOperationException() - { - AssemblyBuilder assembly = Helpers.DynamicAssembly(); - assembly.DefineDynamicModule("module1"); - assembly.DefineDynamicModule("module2"); - AssertExtensions.Throws(null, () => assembly.DefineDynamicModule("module1")); - } - - [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "The coreclr only supports AssemblyBuilders with one module.")] - public void DefineDynamicModule_CoreFxModuleAlreadyDefined_ThrowsInvalidOperationException() + public void DefineDynamicModule_ModuleAlreadyDefined_ThrowsInvalidOperationException() { AssemblyBuilder assembly = Helpers.DynamicAssembly(); assembly.DefineDynamicModule("module1"); diff --git a/src/libraries/System.Reflection.Emit/tests/ParameterBuilder/ParameterBuilderSetConstant.cs b/src/libraries/System.Reflection.Emit/tests/ParameterBuilder/ParameterBuilderSetConstant.cs index 7fbb7d9c82cae..48d87c9e4323f 100644 --- a/src/libraries/System.Reflection.Emit/tests/ParameterBuilder/ParameterBuilderSetConstant.cs +++ b/src/libraries/System.Reflection.Emit/tests/ParameterBuilder/ParameterBuilderSetConstant.cs @@ -56,24 +56,16 @@ public static IEnumerable SetConstant_ValueTypes_TestData() [Theory] [MemberData(nameof(SetConstant_ReferenceTypes_TestData))] [MemberData(nameof(SetConstant_NullableValueTypes_TestData))] - public void SetConstant_Null_fully_supported(Type parameterType) - { - SetConstant_Null(parameterType); - } - - [Theory] - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Passing null for SetConstant on value types not supported on NETFX")] [MemberData(nameof(SetConstant_ValueTypes_TestData))] - public void SetConstant_Null_not_supported_on_NETFX(Type parameterType) + public void SetConstant_Null_fully_supported(Type parameterType) { SetConstant_Null(parameterType); } [Theory] - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Passing non-null value for SetConstant on nullable enum types not supported on NETFX")] [InlineData(typeof(AttributeTargets?), AttributeTargets.All, (int)AttributeTargets.All)] [InlineData(typeof(AttributeTargets?), (int)AttributeTargets.All, (int)AttributeTargets.All)] - public void SetConstant_NonNull_on_nullable_enum_not_supported_on_NETFX(Type parameterType, object valueToWrite, object expectedValueWhenRead) + public void SetConstant_NonNull_on_nullable_enum(Type parameterType, object valueToWrite, object expectedValueWhenRead) { SetConstant(parameterType, valueToWrite, expectedValueWhenRead); } diff --git a/src/libraries/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderDefineMethodOverride.cs b/src/libraries/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderDefineMethodOverride.cs index 276367d95519e..e08e4c6be08bf 100644 --- a/src/libraries/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderDefineMethodOverride.cs +++ b/src/libraries/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderDefineMethodOverride.cs @@ -269,7 +269,6 @@ public interface InterfaceWithMethod [Fact] [ActiveIssue("https://github.com/dotnet/runtime/issues/49904", TestRuntimes.Mono)] - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Static virtual interface methods not supported on .NET Framework")] public void DefineMethodOverride_StaticVirtualInterfaceMethod() { AssemblyBuilder assembly = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName("Name"), AssemblyBuilderAccess.Run); @@ -296,7 +295,6 @@ public void DefineMethodOverride_StaticVirtualInterfaceMethod() [Fact] [ActiveIssue("https://github.com/dotnet/runtime/issues/49904", TestRuntimes.Mono)] - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Static virtual interface methods not supported on .NET Framework")] public void DefineMethodOverride_StaticVirtualInterfaceMethod_VerifyWithInterfaceMap() { AssemblyBuilder assembly = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName("Name"), AssemblyBuilderAccess.Run);