Skip to content

Commit c530e06

Browse files
thomhurstthomhurst
authored
refactor: replace TypeReference with TypeInfo across metadata classes (#3328)
1 parent 42b807e commit c530e06

File tree

130 files changed

+1799
-2247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+1799
-2247
lines changed

‎Directory.Packages.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
<PackageVersion Include="Microsoft.Playwright" Version="1.55.0" />
3939
<PackageVersion Include="Microsoft.TemplateEngine.Authoring.TemplateVerifier" Version="9.0.305" />
4040
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.0.4" />
41-
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="2.0.0" />
42-
<PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="2.0.0" />
43-
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.0" />
44-
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport.Abstractions" Version="2.0.0" />
45-
<PackageVersion Include="Microsoft.Testing.Platform" Version="2.0.0" />
41+
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="1.9.0" />
42+
<PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="1.9.0" />
43+
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.9.0" />
44+
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport.Abstractions" Version="1.9.0" />
45+
<PackageVersion Include="Microsoft.Testing.Platform" Version="1.9.0" />
4646
<PackageVersion Include="Microsoft.Testing.Platform.MSBuild" Version="1.4.3" />
4747
<PackageVersion Include="System.Threading.Channels" Version="9.0.0" />
4848
<PackageVersion Include="ModularPipelines.DotNet" Version="2.47.8" />
@@ -93,4 +93,4 @@
9393
<PackageVersion Include="xunit.v3.assert" Version="3.1.0" />
9494
<PackageVersion Include="xunit.v3.extensibility.core" Version="3.1.0" />
9595
</ItemGroup>
96-
</Project>
96+
</Project>

‎TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete1.verified.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ internal sealed class ConcreteClass1_AssertClassName_TestSource_GUID : global::T
2828
MethodMetadata = new global::TUnit.Core.MethodMetadata
2929
{
3030
Type = typeof(global::TUnit.TestProject.AbstractTests.AbstractBaseClass),
31-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.AbstractBaseClass, TestsBase`1"),
31+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.AbstractBaseClass)),
3232
Name = "AssertClassName",
3333
GenericTypeCount = 0,
3434
ReturnType = typeof(global::System.Threading.Tasks.Task),
35-
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
35+
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
3636
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
3737
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass1", () =>
3838
{
3939
var classMetadata = new global::TUnit.Core.ClassMetadata
4040
{
4141
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass1),
42-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass1, TestsBase`1"),
42+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass1)),
4343
Name = "ConcreteClass1",
4444
Namespace = "TUnit.TestProject.AbstractTests",
4545
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),

