Loading extensions should not fail on any faulty extension (#854)

* Loading extensions should not fail on any faulty extension * nit fix * Create failure in Unittests in different way
microsoft · Jun 20, 2017 · 8451cd4 · 8451cd4
1 parent cdcdf90
commit 8451cd4
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 12 deletions.
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs
@@ -31,7 +31,7 @@ internal class TestPluginDiscoverer
             "MICROSOFT.VISUALSTUDIO.TESTPLATFORM.OBJECTMODEL.DLL",
             "VSTEST_EXECUTIONENGINE_PLATFORMBRIDGE.DLL",
             "VSTEST_EXECUTIONENGINE_PLATFORMBRIDGE.WINMD",
-            "VSTEST.EXECUTIONENGINE.WINDOWSPHONE.DLL", 
+            "VSTEST.EXECUTIONENGINE.WINDOWSPHONE.DLL",
             "MICROSOFT.CSHARP.DLL",
             "MICROSOFT.VISUALBASIC.DLL",
             "CLRCOMPRESSION.DLL",
@@ -51,7 +51,7 @@ internal class TestPluginDiscoverer
         /// The path to the extensions.
         /// </param>
         /// <param name="loadOnlyWellKnownExtensions">
-        /// Should load only well known extensions or all. 
+        /// Should load only well known extensions or all.
         /// </param>
         /// <returns>
         /// The <see cref="Dictionary"/>` of assembly qualified name and testplugin information.
@@ -73,8 +73,8 @@ public Dictionary<string, TPluginInfo> GetTestExtensionsInformation<TPluginInfo,
             fileSearchTask.Wait();
 
             var binaries = fileSearchTask.Result.Where(storageFile =>
-                                
-                                (storageFile.Name.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) 
+
+                                (storageFile.Name.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)
                                 || storageFile.Name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase))
                                 && !storageFile.Name.StartsWith(SYSTEM_ASSEMBLY_PREFIX, StringComparison.OrdinalIgnoreCase)
                                 && !platformAssemblies.Contains(storageFile.Name.ToUpperInvariant())
@@ -142,13 +142,17 @@ private void GetTestExtensionsFromFiles<TPluginInfo, TExtension>(
             // Scan each of the files for data extensions.
             foreach (var file in files)
             {
-                Assembly assembly = null;
                 try
                 {
+                    Assembly assembly = null;
                     var assemblyName = Path.GetFileNameWithoutExtension(file);
                     assembly = Assembly.Load(new AssemblyName(assemblyName));
+                    if (assembly != null)
+                    {
+                        this.GetTestExtensionsFromAssembly<TPluginInfo, TExtension>(assembly, pluginInfos);
+                    }
 
-                    // Check whether this assembly is known or not. 
+                    // Check whether this assembly is known or not.
                     //if (loadOnlyWellKnownExtensions && assembly != null)
                     //{
                     //    var extensionAssemblyName = new AssemblyName(assembly.FullName);
@@ -161,14 +165,9 @@ private void GetTestExtensionsFromFiles<TPluginInfo, TExtension>(
                 }
                 catch (Exception e)
                 {
-                    EqtTrace.Warning("TestPluginDiscoverer: Failed to load file '{0}'.  Skipping test extension scan for this file.  Error: {1}", file, e.ToString());
+                    EqtTrace.Warning("TestPluginDiscoverer: Failed to load extensions from file '{0}'.  Skipping test extension scan for this file.  Error: {1}", file, e);
                     continue;
                 }
-
-                if (assembly != null)
-                {
-                    this.GetTestExtensionsFromAssembly<TPluginInfo, TExtension>(assembly, pluginInfos);
-                }
             }
         }
 

diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginDiscovererTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/TestPluginDiscovererTests.cs
@@ -17,6 +17,8 @@ namespace TestPlatform.Common.UnitTests.ExtensionFramework
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
+    using MSTest.TestFramework.AssertExtensions;
+
     [TestClass]
     public class TestPluginDiscovererTests
     {
@@ -110,6 +112,19 @@ public void GetTestExtensionsInformationShouldReturnSettingsProviderExtensions()
             Assert.IsTrue(testExtensions.ContainsKey(pluginInformation2.IdentifierData));
         }
 
+        [TestMethod]
+        public void GetTestExtensionsInformationShouldNotAbortOnFaultyExtensions()
+        {
+            var pathToExtensions = new List<string>
+            {
+                typeof(TestPluginDiscovererTests).GetTypeInfo().Assembly.Location,
+            };
+
+            var testExtensions = this.testPluginDiscoverer.GetTestExtensionsInformation<FaultyTestExecutorPluginInformation, ITestExecutor>(pathToExtensions, loadOnlyWellKnownExtensions: true);
+
+            Assert.That.DoesNotThrow(() =>this.testPluginDiscoverer.GetTestExtensionsInformation<FaultyTestExecutorPluginInformation, ITestExecutor>(pathToExtensions, loadOnlyWellKnownExtensions: true));
+        }
+
         #region implementations
 
         #region Discoverers
@@ -263,6 +278,17 @@ public void Load(XmlReader reader)
 
         #endregion
 
+        internal class FaultyTestExecutorPluginInformation : TestExtensionPluginInformation
+        {
+            /// <summary>
+            /// Default constructor
+            /// </summary>
+            /// <param name="type"> The Type. </param>
+            public FaultyTestExecutorPluginInformation(Type type): base(type)
+            {
+                throw new Exception();
+            }
+        }
         #endregion
     }
 }