Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce subtest count in Reflection #55537

Merged
merged 2 commits into from
Jul 13, 2021
Merged

Reduce subtest count in Reflection #55537

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72eaf03
Reduce reflection subtest count
danmoseley Jul 12, 2021
7a15f11
typo
danmoseley Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 36 additions & 25 deletions src/libraries/System.Runtime/tests/System/Reflection/ModuleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,21 +242,20 @@ public void GetMethods()
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);

Expand All @@ -270,14 +269,14 @@ public void ResolveTypeFail(int token)
});
}

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 =>
Expand All @@ -299,15 +298,15 @@ public void ResolveMethodFail(int token)
});
}

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 =>
Expand Down Expand Up @@ -348,13 +347,25 @@ public void ResolveStringFail(int token)
});
}

[Theory]
[MemberData(nameof(Types))]
[MemberData(nameof(Methods))]
[MemberData(nameof(Fields))]
public void ResolveMember(MemberInfo member)
[Fact]
public void ResolveTypesByMemberInfo()
{
foreach(MemberInfo mi in Types)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nittiest nit possible? Inconsistent spacing on the foreach statements.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since it's a nittiest nit, and validation's done, I'll fix that in the next change.

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]
Expand Down