committing new tests for microsoft#958

DineshChirnanchu · Sep 13, 2019 · 65418b7 · 65418b7
1 parent e89a48c
commit 65418b7
Show file tree

Hide file tree

Showing 19 changed files with 104 additions and 31 deletions.
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs
@@ -27,6 +27,8 @@ internal class TestPluginDiscoverer
     {
         private IFileHelper fileHelper;
 
+        private static List<string> UnloadableFiles = new List<string>();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TestPluginDiscoverer"/> class. 
         /// </summary>
@@ -103,7 +105,7 @@ private void AddKnownExtensions(ref IEnumerable<string> extensionPaths)
             // 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>
         /// Gets test extension information from the given colletion of files.
@@ -132,6 +134,10 @@ private void AddKnownExtensions(ref IEnumerable<string> extensionPaths)
             // Scan each of the files for data extensions.
             foreach (var file in files)
             {
+                if(UnloadableFiles.Contains(file))
+                {
+                    continue;
+                }
                 try
                 {
                     Assembly assembly = null;
@@ -142,17 +148,16 @@ private void AddKnownExtensions(ref IEnumerable<string> extensionPaths)
                         this.GetTestExtensionsFromAssembly<TPluginInfo, TExtension>(assembly, pluginInfos);
                     }
                 }
-                catch (FileLoadException e)
-                {
-                    EqtTrace.Warning("TestPluginDiscoverer: Failed to load extensions from file '{0}'.  Skipping test extension scan for this file.  Error: {1}", file, e);
-                    string entensionTypeInfo = TestPlatformConstants.entensionTypeInfo.Where(x => x.Equals(pluginInfos.GetType().GetGenericArguments()[1].GetTypeInfo().Name)).Select(x=>x).FirstOrDefault().ToString();                
-                    string fileLoadErrorMessage = string.Format(CultureInfo.CurrentUICulture, CommonResources.FailedToLoadAdapaterFile, entensionTypeInfo, file);
-                    TestSessionMessageLogger.Instance.SendMessage(TestMessageLevel.Warning, fileLoadErrorMessage);
-                }
                 catch (Exception e)
                 {
                     EqtTrace.Warning("TestPluginDiscoverer: Failed to load extensions from file '{0}'.  Skipping test extension scan for this file.  Error: {1}", file, e);
-                    continue;
+
+                    if (e is FileLoadException)
+                    {             
+                        string fileLoadErrorMessage = string.Format(CultureInfo.CurrentUICulture, CommonResources.FailedToLoadAdapaterFile, file);
+                        TestSessionMessageLogger.Instance.SendMessage(TestMessageLevel.Warning, fileLoadErrorMessage);
+                        UnloadableFiles.Add(file);
+                    }
                 }
             }
         }
@@ -172,8 +177,8 @@ private void AddKnownExtensions(ref IEnumerable<string> extensionPaths)
         {
             Debug.Assert(assembly != null, "null assembly");
             Debug.Assert(pluginInfos != null, "null pluginInfos");
-
             Type[] types;
+
             try
             {
                 types = assembly.GetTypes();
@@ -189,7 +194,6 @@ private void AddKnownExtensions(ref IEnumerable<string> extensionPaths)
                         EqtTrace.Warning("LoaderExceptions: {0}", ex);
                     }
                 }
-
                 return;
             }
 

diff --git a/src/Microsoft.TestPlatform.Common/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Common/Resources/Resources.Designer.cs
diff --git a/src/Microsoft.TestPlatform.Common/Resources/Resources.resx b/src/Microsoft.TestPlatform.Common/Resources/Resources.resx
@@ -154,7 +154,7 @@
     <value>Failed to find the list of installed unit test extensions. Reason: {0}</value>
   </data>
   <data name="FailedToLoadAdapaterFile" xml:space="preserve">
-    <value>The extension of type '{0}' is failed to load extensions from file '{1}'.</value>
+    <value>Failed to load extensions from file '{0}'. Please use /diag for more information.</value>
   </data>
   <data name="FastFilterException" xml:space="preserve">
     <value>An error occured while creating Fast filter.</value>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.cs.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.de.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.es.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.fr.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.it.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ja.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ko.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.pl.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.pt-BR.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.ru.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.tr.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.xlf
@@ -147,7 +147,7 @@
         <note></note>
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.zh-Hans.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.Common/Resources/xlf/Resources.zh-Hant.xlf
@@ -270,7 +270,7 @@
         <note />
       </trans-unit>
       <trans-unit id="FailedToLoadAdapaterFile">
-        <source>The extension of type '{0}' is failed to load extensions from file '{1}'.</source>
+        <source>Failed to load extensions from file '{0}'. Please use /diag for more information.</source>
         <target state="new">TestPluginDiscoverer: Failed to load extensions from file '{0}'. Please use /diag for more information.</target>
         <note></note>
       </trans-unit>

diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryManagerTests.cs
@@ -10,10 +10,12 @@ namespace TestPlatform.CrossPlatEngine.UnitTests.Discovery
     using System.Reflection;
 
     using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
+    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
     using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
     using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Discovery;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
     using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -29,12 +31,14 @@ public class DiscoveryManagerTests
         private DiscoveryManager discoveryManager;
         private Mock<IRequestData> mockRequestData;
         private Mock<IMetricsCollection> mockMetricsCollection;
+        private TestSessionMessageLogger sessionLogger;
 
         [TestInitialize]
         public void TestInit()
         {
             this.mockRequestData = new Mock<IRequestData>();
             this.mockMetricsCollection = new Mock<IMetricsCollection>();
+            this.sessionLogger = TestSessionMessageLogger.Instance;
             this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(this.mockMetricsCollection.Object);
             this.discoveryManager = new DiscoveryManager(this.mockRequestData.Object);
         }
