Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TestPlugin cache refactored. #709

Merged
merged 16 commits into from
Apr 18, 2017
Merged

TestPlugin cache refactored. #709

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
92f2883
TestPlugin cache refactored.
Apr 12, 2017
b0dc0f3
Fixed build error.
Apr 13, 2017
bc70834
PR feedback.
Apr 13, 2017
7760729
Merge branch 'master' into TestPluginCacheRefactor
harshjain2 Apr 13, 2017
11153a6
Resolved conflicts.
Apr 17, 2017
1ceb468
Merge branch 'master' into TestPluginCacheRefactor
harshjain2 Apr 17, 2017
eba4217
Fixed priority of testadapterpath arg processor, updated functionalit…
Apr 17, 2017
0a3ec5c
Merge branch 'TestPluginCacheRefactor' of https://github.com/harshjai…
Apr 17, 2017
036771c
Renamed method.
Apr 17, 2017
24dd852
Fixed default extensions on testhost side.
Apr 18, 2017
37c164e
Merge branch 'master' into TestPluginCacheRefactor
harshjain2 Apr 18, 2017
bce2c25
Revereted supporting multiple paths using single argument processor.
Apr 18, 2017
6ff8afe
Added Default Extensions Path in testadapterpaths in runsettings.
Apr 18, 2017
8b9fd52
Reverted changes for adding Default Extensions Path in testadapterpat…
Apr 18, 2017
3992fcf
Merge branch 'master' into TestPluginCacheRefactor
harshjain2 Apr 18, 2017
2c6bc1e
Merge branch 'master' into TestPluginCacheRefactor
harshjain2 Apr 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/Microsoft.TestPlatform.Client/TestPlatform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ public ITestRunRequest CreateTestRunRequest(TestRunCriteria testRunCriteria, Pro
throw new ArgumentNullException(nameof(testRunCriteria));
}

// Update cache with Extension Folder's files
this.AddExtensionAssemblies(testRunCriteria.TestRunSettings);

var runConfiguration = XmlRunSettingsUtilities.GetRunConfigurationNode(testRunCriteria.TestRunSettings);
Expand Down Expand Up @@ -201,8 +200,7 @@ private void AddExtensionAssemblies(string runSettings)
/// </param>
private void AddExtensionAssembliesFromSource(TestRunCriteria testRunCriteria)
{
// Find source directories
var sources = testRunCriteria.Sources;
IEnumerable<string> sources = testRunCriteria.Sources;
if (testRunCriteria.HasSpecificTests)
{
// If the test execution is with a test filter, group them by sources
Expand All @@ -211,6 +209,7 @@ private void AddExtensionAssembliesFromSource(TestRunCriteria testRunCriteria)

// Currently we support discovering loggers only from Source directory
var loggersToUpdate = new List<string>();

foreach (var source in sources)
{
var sourceDirectory = Path.GetDirectoryName(source);
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.TestPlatform.Common/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,5 @@ public static class TestPlatformConstants
/// Regex pattern used to find the settings provider.
/// </summary>
public const string SettingsProviderRegexPattern = @".*SettingsProvider.dll";

}
}
9 changes: 5 additions & 4 deletions src/Microsoft.TestPlatform.Common/ExtensionFramework/TestDiscoveryExtensionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
/// <summary>
/// Responsible for managing the Test Discoverer extensions which are available.
/// </summary>
internal class TestDiscoveryExtensionManager
internal class TestDiscoveryExtensionManager
{
#region Fields

private static TestDiscoveryExtensionManager testDiscoveryExtensionManager;

#endregion
Expand Down Expand Up @@ -79,7 +79,8 @@ public static TestDiscoveryExtensionManager Create()
IEnumerable<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>> testExtensions;

TestPluginManager.Instance
.GetTestExtensions<ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
.GetSpecificTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
TestPlatformConstants.TestAdapterRegexPattern,
out unfilteredTestExtensions,
out testExtensions);

Expand All @@ -106,7 +107,7 @@ public static TestDiscoveryExtensionManager GetDiscoveryExtensionManager(string
IEnumerable<LazyExtension<ITestDiscoverer, ITestDiscovererCapabilities>> testExtensions;

TestPluginManager.Instance
.GetTestExtensions<ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
.GetTestExtensions<TestDiscovererPluginInformation, ITestDiscoverer, ITestDiscovererCapabilities, TestDiscovererMetadata>(
extensionAssembly,
out unfilteredTestExtensions,
out testExtensions);
Expand Down
11 changes: 6 additions & 5 deletions src/Microsoft.TestPlatform.Common/ExtensionFramework/TestExecutorExtensionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;

/// <summary>
/// Manages the the Test Executor extensions.
/// </summary>
Expand Down Expand Up @@ -67,12 +67,13 @@ internal static TestExecutorExtensionManager Create()
IEnumerable<LazyExtension<ITestExecutor, ITestExecutorCapabilities>> testExtensions;

TestPluginManager.Instance
.GetTestExtensions<ITestExecutor, ITestExecutorCapabilities, TestExecutorMetadata>(
.GetSpecificTestExtensions<TestExecutorPluginInformation, ITestExecutor, ITestExecutorCapabilities, TestExecutorMetadata>(
TestPlatformConstants.TestAdapterRegexPattern,
out unfilteredTestExtensions,
out testExtensions);

testExecutorExtensionManager = new TestExecutorExtensionManager(
unfilteredTestExtensions, testExtensions, TestSessionMessageLogger.Instance);
unfilteredTestExtensions, testExtensions, TestSessionMessageLogger.Instance);
}
}
}
Expand All @@ -95,7 +96,7 @@ internal static TestExecutorExtensionManager GetExecutionExtensionManager(string
IEnumerable<LazyExtension<ITestExecutor, ITestExecutorCapabilities>> testExtensions;

TestPluginManager.Instance
.GetTestExtensions<ITestExecutor, ITestExecutorCapabilities, TestExecutorMetadata>(
.GetTestExtensions<TestExecutorPluginInformation, ITestExecutor, ITestExecutorCapabilities, TestExecutorMetadata>(
extensionAssembly,
out unfilteredTestExtensions,
out testExtensions);
Expand Down
Loading