Skip to content

Harden some reflection invoke tests #113000

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

Merged
merged 3 commits into from
Mar 4, 2025
Merged

Harden some reflection invoke tests #113000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aaf1c03
Harden some reflection invoke tests
steveharter Feb 27, 2025
fc41e5e
Update csproj files to remove unused files
steveharter Feb 28, 2025
267af4f
Remove test that is too coupled to stack frame semantics
steveharter Mar 3, 2025
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
51 changes: 0 additions & 51 deletions src/libraries/Common/tests/System/Reflection/InvokeEmitTests.cs
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions src/libraries/Common/tests/System/Reflection/InvokeInterpretedTests.cs
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/libraries/System.Diagnostics.StackTrace/tests/StackFrameTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,6 @@ public void Ctor_FNeedFileInfo(bool fNeedFileInfo)
VerifyStackFrame(stackFrame, fNeedFileInfo, 0, typeof(StackFrameTests).GetMethod(nameof(Ctor_FNeedFileInfo)));
}

[Theory]
[ActiveIssue("https://github.com/mono/mono/issues/15183", TestRuntimes.Mono)]
[InlineData(StackFrame.OFFSET_UNKNOWN)]
[InlineData(0)]
[InlineData(1)]
public void Ctor_SkipFrames(int skipFrames)
{
var stackFrame = new StackFrame(skipFrames);
VerifyStackFrame(stackFrame, true, skipFrames, typeof(StackFrameTests).GetMethod(nameof(Ctor_SkipFrames)), isCurrentFrame: skipFrames == 0);
}

[Theory]
[ActiveIssue("https://github.com/mono/mono/issues/15187", TestRuntimes.Mono)]
[InlineData(StackFrame.OFFSET_UNKNOWN, true)]
Expand Down
17 changes: 17 additions & 0 deletions src/libraries/System.Runtime/tests/System.Reflection.Tests/ConstructorCommonTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,5 +163,22 @@ public void Invoke_Struct()
Assert.Equal(1, obj.x);
Assert.Equal(2, obj.y);
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50957", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoAOT))]
public static void VerifyInnerException()
{
ConstructorInfo ctor = typeof(TestClassThatThrows).GetConstructor(Type.EmptyTypes)!;
TargetInvocationException ex = Assert.Throws<TargetInvocationException>(() => ctor.Invoke(null));
Assert.Contains("Here", ex.InnerException.ToString());
}

private class TestClassThatThrows
{
public TestClassThatThrows()
{
throw new Exception("Here");
}
}
}
}
3 changes: 1 addition & 2 deletions ...untime/tests/System.Reflection.Tests/InvokeEmit/System.Reflection.InvokeEmit.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TestRuntime>true</TestRuntime>
Expand All @@ -14,7 +14,6 @@
<Compile Include="..\MethodInfoTests.cs" />
<Compile Include="..\MethodInvokerTests.cs" />
<Compile Include="..\PropertyInfoTests.cs" />
<Compile Include="$(CommonTestPath)\System\Reflection\InvokeEmitTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TestAssembly\TestAssembly.csproj" />
Expand Down
1 change: 0 additions & 1 deletion ...ystem.Reflection.Tests/InvokeInterpreted/System.Reflection.InvokeInterpreted.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<Compile Include="..\MethodInfoTests.cs" />
<Compile Include="..\MethodInvokerTests.cs" />
<Compile Include="..\PropertyInfoTests.cs" />
<Compile Include="$(CommonTestPath)\System\Reflection\InvokeInterpretedTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TestAssembly\TestAssembly.csproj" />
Expand Down
14 changes: 14 additions & 0 deletions src/libraries/System.Runtime/tests/System.Reflection.Tests/MethodCommonTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,5 +293,19 @@ public unsafe void TestFunctionPointerAsReturnType()
Assert.IsType<IntPtr>(ret);
Assert.True((IntPtr)ret != 0);
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50957", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoAOT))]
public static void VerifyInnerException()
{
MethodInfo method = typeof(TestClassThatThrows).GetMethod(nameof(TestClassThatThrows.Throw))!;
TargetInvocationException ex = Assert.Throws<TargetInvocationException>(() => method.Invoke(null, null));
Assert.Contains("Here", ex.InnerException.ToString());
}

private class TestClassThatThrows
{
public static void Throw() => throw new Exception("Here");
}
}
}
1 change: 0 additions & 1 deletion ...ntime.Tests/System/Reflection/InvokeEmit/System.Runtime.ReflectionInvokeEmit.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<Compile Include="..\InvokeRefReturn.cs" />
<Compile Include="..\InvokeWithRefLikeArgs.cs" />
<Compile Include="..\PointerTests.cs" />
<Compile Include="$(CommonTestPath)\System\Reflection\InvokeEmitTests.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Moq" Version="$(MoqVersion)" />
Expand Down
1 change: 0 additions & 1 deletion ...stem/Reflection/InvokeInterpreted/System.Runtime.ReflectionInvokeInterpreted.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<Compile Include="..\InvokeRefReturn.cs" />
<Compile Include="..\InvokeWithRefLikeArgs.cs" />
<Compile Include="..\PointerTests.cs" />
<Compile Include="$(CommonTestPath)\System\Reflection\InvokeInterpretedTests.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Moq" Version="$(MoqVersion)" />
Expand Down
Loading