Load C++, & Old Mstest adapter for UWP (microsoft#1275)

navin22 · Nov 21, 2017 · 052e310 · 052e310
1 parent 9f8ae85
commit 052e310
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 41 deletions.
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs
@@ -95,17 +95,10 @@ public Dictionary<string, TPluginInfo> GetTestExtensionsInformation<TPluginInfo,
 
         private void AddKnownExtensions(ref IEnumerable<string> extensionPaths)
         {
-            // For C++ UWP adatper
-            if(this.fileHelper.Exists("Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll"))
-            {
-                extensionPaths = extensionPaths.Concat(new[] { "Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll" });
-            }
-
-            // For OLD C# UWP(MSTest V1) adatper
-            if (this.fileHelper.Exists("Microsoft.VisualStudio.TestPlatform.Extensions.MSAppContainerAdapter.dll"))
-            {
-                extensionPaths = extensionPaths.Concat(new[]{ "Microsoft.VisualStudio.TestPlatform.Extensions.MSAppContainerAdapter.dll" });
-            }
+            // For C++ UWP adatper, & OLD C# UWP(MSTest V1) adatper
+            // In UWP .Net Native Compilation mode managed dll's are packaged differently, & File.Exists() fails.
+            // Include these two dll's if so far no adapters(extensions) were found, & let Assembly.Load() fail if they are not present.
+            extensionPaths = extensionPaths.Concat(new[] { "Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.MSAppContainerAdapter.dll" });
         }
 
         /// <summary>

diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginDiscovererTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginDiscovererTests.cs
@@ -144,36 +144,6 @@ public void GetTestExtensionsInformationShouldNotAbortOnFaultyExtensions()
             Assert.That.DoesNotThrow(() =>this.testPluginDiscoverer.GetTestExtensionsInformation<FaultyTestExecutorPluginInformation, ITestExecutor>(pathToExtensions));
         }
 
-        [TestMethod]
-        public void GetTestExtensionsInformationShouldAddUWPCppAdatersIfTheyExists()
-        {
-            var pathToExtensions = new List<string>();
-
-            Mock<IFileHelper> mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists("Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll")).Returns(true);
-
-            this.testPluginDiscoverer = new TestPluginDiscoverer(mockFileHelper.Object);
-
-            var testExtensions = this.testPluginDiscoverer.GetTestExtensionsInformation<FaultyTestExecutorPluginInformation, ITestExecutor>(pathToExtensions);
-
-            mockFileHelper.Verify(fh => fh.Exists("Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll"), Times.Once);
-        }
-
-        [TestMethod]
-        public void GetTestExtensionsInformationShouldAddMSTestV1UWPAdaptersIfTheyExists()
-        {
-            var pathToExtensions = new List<string>();
-
-            Mock<IFileHelper> mockFileHelper = new Mock<IFileHelper>();
-            mockFileHelper.Setup(fh => fh.Exists("Microsoft.VisualStudio.TestPlatform.Extensions.MSAppContainerAdapter.dll")).Returns(true);
-
-            this.testPluginDiscoverer = new TestPluginDiscoverer(mockFileHelper.Object);
-
-            var testExtensions = this.testPluginDiscoverer.GetTestExtensionsInformation<FaultyTestExecutorPluginInformation, ITestExecutor>(pathToExtensions);
-
-            mockFileHelper.Verify(fh => fh.Exists("Microsoft.VisualStudio.TestPlatform.Extensions.MSAppContainerAdapter.dll"), Times.Once);
-        }
-
         #region implementations
 
         #region Discoverers