Skip to content

Fix CodeBase for existing inproc collector settings #2331

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

Merged
Haplois merged 11 commits into from
May 31, 2021
Merged

Fix CodeBase for existing inproc collector settings #2331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
89ec962
fix CodeBase existing inproc collector settings
MarcoRossignoli Feb 15, 2020
9851711
Merge branch 'main' into inprocload
Haplois May 31, 2021
741b004
Update CollectArgumentProcessorTests.cs
Haplois May 31, 2021
2b5831f
Update CollectArgumentProcessorTests.cs
Haplois May 31, 2021
498bc09
Update CollectArgumentProcessorTests.cs
Haplois May 31, 2021
ca1af2d
Update CollectArgumentProcessorTests.cs
Haplois May 31, 2021
6c9837d
Update CollectArgumentProcessorTests.cs
Haplois May 31, 2021
4a46233
Update CollectArgumentProcessorTests.cs
Haplois May 31, 2021
4ee8b2e
Update CollectArgumentProcessorTests.cs
Haplois May 31, 2021
516ac78
Merge remote-tracking branch 'upstream/main' into inprocload
Haplois May 31, 2021
aba15bf
Fixed tests
Haplois May 31, 2021
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
2 changes: 1 addition & 1 deletion src/vstest.console/Processors/CollectArgumentProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ internal static void EnableCoverletInProcDataCollector(string argument, DataColl
{
// Set Assembly qualified name and code base if not already set
dataCollectorSettings.AssemblyQualifiedName = dataCollectorSettings.AssemblyQualifiedName ?? CoverletConstants.CoverletDataCollectorAssemblyQualifiedName;
dataCollectorSettings.CodeBase = dataCollectorSettings.CodeBase ?? CoverletConstants.CoverletDataCollectorCodebase;
dataCollectorSettings.CodeBase = (dataCollectorSettings.CodeBase ?? GetCoverletCodeBasePath(runSettingProvider, fileHelper)) ?? CoverletConstants.CoverletDataCollectorCodebase;
dataCollectorSettings.IsEnabled = true;
}
}
Expand Down
43 changes: 33 additions & 10 deletions test/vstest.console.UnitTests/Processors/CollectArgumentProcessorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,12 +508,12 @@ public void InitializeXPlatCodeCoverageShouldAddXPlatOutProcProcDataCollectorSet
" <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
" <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
" <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
$" <DataCollector friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" />",
$" <DataCollector friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" />",
" </DataCollectors>",
" </DataCollectionRunSettings>",
" <InProcDataCollectionRunSettings>",
" <InProcDataCollectors>",
$" <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"inprocdatacollector.dll\" />",
$" <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"inprocdatacollector.dll\" />",
" </InProcDataCollectors>",
" </InProcDataCollectionRunSettings>",
"</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
Expand All @@ -522,47 +522,70 @@ public void InitializeXPlatCodeCoverageShouldAddXPlatOutProcProcDataCollectorSet
[TestMethod]
public void InitializeXPlatCodeCoverageShouldAddXPlatInProcProcDataCollectoPropertiesIfNotPresent()
{
var runsettingsString = string.Join(Environment.NewLine,
"<?xml version =\"1.0\" encoding=\"utf-16\"?>",
var runsettingsString = $"<?xml version =\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n <DataCollectionRunSettings>\r\n <DataCollectors>\r\n <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />\r\n <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />\r\n <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />\r\n </DataCollectors>\r\n </DataCollectionRunSettings>\r\n <InProcDataCollectionRunSettings>\r\n <InProcDataCollectors>\r\n <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"False\" />\r\n </InProcDataCollectors>\r\n </InProcDataCollectionRunSettings>\r\n</RunSettings>";
runsettingsString = string.Format(runsettingsString, string.Empty);
var runsettings = new RunSettings();
runsettings.LoadSettingsXml(runsettingsString);
this.settingsProvider.SetActiveRunSettings(runsettings);
Mock<IFileHelper> fileHelper = new Mock<IFileHelper>();
fileHelper.Setup(f => f.Exists(It.IsAny<string>())).Returns(true);
CollectArgumentExecutor executor = new CollectArgumentExecutor(settingsProvider, fileHelper.Object);
executor.Initialize("XPlat Code Coverage");

Assert.AreEqual(string.Join(Environment.NewLine,
"<?xml version=\"1.0\" encoding=\"utf-16\"?>",
"<RunSettings>",
" <DataCollectionRunSettings>",
" <DataCollectors>",
" <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
" <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
" <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
$" <DataCollector friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" />",
" </DataCollectors>",
" </DataCollectionRunSettings>",
" <InProcDataCollectionRunSettings>",
" <InProcDataCollectors>",
$" <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"False\" />",
$" <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"{CoverletConstants.CoverletDataCollectorCodebase}\" />",
" </InProcDataCollectors>",
" </InProcDataCollectionRunSettings>",
"</RunSettings>");
"</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
}

[TestMethod]
public void InitializeXPlatCodeCoverageShouldAddXPlatInProcProcDataCollectoPropertiesIfNotPresent_NoTestAdaptersPaths()
{
var runsettingsString = $"<?xml version =\"1.0\" encoding=\"utf-16\"?>\r\n<RunSettings>\r\n <RunConfiguration>\r\n </RunConfiguration>\r\n <DataCollectionRunSettings>\r\n <DataCollectors>\r\n <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />\r\n <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />\r\n <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />\r\n </DataCollectors>\r\n </DataCollectionRunSettings>\r\n <InProcDataCollectionRunSettings>\r\n <InProcDataCollectors>\r\n <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"False\" />\r\n </InProcDataCollectors>\r\n </InProcDataCollectionRunSettings>\r\n</RunSettings>";
runsettingsString = string.Format(runsettingsString, string.Empty);
var runsettings = new RunSettings();
runsettings.LoadSettingsXml(runsettingsString);
this.settingsProvider.SetActiveRunSettings(runsettings);
this.executor.Initialize("XPlat Code Coverage");
Mock<IFileHelper> fileHelper = new Mock<IFileHelper>();
// Suppose file exists to be sure that we won't find adapter path on runsettings config
fileHelper.Setup(f => f.Exists(It.IsAny<string>())).Returns(true);
CollectArgumentExecutor executor = new CollectArgumentExecutor(settingsProvider, fileHelper.Object);
executor.Initialize("XPlat Code Coverage");

Assert.AreEqual(string.Join(Environment.NewLine,
"<?xml version=\"1.0\" encoding=\"utf-16\"?>",
"<RunSettings>",
" <RunConfiguration>",
" </RunConfiguration>",
" <DataCollectionRunSettings>",
" <DataCollectors>",
" <DataCollector friendlyName=\"MyDataCollector\" enabled=\"True\" />",
" <DataCollector friendlyName=\"MyDataCollector1\" enabled=\"True\" />",
" <DataCollector friendlyName=\"MyDataCollector2\" enabled=\"True\" />",
$" <DataCollector friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" />",
$" <DataCollector friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" />",
" </DataCollectors>",
" </DataCollectionRunSettings>",
" <InProcDataCollectionRunSettings>",
" <InProcDataCollectors>",
$" <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"{CoverletConstants.CoverletDataCollectorCodebase}\" />",
$" <InProcDataCollector assemblyQualifiedName=\"{CoverletConstants.CoverletDataCollectorAssemblyQualifiedName}\" friendlyName=\"{CoverletConstants.CoverletDataCollectorFriendlyName}\" enabled=\"True\" codebase=\"{CoverletConstants.CoverletDataCollectorCodebase}\" />",
" </InProcDataCollectors>",
" </InProcDataCollectionRunSettings>",
"</RunSettings>"), this.settingsProvider.ActiveRunSettings.SettingsXml);
}

#endregion
}
}
}