Cleanup MSTestAdapter.PlatformServices.UnitTests (#6866)

Youssef1313 · web-flow · commit b2b75ecb52bc · 2025-11-03T16:30:01.000+01:00
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Deployment/DeploymentItemTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Deployment/DeploymentItemTests.cs
@@ -8,7 +8,7 @@
 
 using TestFramework.ForTestingMSTest;
 
-namespace MSTestAdapter.PlatformServices.Tests.Deployment;
+namespace MSTestAdapter.PlatformServices.UnitTests.Deployment;
 
 public class DeploymentItemTests : TestContainer
 {
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Deployment/TestRunDirectoriesTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Deployment/TestRunDirectoriesTests.cs
@@ -7,7 +7,7 @@
 
 using TestFramework.ForTestingMSTest;
 
-namespace MSTestAdapter.PlatformServices.Tests.Deployment;
+namespace MSTestAdapter.PlatformServices.UnitTests.Deployment;
 
 public class TestRunDirectoriesTests : TestContainer
 {
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Extensions/ExceptionExtensionsTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Extensions/ExceptionExtensionsTests.cs
@@ -11,7 +11,7 @@
 
 using UTF = Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace MSTestAdapter.PlatformServices.Tests.Extensions;
+namespace MSTestAdapter.PlatformServices.UnitTests.Extensions;
 
 public class ExceptionExtensionsTests : TestContainer
 {
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Properties/AssemblyInfo.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Properties/AssemblyInfo.cs
@@ -10,8 +10,8 @@
 #endif
 
 #if NETCOREAPP
-using MSTestAdapter.PlatformServices.Tests.Services;
-using MSTestAdapter.PlatformServices.Tests.Utilities;
+using MSTestAdapter.PlatformServices.UnitTests.Services;
+using MSTestAdapter.PlatformServices.UnitTests.Utilities;
 
 [assembly: ReflectionUtilityTests.DummyA("a1")]
 [assembly: ReflectionUtilityTests.DummyA("a2")]
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/AssemblyAttributes.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/AssemblyAttributes.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using MSTestAdapter.PlatformServices.Tests.Services;
+using MSTestAdapter.PlatformServices.UnitTests.Services;
 
 [assembly: ReflectionOperationsTests.DummyA("a1")]
 [assembly: ReflectionOperationsTests.DummyA("a2")]
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/DesktopTestDeploymentTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/DesktopTestDeploymentTests.cs
@@ -12,7 +12,7 @@
 
 using Moq;
 
-using MSTestAdapter.PlatformServices.Tests.Utilities;
+using MSTestAdapter.PlatformServices.UnitTests.Utilities;
 
 using TestFramework.ForTestingMSTest;
 
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/FileOperationsTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/FileOperationsTests.cs
@@ -8,7 +8,7 @@
 
 using TestFramework.ForTestingMSTest;
 
-namespace MSTestAdapter.PlatformServices.Tests.Services;
+namespace MSTestAdapter.PlatformServices.UnitTests.Services;
 
 public class FileOperationsTests : TestContainer
 {
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/ReflectionOperationsTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/ReflectionOperationsTests.cs
@@ -7,7 +7,7 @@
 
 using TestFramework.ForTestingMSTest;
 
-namespace MSTestAdapter.PlatformServices.Tests.Services;
+namespace MSTestAdapter.PlatformServices.UnitTests.Services;
 
 public class ReflectionOperationsTests : TestContainer
 {
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/TestDeploymentTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/TestDeploymentTests.cs
@@ -13,12 +13,11 @@
 
 using Moq;
 
-using MSTestAdapter.PlatformServices.Tests.Utilities;
 using MSTestAdapter.PlatformServices.UnitTests.Utilities;
 
 using TestFramework.ForTestingMSTest;
 
-namespace MSTestAdapter.PlatformServices.Tests.Services;
+namespace MSTestAdapter.PlatformServices.UnitTests.Services;
 
 public class TestDeploymentTests : TestContainer
 {
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/TestSourceHostTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/TestSourceHostTests.cs
@@ -8,7 +8,7 @@
 
 using TestFramework.ForTestingMSTest;
 
-namespace MSTestAdapter.PlatformServices.Tests.Services;
+namespace MSTestAdapter.PlatformServices.UnitTests.Services;
 #pragma warning disable SA1649 // SA1649FileNameMustMatchTypeName
 
 public class TestSourceHostTests : TestContainer
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/ThreadOperationsTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/ThreadOperationsTests.cs
@@ -7,8 +7,7 @@
 
 using TestFramework.ForTestingMSTest;
 
-namespace MSTestAdapter.PlatformServices.Tests.Services;
-#pragma warning disable SA1649 // SA1649FileNameMustMatchTypeName
+namespace MSTestAdapter.PlatformServices.UnitTests.Services;
 
 public class ThreadOperationsTests : TestContainer
 {
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/TestSourceTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/TestSourceTests.cs
@@ -7,7 +7,7 @@
 
 using TestFramework.ForTestingMSTest;
 
-namespace MSTestAdapter.PlatformServices.Tests.Services;
+namespace MSTestAdapter.PlatformServices.UnitTests.Services;
 
 public class TestSourceTests : TestContainer
 {
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/DeploymentItemUtilityTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/DeploymentItemUtilityTests.cs
@@ -13,11 +13,9 @@
 
 using TestFramework.ForTestingMSTest;
 
-namespace MSTestAdapter.PlatformServices.Tests.Utilities;
+namespace MSTestAdapter.PlatformServices.UnitTests.Utilities;
 
-#pragma warning disable SA1649 // File name must match first type name
 public class DeploymentItemUtilityTests : TestContainer
-#pragma warning restore SA1649 // File name must match first type name
 {
     internal static readonly TestProperty DeploymentItemsProperty = TestProperty.Register(
         "MSTestDiscoverer.DeploymentItems",
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/DeploymentUtilityTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/DeploymentUtilityTests.cs
@@ -13,8 +13,6 @@
 
 using Moq;
 
-using MSTestAdapter.PlatformServices.Tests.Utilities;
-
 using TestFramework.ForTestingMSTest;
 
 namespace MSTestAdapter.PlatformServices.UnitTests.Utilities;
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/DesktopReflectionUtilityTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/DesktopReflectionUtilityTests.cs
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/FileUtilityTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/FileUtilityTests.cs
@@ -9,7 +9,7 @@
 
 using TestFramework.ForTestingMSTest;
 
-namespace MSTestAdapter.PlatformServices.Tests.Utilities;
+namespace MSTestAdapter.PlatformServices.UnitTests.Utilities;
 
 public class FileUtilityTests : TestContainer
 {
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/ReflectionUtilityTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/ReflectionUtilityTests.cs
@@ -7,12 +7,25 @@
 
 using TestFramework.ForTestingMSTest;
 
-namespace MSTestAdapter.PlatformServices.Tests.Utilities;
+namespace MSTestAdapter.PlatformServices.UnitTests.Utilities;
 
-#pragma warning disable SA1649 // File name must match first type name
 public class ReflectionUtilityTests : TestContainer
-#pragma warning restore SA1649 // File name must match first type name
 {
+#if NETFRAMEWORK
+    public void GetSpecificCustomAttributesOnAssemblyShouldReturnAllAttributes()
+    {
+        Assembly asm = typeof(DummyTestClass).Assembly;
+
+        List<Attribute> attributes = ReflectionUtility.GetCustomAttributes(asm, typeof(DummyAAttribute));
+
+        attributes.Should().NotBeNull();
+        attributes.Count.Should().Be(2);
+
+        string[] expectedAttributes = ["DummyA : a1", "DummyA : a2"];
+        expectedAttributes.SequenceEqual(GetAttributeValuePairs(attributes)).Should().BeTrue();
+    }
+#endif
+
     public void GetCustomAttributesShouldReturnAllAttributes()
     {
         MethodInfo methodInfo = typeof(DummyBaseTestClass).GetMethod("DummyVTestMethod1")!;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`using TestFramework.ForTestingMSTest;`
`10`	`10`
`11`		`-namespace MSTestAdapter.PlatformServices.Tests.Deployment;`
	`11`	`+namespace MSTestAdapter.PlatformServices.UnitTests.Deployment;`
`12`	`12`
`13`	`13`	`public class DeploymentItemTests : TestContainer`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`using TestFramework.ForTestingMSTest;`
`9`	`9`
`10`		`-namespace MSTestAdapter.PlatformServices.Tests.Deployment;`
	`10`	`+namespace MSTestAdapter.PlatformServices.UnitTests.Deployment;`
`11`	`11`
`12`	`12`	`public class TestRunDirectoriesTests : TestContainer`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`using UTF = Microsoft.VisualStudio.TestTools.UnitTesting;`
`13`	`13`
`14`		`-namespace MSTestAdapter.PlatformServices.Tests.Extensions;`
	`14`	`+namespace MSTestAdapter.PlatformServices.UnitTests.Extensions;`
`15`	`15`
`16`	`16`	`public class ExceptionExtensionsTests : TestContainer`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,11 @@`
`13`	`13`
`14`	`14`	`using Moq;`
`15`	`15`
`16`		`-using MSTestAdapter.PlatformServices.Tests.Utilities;`
`17`	`16`	`using MSTestAdapter.PlatformServices.UnitTests.Utilities;`
`18`	`17`
`19`	`18`	`using TestFramework.ForTestingMSTest;`
`20`	`19`
`21`		`-namespace MSTestAdapter.PlatformServices.Tests.Services;`
	`20`	`+namespace MSTestAdapter.PlatformServices.UnitTests.Services;`
`22`	`21`
`23`	`22`	`public class TestDeploymentTests : TestContainer`
`24`	`23`	`{`