‎TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ internal sealed class ConcreteClass2_SecondTest_TestSource_GUID : global::TUnit.
2929
MethodMetadata = new global::TUnit.Core.MethodMetadata
3030
{
3131
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
32-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass2, TestsBase`1"),
32+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
3333
Name = "SecondTest",
3434
GenericTypeCount = 0,
3535
ReturnType = typeof(void),
36-
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("void, System.Private.CoreLib"),
36+
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
3737
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
3838
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", () =>
3939
{
4040
var classMetadata = new global::TUnit.Core.ClassMetadata
4141
{
4242
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
43-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass2, TestsBase`1"),
43+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
4444
Name = "ConcreteClass2",
4545
Namespace = "TUnit.TestProject.AbstractTests",
4646
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
@@ -111,18 +111,18 @@ internal sealed class ConcreteClass2_AssertClassName_TestSource_GUID : global::T
111111
MethodMetadata = new global::TUnit.Core.MethodMetadata
112112
{
113113
Type = typeof(global::TUnit.TestProject.AbstractTests.AbstractBaseClass),
114-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.AbstractBaseClass, TestsBase`1"),
114+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.AbstractBaseClass)),
115115
Name = "AssertClassName",
116116
GenericTypeCount = 0,
117117
ReturnType = typeof(global::System.Threading.Tasks.Task),
118-
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
118+
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
119119
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
120120
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", () =>
121121
{
122122
var classMetadata = new global::TUnit.Core.ClassMetadata
123123
{
124124
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
125-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass2, TestsBase`1"),
125+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
126126
Name = "ConcreteClass2",
127127
Namespace = "TUnit.TestProject.AbstractTests",
128128
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
@@ -192,18 +192,18 @@ internal sealed class ConcreteClass2_SecondTest_TestSource_GUID : global::TUnit.
192192
MethodMetadata = new global::TUnit.Core.MethodMetadata
193193
{
194194
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
195-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass2, TestsBase`1"),
195+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
196196
Name = "SecondTest",
197197
GenericTypeCount = 0,
198198
ReturnType = typeof(void),
199-
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("void, System.Private.CoreLib"),
199+
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
200200
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
201201
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", () =>
202202
{
203203
var classMetadata = new global::TUnit.Core.ClassMetadata
204204
{
205205
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
206-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass2, TestsBase`1"),
206+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
207207
Name = "ConcreteClass2",
208208
Namespace = "TUnit.TestProject.AbstractTests",
209209
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
@@ -273,18 +273,18 @@ internal sealed class ConcreteClass1_AssertClassName_TestSource_GUID : global::T
273273
MethodMetadata = new global::TUnit.Core.MethodMetadata
274274
{
275275
Type = typeof(global::TUnit.TestProject.AbstractTests.AbstractBaseClass),
276-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.AbstractBaseClass, TestsBase`1"),
276+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.AbstractBaseClass)),
277277
Name = "AssertClassName",
278278
GenericTypeCount = 0,
279279
ReturnType = typeof(global::System.Threading.Tasks.Task),
280-
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
280+
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
281281
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
282282
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass1", () =>
283283
{
284284
var classMetadata = new global::TUnit.Core.ClassMetadata
285285
{
286286
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass1),
287-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass1, TestsBase`1"),
287+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass1)),
288288
Name = "ConcreteClass1",
289289
Namespace = "TUnit.TestProject.AbstractTests",
290290
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),

‎TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ internal sealed class CleanupTests_Test1_TestSource_GUID : global::TUnit.Core.In
2727
MethodMetadata = new global::TUnit.Core.MethodMetadata
2828
{
2929
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
30-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
30+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
3131
Name = "Test1",
3232
GenericTypeCount = 0,
3333
ReturnType = typeof(global::System.Threading.Tasks.Task),
34-
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
34+
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
3535
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
3636
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", () =>
3737
{
3838
var classMetadata = new global::TUnit.Core.ClassMetadata
3939
{
4040
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
41-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
41+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
4242
Name = "CleanupTests",
4343
Namespace = "TUnit.TestProject.AfterTests",
4444
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
@@ -106,18 +106,18 @@ internal sealed class CleanupTests_Test2_TestSource_GUID : global::TUnit.Core.In
106106
MethodMetadata = new global::TUnit.Core.MethodMetadata
107107
{
108108
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
109-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
109+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
110110
Name = "Test2",
111111
GenericTypeCount = 0,
112112
ReturnType = typeof(global::System.Threading.Tasks.Task),
113-
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
113+
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
114114
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
115115
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", () =>
116116
{
117117
var classMetadata = new global::TUnit.Core.ClassMetadata
118118
{
119119
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
120-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
120+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
121121
Name = "CleanupTests",
122122
Namespace = "TUnit.TestProject.AfterTests",
123123
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),

‎TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ internal sealed class CleanupTests_Test1_TestSource_GUID : global::TUnit.Core.In
2727
MethodMetadata = new global::TUnit.Core.MethodMetadata
2828
{
2929
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
30-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
30+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
3131
Name = "Test1",
3232
GenericTypeCount = 0,
3333
ReturnType = typeof(global::System.Threading.Tasks.Task),
34-
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
34+
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
3535
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
3636
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", () =>
3737
{
3838
var classMetadata = new global::TUnit.Core.ClassMetadata
3939
{
4040
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
41-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
41+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
4242
Name = "CleanupTests",
4343
Namespace = "TUnit.TestProject.AfterTests",
4444
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
@@ -106,18 +106,18 @@ internal sealed class CleanupTests_Test2_TestSource_GUID : global::TUnit.Core.In
106106
MethodMetadata = new global::TUnit.Core.MethodMetadata
107107
{
108108
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
109-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
109+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
110110
Name = "Test2",
111111
GenericTypeCount = 0,
112112
ReturnType = typeof(global::System.Threading.Tasks.Task),
113-
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
113+
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
114114
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
115115
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", () =>
116116
{
117117
var classMetadata = new global::TUnit.Core.ClassMetadata
118118
{
119119
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
120-
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
120+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
121121
Name = "CleanupTests",
122122
Namespace = "TUnit.TestProject.AfterTests",
123123
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),

0 commit comments

Comments
 (0)