Find ISettingsProvider in TestAdapter assembly (#1704)

microsoft · Jul 30, 2018 · aad2f43 · aad2f43
1 parent 9f8fb1e
commit aad2f43
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/src/Microsoft.TestPlatform.Client/TestPlatform.cs b/src/Microsoft.TestPlatform.Client/TestPlatform.cs
@@ -225,7 +225,7 @@ private void AddExtensionAssemblies(string runSettings)
                         continue;
                     }
 
-                    var extensionAssemblies = new List<string>(this.fileHelper.EnumerateFiles(adapterPath, SearchOption.AllDirectories, TestPlatformConstants.TestAdapterEndsWithPattern, TestPlatformConstants.TestLoggerEndsWithPattern, TestPlatformConstants.RunTimeEndsWithPattern, TestPlatformConstants.SettingsProviderEndsWithPattern));
+                    var extensionAssemblies = new List<string>(this.fileHelper.EnumerateFiles(adapterPath, SearchOption.AllDirectories, TestPlatformConstants.TestAdapterEndsWithPattern, TestPlatformConstants.TestLoggerEndsWithPattern, TestPlatformConstants.RunTimeEndsWithPattern));
                     if (extensionAssemblies.Count > 0)
                     {
                         this.UpdateExtensions(extensionAssemblies, skipExtensionFilters: false);

diff --git a/src/Microsoft.TestPlatform.Common/Constants.cs b/src/Microsoft.TestPlatform.Common/Constants.cs
@@ -63,10 +63,5 @@ public static class TestPlatformConstants
         /// Pattern used to find the run time providers library using String.EndWith
         /// </summary>
         public const string RunTimeEndsWithPattern = @"RuntimeProvider.dll";
-
-        /// <summary>
-        /// Pattern used to find the settings providers library using String.EndWith
-        /// </summary>
-        public const string SettingsProviderEndsWithPattern = @"SettingsProvider.dll";
     }
 }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginCache.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginCache.cs
@@ -97,9 +97,26 @@ public List<string> GetExtensionPaths(string endsWithPattern, bool skipDefaultEx
         {
             var extensions = this.GetFilteredExtensions(this.filterableExtensionPaths, endsWithPattern);
 
+            if (EqtTrace.IsVerboseEnabled)
+            {
+                EqtTrace.Verbose(
+                    "TestPluginCache.GetExtensionPaths: Filtered extension paths: {0}", string.Join(Environment.NewLine, extensions));
+            }
+
             if (!skipDefaultExtensions)
             {
                 extensions = extensions.Concat(this.defaultExtensionPaths);
+                if (EqtTrace.IsVerboseEnabled)
+                {
+                    EqtTrace.Verbose(
+                        "TestPluginCache.GetExtensionPaths: Added default extension paths: {0}", string.Join(Environment.NewLine, this.defaultExtensionPaths));
+                }
+            }
+
+            if (EqtTrace.IsVerboseEnabled)
+            {
+                EqtTrace.Verbose(
+                    "TestPluginCache.GetExtensionPaths: Added unfilterableExtensionPaths: {0}", string.Join(Environment.NewLine, this.unfilterableExtensionPaths));
             }
 
             return extensions.Concat(this.unfilterableExtensionPaths).ToList();
@@ -123,6 +140,7 @@ public List<string> GetExtensionPaths(string endsWithPattern, bool skipDefaultEx
         public Dictionary<string, TPluginInfo> DiscoverTestExtensions<TPluginInfo, TExtension>(string endsWithPattern)
             where TPluginInfo : TestPluginInformation
         {
+            EqtTrace.Verbose("TestPluginCache.DiscoverTestExtensions: finding test extensions in assemblies endswith: {0} TPluginInfo: {1} TExtension: {2}", endsWithPattern, typeof(TPluginInfo), typeof(TExtension));
             // Return the cached value if cache is valid.
             if (this.TestExtensions != null && this.TestExtensions.AreTestExtensionsCached<TPluginInfo>())
             {
@@ -142,11 +160,17 @@ public Dictionary<string, TPluginInfo> DiscoverTestExtensions<TPluginInfo, TExte
 
             try
             {
-                EqtTrace.Verbose("TestPluginCache: Discovering the extensions using extension path.");
+                EqtTrace.Verbose("TestPluginCache.DiscoverTestExtensions: Discovering the extensions using extension path.");
 
                 // Combine all the possible extensions - both default and additional.
                 var allExtensionPaths = this.GetExtensionPaths(endsWithPattern);
 
+                if (EqtTrace.IsVerboseEnabled)
+                {
+                    EqtTrace.Verbose(
+                        "TestPluginCache.DiscoverTestExtensions: Discovering the extensions using allExtensionPaths: {0}", string.Join(Environment.NewLine, allExtensionPaths));
+                }
+
                 // Discover the test extensions from candidate assemblies.
                 pluginInfos = this.GetTestExtensions<TPluginInfo, TExtension>(allExtensionPaths);
 

diff --git a/src/Microsoft.TestPlatform.Common/SettingsProvider/SettingsProviderExtensionManager.cs b/src/Microsoft.TestPlatform.Common/SettingsProvider/SettingsProviderExtensionManager.cs
@@ -115,7 +115,7 @@ public static SettingsProviderExtensionManager Create()
 
                         TestPluginManager.Instance
                             .GetSpecificTestExtensions<TestSettingsProviderPluginInformation, ISettingsProvider, ISettingsProviderCapabilities, TestSettingsProviderMetadata>(
-                                TestPlatformConstants.SettingsProviderEndsWithPattern,
+                                TestPlatformConstants.TestAdapterEndsWithPattern,
                                 out unfilteredTestExtensions,
                                 out testExtensions);