Skip to content

Commit 2a4eb19

Browse files
Sanan07Sanan07
authored
Removing ordered, generic tests, update externals, resuming old tests (#3025)
1 parent dde3ace commit 2a4eb19

15 files changed

+4
-115
lines changed

‎scripts/build/TestPlatform.Dependencies.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<JsonNetVersion>9.0.1</JsonNetVersion>
3333
<MoqVersion>4.8.3</MoqVersion>
3434

35-
<TestPlatformExternalsVersion>17.0.0-previews-4-31622-033</TestPlatformExternalsVersion>
35+
<TestPlatformExternalsVersion>17.0.0-previews-4-31630-230</TestPlatformExternalsVersion>
3636
<!-- <TestPlatformMSDiaVersion>$(TestPlatformExternalsVersion)</TestPlatformMSDiaVersion> -->
3737
<TestPlatformMSDiaVersion>17.0.0-previews-3-31515-332</TestPlatformMSDiaVersion>
3838

‎scripts/verify-nupkgs.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function Verify-Nuget-Packages($packageDirectory, $version)
1414
$expectedNumOfFiles = @{
1515
"Microsoft.CodeCoverage" = 59;
1616
"Microsoft.NET.Test.Sdk" = 27;
17-
"Microsoft.TestPlatform" = 486;
17+
"Microsoft.TestPlatform" = 484;
1818
"Microsoft.TestPlatform.Build" = 21;
1919
"Microsoft.TestPlatform.CLI" = 367;
2020
"Microsoft.TestPlatform.Extensions.TrxLogger" = 35;

‎src/Microsoft.TestPlatform.CrossPlatEngine/Constants.cs

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ public class Constants
1717
internal static readonly IList<string> DefaultAdapters = new ReadOnlyCollection<string>(new List<string>
1818
{
1919
"executor://CodedWebTestAdapter/v1",
20-
"executor://GenericTestAdapter/v1",
21-
"executor://OrderedTestAdapter/v1",
2220
"executor://MSTestAdapter/v1",
2321
"executor://WebTestAdapter/v1",
2422
"executor://CppUnitTestExecutor/v1"

‎src/package/nuspec/Microsoft.TestPlatform.nuspec

-2
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,6 @@
228228
<file src="net451\$Runtime$\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
229229
<file src="net451\$Runtime$\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" />
230230
<file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll" />
231-
<file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.GenericTestAdapter.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.GenericTestAdapter.dll" />
232-
<file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.OrderedTestAdapter.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.OrderedTestAdapter.dll" />
233231
<file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" />
234232
<file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
235233
<file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />

‎src/package/sign/sign.proj

-2
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@
8282

8383
<AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
8484
<AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorderCollector.dll" />
85-
<AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.GenericTestAdapter.dll" />
86-
<AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.OrderedTestAdapter.dll" />
8785
<AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll" />
8886
<AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll" />
8987
<AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" />

‎test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class CUITTest : AcceptanceTestBase
1111
{
1212
[TestMethod]
1313
[TestCategory("Windows-Review")]
14-
[Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
1514
[NetFullTargetFrameworkDataSource]
1615
public void CUITRunAllTests(RunnerInfo runnerInfo)
1716
{

‎test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs

-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public void CPPRunAllTestExecutionPlatformx64(RunnerInfo runnerInfo)
5151

5252
[TestMethod]
5353
[TestCategory("Windows-Review")]
54-
[Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
5554
[NetFullTargetFrameworkDataSource]
5655
public void WebTestRunAllTestsWithRunSettings(RunnerInfo runnerInfo)
5756
{
@@ -76,7 +75,6 @@ public void WebTestRunAllTestsWithRunSettings(RunnerInfo runnerInfo)
7675

7776
[TestMethod]
7877
[TestCategory("Windows-Review")]
79-
[Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
8078
[NetFullTargetFrameworkDataSource]
8179
public void CodedWebTestRunAllTests(RunnerInfo runnerInfo)
8280
{

‎test/Microsoft.TestPlatform.AcceptanceTests/ListExtensionsTests.cs

+2-14
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ public void ListDiscoverersShouldShowInboxDiscoverers(RunnerInfo runnerInfo)
2121
if (this.IsDesktopRunner())
2222
{
2323
this.StdOutputContains("executor://codedwebtestadapter/v1");
24-
this.StdOutputContains("executor://generictestadapter/v1");
25-
this.StdOutputContains(".generictest");
26-
this.StdOutputContains("executor://orderedtestadapter/v1");
27-
this.StdOutputContains(".orderedtest");
2824
this.StdOutputContains("executor://mstestadapter/v1");
2925
this.StdOutputContains("executor://webtestadapter/v1");
3026
this.StdOutputContains(".Webtest");
@@ -33,11 +29,7 @@ public void ListDiscoverersShouldShowInboxDiscoverers(RunnerInfo runnerInfo)
3329
else
3430
{
3531
// There are no inbox adapters for dotnet core
36-
this.StdOutputDoesNotContains("executor://codedwebtestadapter/v1");
37-
this.StdOutputDoesNotContains("executor://generictestadapter/v1");
38-
this.StdOutputDoesNotContains(".generictest");
39-
this.StdOutputDoesNotContains("executor://orderedtestadapter/v1");
40-
this.StdOutputDoesNotContains(".orderedtest");
32+
this.StdOutputDoesNotContains("executor://codedwebtestadapter/v1");
4133
this.StdOutputDoesNotContains("executor://mstestadapter/v1");
4234
this.StdOutputDoesNotContains("executor://webtestadapter/v1");
4335
this.StdOutputDoesNotContains(".Webtest");
@@ -55,9 +47,7 @@ public void ListExecutorsShouldShowInboxExecutors(RunnerInfo runnerInfo)
5547

5648
if (this.IsDesktopRunner())
5749
{
58-
this.StdOutputContains("executor://CodedWebTestAdapter/v1");
59-
this.StdOutputContains("executor://GenericTestAdapter/v1");
60-
this.StdOutputContains("executor://OrderedTestAdapter/v1");
50+
this.StdOutputContains("executor://CodedWebTestAdapter/v1");
6151
this.StdOutputContains("executor://MSTestAdapter/v1");
6252
this.StdOutputContains("executor://WebTestAdapter/v1");
6353
this.StdOutputContains("executor://CppUnitTestExecutor/v1");
@@ -67,8 +57,6 @@ public void ListExecutorsShouldShowInboxExecutors(RunnerInfo runnerInfo)
6757
{
6858
// There are no inbox adapters for dotnet core
6959
this.StdOutputDoesNotContains("executor://CodedWebTestAdapter/v1");
70-
this.StdOutputDoesNotContains("executor://GenericTestAdapter/v1");
71-
this.StdOutputDoesNotContains("executor://OrderedTestAdapter/v1");
7260
this.StdOutputDoesNotContains("executor://MSTestAdapter/v1");
7361
this.StdOutputDoesNotContains("executor://WebTestAdapter/v1");
7462
this.StdOutputDoesNotContains("executor://CppUnitTestExecutor/v1");

‎test/Microsoft.TestPlatform.AcceptanceTests/OrderedTests.cs

-60
This file was deleted.

‎test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs

-4
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ public void LegacySettingsWithPlatform(RunnerInfo runnerInfo)
313313

314314
[TestMethod]
315315
[TestCategory("Windows-Review")]
316-
[Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
317316
[NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
318317
public void LegacySettingsWithScripts(RunnerInfo runnerInfo)
319318
{
@@ -367,7 +366,6 @@ public void LegacySettingsWithScripts(RunnerInfo runnerInfo)
367366

368367
[TestMethod]
369368
[TestCategory("Windows-Review")]
370-
[Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
371369
[NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
372370
public void LegacySettingsWithDeploymentItem(RunnerInfo runnerInfo)
373371
{
@@ -405,7 +403,6 @@ public void LegacySettingsWithDeploymentItem(RunnerInfo runnerInfo)
405403

406404
[TestMethod]
407405
[TestCategory("Windows")]
408-
[Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
409406
[NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
410407
public void LegacySettingsTestTimeout(RunnerInfo runnerInfo)
411408
{
@@ -434,7 +431,6 @@ public void LegacySettingsTestTimeout(RunnerInfo runnerInfo)
434431

435432
[TestMethod]
436433
[TestCategory("Windows-Review")]
437-
[Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
438434
[NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
439435
public void LegacySettingsAssemblyResolution(RunnerInfo runnerInfo)
440436
{

‎test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public void CleanUp()
5656

5757
[TestMethod]
5858
[TestCategory("Windows-Review")]
59-
[Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
6059
[NetFullTargetFrameworkDataSource(useCoreRunner: false)]
6160
[NetCoreTargetFrameworkDataSource(useCoreRunner: false)]
6261
public void RunMultipleTestAssembliesWithCodeCoverage(RunnerInfo runnerInfo)

‎test/TestAssets/MstestV1UnitTestProject/MixedTestsDebug.orderedtest

-9
This file was deleted.

‎test/TestAssets/MstestV1UnitTestProject/MixedTestsRelease.orderedtest

-9
This file was deleted.

‎test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj

-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3131
</None>
3232
</ItemGroup>
33-
<ItemGroup>
34-
<None Update="MixedTests.orderedtest">
35-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
36-
</None>
37-
</ItemGroup>
3833
<ItemGroup>
3934
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
4035
</ItemGroup>

‎test/TestAssets/MstestV1UnitTestProject/UnitTest1.cs

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public class UnitTest1
1717
/// <summary>
1818
/// The passing test.
1919
/// </summary>
20-
[Priority(2)]
2120
[TestMethod]
2221
public void PassingTest1()
2322
{
@@ -34,7 +33,6 @@ public void PassingTest2()
3433
/// The failing test.
3534
/// </summary>
3635
[TestCategory("CategoryA")]
37-
[Priority(3)]
3836
[TestMethod]
3937
public void FailingTest1()
4038
{

0 commit comments

Comments
 (0)