@@ -148,7 +152,7 @@ public void DiscoverTestsShouldDiscoverTestsInTheSpecifiedSource()
             var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
 
             this.discoveryManager.DiscoverTests(criteria, mockLogger.Object);
-            
+
             // Assert that the tests are passed on via the handletestruncomplete event.
             mockLogger.Verify(l => l.HandleDiscoveryComplete(It.IsAny<DiscoveryCompleteEventArgs>(), It.IsAny<IEnumerable<TestCase>>()), Times.Once);
         }
@@ -222,6 +226,25 @@ public void DiscoverTestsShouldCollectMetrics()
             mockMetricsCollector.Verify(rd => rd.Add(TelemetryDataConstants.TotalTestsDiscovered, It.IsAny<object>()), Times.Once);
         }
 
+        [TestMethod]
+        public void DiscoveryInitializeShouldVerifyWarningMessageIfAdapterFailedToLoad()
+        {
+            var assemblyLocation = typeof(DiscoveryManagerTests).GetTypeInfo().Assembly.Location;
+            var mockLogger = new Mock<ITestDiscoveryEventsHandler2>();
+            TestPluginCacheTests.SetupMockExtensions(
+                new string[] { assemblyLocation },
+                () => { });
+
+            //Act
+            this.discoveryManager.Initialize(new List<string> { assemblyLocation }, mockLogger.Object);
+
+            //when handler instance returns warning              
+            sessionLogger.SendMessage(TestMessageLevel.Warning, "verify that it is downgraded to warning");
+
+            // Verify.
+            mockLogger.Verify(rd => rd.HandleLogMessage(TestMessageLevel.Warning, "verify that it is downgraded to warning"), Times.Once);
+        }
+
         #endregion
     }
 }
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/ExecutionManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/ExecutionManagerTests.cs
@@ -11,6 +11,7 @@ namespace TestPlatform.CrossPlatEngine.UnitTests.Execution
     using Microsoft.VisualStudio.TestPlatform.Common;
     using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework;
     using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
+    using Microsoft.VisualStudio.TestPlatform.Common.Logging;
     using Microsoft.VisualStudio.TestPlatform.Common.SettingsProvider;
     using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
     using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Execution;
@@ -33,16 +34,18 @@ public class ExecutionManagerTests
         private ExecutionManager executionManager;
         private TestExecutionContext testExecutionContext;
         private Mock<IRequestData> mockRequestData;
+        private TestSessionMessageLogger sessionLogger;
 
         [TestInitialize]
         public void TestInit()
         {
             this.mockRequestData = new Mock<IRequestData>();
             this.mockRequestData.Setup(rd => rd.MetricsCollection).Returns(new NoOpMetricsCollection());
+            this.sessionLogger = TestSessionMessageLogger.Instance;
             this.executionManager = new ExecutionManager(new RequestData
-                                                             {
-                                                                 MetricsCollection = new NoOpMetricsCollection()
-                                                             });
+            {
+                MetricsCollection = new NoOpMetricsCollection()
+            });
 
             TestPluginCache.Instance = null;
 
@@ -210,5 +213,48 @@ public void StartTestRunShouldAbortTheRunIfAnyExceptionComesForTheProvidedSource
             mockTestRunEventsHandler.Verify(treh => treh.HandleTestRunComplete(It.IsAny<TestRunCompleteEventArgs>(), null, null, null), Times.Once);
             mockTestRunEventsHandler.Verify(treh => treh.HandleLogMessage(TestMessageLevel.Error, It.IsAny<string>()), Times.Once);
         }
+
+        [TestMethod]
+        public void InitializeShouldVerifyWarningMessageIfAdapterFailedToLoad()
+        {
+            var assemblyLocation = typeof(ExecutionManagerTests).GetTypeInfo().Assembly.Location;
+            var mockLogger = new Mock<ITestMessageEventHandler>();
+            TestPluginCacheTests.SetupMockExtensions(
+                new string[] { assemblyLocation },
+                () => { });
+
+            //Act
+            this.executionManager.Initialize(new List<string> { assemblyLocation }, mockLogger.Object);           
+
+            //when handler instance returns warning       
+            sessionLogger.SendMessage(TestMessageLevel.Warning, "verify that it is downgraded to warning");
+
+            // Verify.
+            mockLogger.Verify(rd => rd.HandleLogMessage(TestMessageLevel.Warning, "verify that it is downgraded to warning"), Times.Once);
+        }
+
+        [TestMethod]
+        public void InitializeShouldVerifyThatItIsNotNullIfAdapterFailedToLoad()
+        {
+            var mockLogger = new Mock<ITestMessageEventHandler>();
+
+            //when handler instance is not null
+            sessionLogger.SendMessage(TestMessageLevel.Informational, "verify that it is not null");
+
+            // Verify.
+            mockLogger.Verify(rd => rd.HandleLogMessage(TestMessageLevel.Informational, "verify that it is not null"), Times.Never);
+        }
+
+        [TestMethod]
+        public void InitializeShouldVerifyThatItIsNullIfAdapterFailedToLoad()
+        {
+            var mockLogger = new Mock<ITestMessageEventHandler>();
+
+            //when handler instance is null
+            sessionLogger.SendMessage(It.IsAny<TestMessageLevel>(), "verify null");
+
+            // Verify.
+            mockLogger.Verify(rd => rd.HandleLogMessage(It.IsAny<TestMessageLevel>(), "verify null"), Times.Never);
+        }
     }
 }