Skip to content

Commit fc8deca

Browse files
wtgodbewtgodbe
authored
Rename Microsoft.Aspnetcore.Testing to Microsoft.AspNetCore.InternalTesting (#51713)
* Rename Microsoft.Aspnetcore.Testing to Microsoft.AspNetCore.TestUtils * Pack Microsoft.Aspnetcore.Testutils * Rename Microsoft.AspNetCore.Testing.props to Microsoft.AspNetCore.TestUtils.props * TestUtils -> InternalTesting * Renames * Update WebApplicationFunctionalTests.cs * Update HubConnectionTests.cs
1 parent 89c2ef3 commit fc8deca

File tree

776 files changed

+847
-830
lines changed

Some content is hidden

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

776 files changed

+847
-830
lines changed

‎AspNetCore.sln

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InteropTests", "src\Grpc\In
545545
EndProject
546546
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{05A169C7-4F20-4516-B10A-B13C5649D346}"
547547
EndProject
548-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Testing", "src\Testing\src\Microsoft.AspNetCore.Testing.csproj", "{3D06E2C9-44F7-408D-802C-42D7E55F08E7}"
549-
EndProject
550548
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Tests", "src\Hosting\Hosting\test\Microsoft.AspNetCore.Hosting.Tests.csproj", "{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}"
551549
EndProject
552550
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C8415333-2A64-4FF0-8FC9-652694A11A77}"
@@ -1266,8 +1264,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3CBC4802-E
12661264
EndProject
12671265
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.FunctionalTests", "src\Servers\test\FunctionalTests\ServerComparison.FunctionalTests.csproj", "{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}"
12681266
EndProject
1269-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Testing.Tests", "src\Testing\test\Microsoft.AspNetCore.Testing.Tests.csproj", "{1542DC58-1836-4191-A9C5-51D1716D2543}"
1270-
EndProject
12711267
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{6126DCE4-9692-4EE2-B240-C65743572995}"
12721268
EndProject
12731269
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTestApp", "src\Components\test\testassets\BasicTestApp\BasicTestApp.csproj", "{46FB7E93-1294-4068-B80A-D4864F78277A}"
@@ -1780,6 +1776,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Output
17801776
EndProject
17811777
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.OutputCaching.StackExchangeRedis", "src\Middleware\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis\src\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis.csproj", "{F232B503-D412-45EE-8B31-EFD46B9FA302}"
17821778
EndProject
1779+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.InternalTesting", "src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj", "{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}"
1780+
EndProject
1781+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.InternalTesting.Tests", "src\Testing\test\Microsoft.AspNetCore.InternalTesting.Tests.csproj", "{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}"
1782+
EndProject
17831783
Global
17841784
GlobalSection(SolutionConfigurationPlatforms) = preSolution
17851785
Debug|Any CPU = Debug|Any CPU
@@ -3888,22 +3888,6 @@ Global
38883888
{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x64.Build.0 = Release|Any CPU
38893889
{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x86.ActiveCfg = Release|Any CPU
38903890
{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x86.Build.0 = Release|Any CPU
3891-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3892-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
3893-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|arm64.ActiveCfg = Debug|Any CPU
3894-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|arm64.Build.0 = Debug|Any CPU
3895-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|x64.ActiveCfg = Debug|Any CPU
3896-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|x64.Build.0 = Debug|Any CPU
3897-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|x86.ActiveCfg = Debug|Any CPU
3898-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|x86.Build.0 = Debug|Any CPU
3899-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
3900-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|Any CPU.Build.0 = Release|Any CPU
3901-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|arm64.ActiveCfg = Release|Any CPU
3902-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|arm64.Build.0 = Release|Any CPU
3903-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|x64.ActiveCfg = Release|Any CPU
3904-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|x64.Build.0 = Release|Any CPU
3905-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|x86.ActiveCfg = Release|Any CPU
3906-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|x86.Build.0 = Release|Any CPU
39073891
{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39083892
{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|Any CPU.Build.0 = Debug|Any CPU
39093893
{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|arm64.ActiveCfg = Debug|Any CPU
@@ -10717,6 +10701,38 @@ Global
1071710701
{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x64.Build.0 = Release|Any CPU
1071810702
{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x86.ActiveCfg = Release|Any CPU
1071910703
{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x86.Build.0 = Release|Any CPU
10704+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10705+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|Any CPU.Build.0 = Debug|Any CPU
10706+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|arm64.ActiveCfg = Debug|Any CPU
10707+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|arm64.Build.0 = Debug|Any CPU
10708+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|x64.ActiveCfg = Debug|Any CPU
10709+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|x64.Build.0 = Debug|Any CPU
10710+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|x86.ActiveCfg = Debug|Any CPU
10711+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|x86.Build.0 = Debug|Any CPU
10712+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|Any CPU.ActiveCfg = Release|Any CPU
10713+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|Any CPU.Build.0 = Release|Any CPU
10714+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|arm64.ActiveCfg = Release|Any CPU
10715+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|arm64.Build.0 = Release|Any CPU
10716+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|x64.ActiveCfg = Release|Any CPU
10717+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|x64.Build.0 = Release|Any CPU
10718+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|x86.ActiveCfg = Release|Any CPU
10719+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|x86.Build.0 = Release|Any CPU
10720+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10721+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|Any CPU.Build.0 = Debug|Any CPU
10722+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|arm64.ActiveCfg = Debug|Any CPU
10723+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|arm64.Build.0 = Debug|Any CPU
10724+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|x64.ActiveCfg = Debug|Any CPU
10725+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|x64.Build.0 = Debug|Any CPU
10726+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|x86.ActiveCfg = Debug|Any CPU
10727+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|x86.Build.0 = Debug|Any CPU
10728+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|Any CPU.ActiveCfg = Release|Any CPU
10729+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|Any CPU.Build.0 = Release|Any CPU
10730+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|arm64.ActiveCfg = Release|Any CPU
10731+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|arm64.Build.0 = Release|Any CPU
10732+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|x64.ActiveCfg = Release|Any CPU
10733+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|x64.Build.0 = Release|Any CPU
10734+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|x86.ActiveCfg = Release|Any CPU
10735+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|x86.Build.0 = Release|Any CPU
1072010736
EndGlobalSection
1072110737
GlobalSection(SolutionProperties) = preSolution
1072210738
HideSolutionNode = FALSE
@@ -10983,7 +10999,6 @@ Global
1098310999
{E763DA15-8F4E-446C-99B8-309053C75598} = {7A331A1C-E2C4-4E37-B0A0-B5AA10661229}
1098411000
{3ADC50B9-2EBB-422A-8424-F9FC67841CA1} = {E763DA15-8F4E-446C-99B8-309053C75598}
1098511001
{05A169C7-4F20-4516-B10A-B13C5649D346} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
10986-
{3D06E2C9-44F7-408D-802C-42D7E55F08E7} = {05A169C7-4F20-4516-B10A-B13C5649D346}
1098711002
{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987} = {68C2D913-06D4-4EAC-9283-78465BF214E1}
1098811003
{C8415333-2A64-4FF0-8FC9-652694A11A77} = {2DB7E3C7-D213-4609-95DD-72561F23AB58}
1098911004
{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA} = {C8415333-2A64-4FF0-8FC9-652694A11A77}
@@ -11596,6 +11611,8 @@ Global
1159611611
{CAEB7F57-28A8-451C-95D0-45FCAA3C726C} = {C445B129-0A4D-41F5-8347-6534B6B12303}
1159711612
{A939893A-B3CD-48F6-80D3-340C8A6E275B} = {AA5ABFBC-177C-421E-B743-005E0FD1248B}
1159811613
{F232B503-D412-45EE-8B31-EFD46B9FA302} = {AA5ABFBC-177C-421E-B743-005E0FD1248B}
11614+
{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E} = {05A169C7-4F20-4516-B10A-B13C5649D346}
11615+
{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E} = {05A169C7-4F20-4516-B10A-B13C5649D346}
1159911616
EndGlobalSection
1160011617
GlobalSection(ExtensibilityGlobals) = postSolution
1160111618
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

‎docs/EventSourceAndCounters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ namespace Microsoft.AspNetCore.Authentication.Internal
169169

170170
## Automated Testing of EventSources
171171

172-
EventSources can be tested using the `EventSourceTestBase` base class in `Microsoft.AspNetCore.Testing`. An example test is below:
172+
EventSources can be tested using the `EventSourceTestBase` base class in `Microsoft.AspNetCore.InternalTesting`. An example test is below:
173173

174174
```csharp
175175
// The base class MUST be used for EventSource testing because EventSources are global and parallel tests can cause issues.

‎eng/ProjectReferences.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<ProjectReferenceProvider Include="Microsoft.Extensions.WebEncoders" ProjectPath="$(RepoRoot)src\WebEncoders\src\Microsoft.Extensions.WebEncoders.csproj" />
163163
<ProjectReferenceProvider Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" ProjectPath="$(RepoRoot)src\HealthChecks\Abstractions\src\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj" />
164164
<ProjectReferenceProvider Include="Microsoft.Extensions.Diagnostics.HealthChecks" ProjectPath="$(RepoRoot)src\HealthChecks\HealthChecks\src\Microsoft.Extensions.Diagnostics.HealthChecks.csproj" />
165-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.Testing.csproj" />
165+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.InternalTesting" ProjectPath="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj" />
166166
<ProjectReferenceProvider Include="Microsoft.Extensions.Features" ProjectPath="$(RepoRoot)src\Extensions\Features\src\Microsoft.Extensions.Features.csproj" />
167167
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" ProjectPath="$(RepoRoot)src\Grpc\JsonTranscoding\src\Microsoft.AspNetCore.Grpc.JsonTranscoding\Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj" />
168168
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Grpc.Swagger" ProjectPath="$(RepoRoot)src\Grpc\JsonTranscoding\src\Microsoft.AspNetCore.Grpc.Swagger\Microsoft.AspNetCore.Grpc.Swagger.csproj" />

‎eng/targets/CSharp.Common.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
</PropertyGroup>
88

99
<ItemGroup Condition=" $(IsTestProject) ">
10-
<Reference Include="Microsoft.AspNetCore.Testing" />
10+
<Reference Include="Microsoft.AspNetCore.InternalTesting" />
1111
<Reference Include="Moq" />
1212
<Reference Include="NETStandard.Library" />
1313
<Compile Include="$(SharedSourceRoot)test\SuccessfulTests.cs" LinkBase="SharedTests" Visible="false" />
1414
</ItemGroup>
1515

16-
<Import Project="$(RepoRoot)src\Testing\src\build\Microsoft.AspNetCore.Testing.props" Condition=" $(IsTestProject) " />
16+
<Import Project="$(RepoRoot)src\Testing\src\build\Microsoft.AspNetCore.InternalTesting.props" Condition=" $(IsTestProject) " />
1717

1818
<ItemDefinitionGroup Condition=" $(IsTestProject) ">
1919
<Content>

‎src/Antiforgery/test/DefaultAntiforgeryTokenGeneratorTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Security.Claims;
66
using System.Security.Cryptography;
77
using Microsoft.AspNetCore.Http;
8-
using Microsoft.AspNetCore.Testing;
8+
using Microsoft.AspNetCore.InternalTesting;
99
using Moq;
1010

1111
namespace Microsoft.AspNetCore.Antiforgery.Internal;

‎src/Caching/SqlServer/test/SqlServerCacheWithDatabaseTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Globalization;
88
using System.Text;
99
using System.Threading.Tasks;
10-
using Microsoft.AspNetCore.Testing;
10+
using Microsoft.AspNetCore.InternalTesting;
1111
using Microsoft.Data.SqlClient;
1212
using Microsoft.Extensions.Caching.Distributed;
1313
using Microsoft.Extensions.Configuration;

‎src/Caching/StackExchangeRedis/test/TimeExpirationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System;
55
using System.Threading;
6-
using Microsoft.AspNetCore.Testing;
6+
using Microsoft.AspNetCore.InternalTesting;
77
using Microsoft.Extensions.Caching.Distributed;
88
using Microsoft.Extensions.Caching.Memory;
99
using Xunit;

‎src/Components/Authorization/test/AuthorizeViewTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using Microsoft.AspNetCore.Components.Rendering;
99
using Microsoft.AspNetCore.Components.RenderTree;
1010
using Microsoft.AspNetCore.Components.Test.Helpers;
11-
using Microsoft.AspNetCore.Testing;
11+
using Microsoft.AspNetCore.InternalTesting;
1212
using Microsoft.Extensions.DependencyInjection;
1313

1414
namespace Microsoft.AspNetCore.Components.Authorization;

‎src/Components/Components.slnf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
"src\\SignalR\\common\\SignalR.Common\\src\\Microsoft.AspNetCore.SignalR.Common.csproj",
143143
"src\\SignalR\\server\\Core\\src\\Microsoft.AspNetCore.SignalR.Core.csproj",
144144
"src\\SignalR\\server\\SignalR\\src\\Microsoft.AspNetCore.SignalR.csproj",
145-
"src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj",
145+
"src\\Testing\\src\\Microsoft.AspNetCore.InternalTesting.csproj",
146146
"src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
147147
]
148148
}

‎src/Components/Components/test/EventCallbackFactoryBinderExtensionsTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.ComponentModel;
55
using System.Globalization;
6-
using Microsoft.AspNetCore.Testing;
6+
using Microsoft.AspNetCore.InternalTesting;
77

88
namespace Microsoft.AspNetCore.Components;
99

0 commit comments

Comments
 (0)