Reduce subtest count in Reflection (#55537)

* Reduce reflection subtest count

* typo

1 files changed, 36 insertions, 25 deletions

diff --git a/src/libraries/System.Runtime/tests/System/Reflection/ModuleTests.cs b/src/libraries/System.Runtime/tests/System/Reflection/ModuleTests.cs
index 29fe532e6c0..8c42d79063f 100644
--- a/src/libraries/System.Runtime/tests/System/Reflection/ModuleTests.cs
+++ b/src/libraries/System.Runtime/tests/System/Reflection/ModuleTests.cs
@@ -242,21 +242,20 @@ namespace System.Reflection.Tests
             AssertExtensions.SequenceEqual(new[]{ "TestMethodFoo", "TestMethodFoo", "TestMethodBar" }, methodNames );
         }
 
-        public static IEnumerable<object[]> Types =>
-            Module.GetTypes().Select(t => new object[] { t });
+        public static IEnumerable<Type> Types => Module.GetTypes();
 
-        [Theory]
-        [MemberData(nameof(Types))]
-        public void ResolveType(Type t)
+        [Fact]
+        public void ResolveTypes()
         {
-            Assert.Equal(t, Module.ResolveType(t.MetadataToken));
+            foreach(Type t in Types)
+                Assert.Equal(t, Module.ResolveType(t.MetadataToken));
         }
 
         public static IEnumerable<object[]> BadResolveTypes =>
             new[]
             {
                 new object[] { 1234 },
-                new object[] { typeof(ModuleTests).GetMethod("ResolveType").MetadataToken },
+                new object[] { typeof(ModuleTests).GetMethod("ResolveTypes").MetadataToken },
             }
             .Union(NullTokens);
 
@@ -270,14 +269,14 @@ namespace System.Reflection.Tests
             });
         }
 
-        public static IEnumerable<object[]> Methods =>
-            typeof(ModuleTests).GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.DeclaredOnly).Select(m => new object[] { m });
+        public static IEnumerable<MemberInfo> Methods =>
+            typeof(ModuleTests).GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.DeclaredOnly);
 
-        [Theory]
-        [MemberData(nameof(Methods))]
-        public void ResolveMethod(MethodInfo t)
+        [Fact]
+        public void ResolveMethodsByMethodInfo()
         {
-            Assert.Equal(t, Module.ResolveMethod(t.MetadataToken));
+            foreach(MethodInfo mi in Methods)
+                Assert.Equal(mi, Module.ResolveMethod(mi.MetadataToken));
         }
 
         public static IEnumerable<object[]> BadResolveMethods =>
@@ -299,15 +298,15 @@ namespace System.Reflection.Tests
             });
         }
 
-        public static IEnumerable<object[]> Fields =>
-            typeof(ModuleTests).GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.DeclaredOnly).Select(f => new object[] { f });
+        public static IEnumerable<MemberInfo> Fields =>
+            typeof(ModuleTests).GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.DeclaredOnly);
 
-        [Theory]
-        [MemberData(nameof(Fields))]
+        [Fact]
         [ActiveIssue("https://github.com/dotnet/runtime/issues/52072", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
-        public void ResolveField(FieldInfo t)
+        public void ResolveFieldsByFieldInfo()
         {
-            Assert.Equal(t, Module.ResolveField(t.MetadataToken));
+            foreach(FieldInfo fi in Fields)
+                Assert.Equal(fi, Module.ResolveField(fi.MetadataToken));
         }
 
         public static IEnumerable<object[]> BadResolveFields =>
@@ -348,13 +347,25 @@ namespace System.Reflection.Tests
             });
         }
 
-        [Theory]
-        [MemberData(nameof(Types))]
-        [MemberData(nameof(Methods))]
-        [MemberData(nameof(Fields))]
-        public void ResolveMember(MemberInfo member)
+        [Fact]
+        public void ResolveTypesByMemberInfo()
+        {
+            foreach(MemberInfo mi in Types)
+                Assert.Equal(mi, Module.ResolveMember(mi.MetadataToken));
+        }
+
+        [Fact]
+        public void ResolveMethodsByMemberInfo()
+        {
+            foreach (MemberInfo mi in Methods)
+                Assert.Equal(mi, Module.ResolveMember(mi.MetadataToken));
+        }
+
+        [Fact]
+        public void ResolveFieldsByMemberInfo()
         {
-            Assert.Equal(member, Module.ResolveMember(member.MetadataToken));
+            foreach (MemberInfo mi in Fields)
+                Assert.Equal(mi, Module.ResolveMember(mi.MetadataToken));
         }
 
         [Fact]