Skip to content

Commit 5affd21

Browse files
tonyhalletttonyhallett
committed
correct results directory replacement path
1 parent f850edd commit 5affd21

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IsCollecting_Tests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public async Task Should_Set_UserRunSettingsProjectDetailsLookup_For_IRunSetting
228228
Assert.AreSame(projectSettings, userRunSettingsProjectDetails.Settings);
229229
Assert.AreSame(excludedReferencedProjects, userRunSettingsProjectDetails.ExcludedReferencedProjects);
230230
Assert.AreSame(includedReferencedProjects, userRunSettingsProjectDetails.IncludedReferencedProjects);
231-
Assert.AreEqual("OutputFolder", userRunSettingsProjectDetails.OutputFolder);
231+
Assert.AreEqual("OutputFolder", userRunSettingsProjectDetails.CoverageOutputFolder);
232232
Assert.AreEqual("Test.dll", userRunSettingsProjectDetails.TestDllFile);
233233
}
234234

@@ -515,7 +515,7 @@ private void InitializeZipDestination()
515515
private ICoverageProject CreateCoverageProject(
516516
string runSettingsFile,
517517
IAppOptions settings = null,
518-
string outputFolder = "",
518+
string coverageOutputFolder = "",
519519
string testDllFile = "",
520520
List<string> excludedReferencedProjects = null,
521521
List<string> includedReferencedProjects = null,
@@ -524,7 +524,7 @@ private ICoverageProject CreateCoverageProject(
524524
{
525525
var mockCoverageProject = new Mock<ICoverageProject>();
526526
mockCoverageProject.Setup(cp => cp.RunSettingsFile).Returns(runSettingsFile);
527-
mockCoverageProject.Setup(cp => cp.ProjectOutputFolder).Returns(outputFolder);
527+
mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns(coverageOutputFolder);
528528
mockCoverageProject.Setup(cp => cp.TestDllFile).Returns(testDllFile);
529529
mockCoverageProject.Setup(cp => cp.ExcludedReferencedProjects).Returns(excludedReferencedProjects);
530530
mockCoverageProject.Setup(cp => cp.IncludedReferencedProjects).Returns(includedReferencedProjects);

‎FineCodeCoverageTests/MsCodeCoverage/RunSettingsTemplateReplacementsFactory_Tests.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private class TestUserRunSettingsProjectDetails : IUserRunSettingsProjectDetails
5959
{
6060
public List<string> ExcludedReferencedProjects { get; set; }
6161
public List<string> IncludedReferencedProjects { get; set; }
62-
public string OutputFolder { get; set; }
62+
public string CoverageOutputFolder { get; set; }
6363
public IMsCodeCoverageOptions Settings { get; set; }
6464
public string TestDllFile { get; set; }
6565
}
@@ -84,7 +84,7 @@ public void Should_Set_The_TestAdapter()
8484
"Source1",
8585
new TestUserRunSettingsProjectDetails
8686
{
87-
OutputFolder = "",
87+
CoverageOutputFolder = "",
8888
Settings = new TestMsCodeCoverageOptions{ IncludeTestAssembly = true},
8989
ExcludedReferencedProjects = new List<string>(),
9090
IncludedReferencedProjects = new List<string>(),
@@ -111,7 +111,7 @@ public void Should_Set_The_ResultsDirectory_To_The_First_OutputFolder(string out
111111
"Source1",
112112
new TestUserRunSettingsProjectDetails
113113
{
114-
OutputFolder = outputFolder1,
114+
CoverageOutputFolder = outputFolder1,
115115
Settings = new TestMsCodeCoverageOptions{ IncludeTestAssembly = true},
116116
ExcludedReferencedProjects = new List<string>(),
117117
IncludedReferencedProjects = new List<string>(),
@@ -121,7 +121,7 @@ public void Should_Set_The_ResultsDirectory_To_The_First_OutputFolder(string out
121121
"Source2",
122122
new TestUserRunSettingsProjectDetails
123123
{
124-
OutputFolder = outputFolder2,
124+
CoverageOutputFolder = outputFolder2,
125125
Settings = new TestMsCodeCoverageOptions{ IncludeTestAssembly = true},
126126
ExcludedReferencedProjects = new List<string>(),
127127
IncludedReferencedProjects = new List<string>(),
@@ -173,7 +173,7 @@ TestMsCodeCoverageOptions CreateSettings(string id)
173173
"Source1",
174174
new TestUserRunSettingsProjectDetails
175175
{
176-
OutputFolder = "",
176+
CoverageOutputFolder = "",
177177
Settings = CreateSettings("1"),
178178
ExcludedReferencedProjects = new List<string>(),
179179
IncludedReferencedProjects = new List<string>(),
@@ -183,7 +183,7 @@ TestMsCodeCoverageOptions CreateSettings(string id)
183183
"Source2",
184184
new TestUserRunSettingsProjectDetails
185185
{
186-
OutputFolder = "",
186+
CoverageOutputFolder = "",
187187
Settings = CreateSettings("2"),
188188
ExcludedReferencedProjects = new List<string>(),
189189
IncludedReferencedProjects = new List<string>(),
@@ -234,7 +234,7 @@ public void Should_Add_The_Test_Assembly_Regex_Escaped_To_Module_Excludes_When_I
234234
"Source1",
235235
new TestUserRunSettingsProjectDetails
236236
{
237-
OutputFolder = "",
237+
CoverageOutputFolder = "",
238238
Settings = new TestMsCodeCoverageOptions{
239239
IncludeTestAssembly = includeTestAssembly1,
240240
ModulePathsExclude = new string[]{ "ModulePathExclude"}
@@ -248,7 +248,7 @@ public void Should_Add_The_Test_Assembly_Regex_Escaped_To_Module_Excludes_When_I
248248
"Source2",
249249
new TestUserRunSettingsProjectDetails
250250
{
251-
OutputFolder = "",
251+
CoverageOutputFolder = "",
252252
Settings = new TestMsCodeCoverageOptions{ IncludeTestAssembly = includeTestAssembly2},
253253
ExcludedReferencedProjects = new List<string>(),
254254
IncludedReferencedProjects = new List<string>(),
@@ -287,7 +287,7 @@ public void Should_Add_Regexed_IncludedExcluded_Referenced_Projects_To_ModulePat
287287
"Source1",
288288
new TestUserRunSettingsProjectDetails
289289
{
290-
OutputFolder = "",
290+
CoverageOutputFolder = "",
291291
Settings = new TestMsCodeCoverageOptions{
292292
IncludeTestAssembly = true,
293293
ModulePathsExclude = new string[]{ "ModulePathExclude"},
@@ -301,7 +301,7 @@ public void Should_Add_Regexed_IncludedExcluded_Referenced_Projects_To_ModulePat
301301
"Source2",
302302
new TestUserRunSettingsProjectDetails
303303
{
304-
OutputFolder = "",
304+
CoverageOutputFolder = "",
305305
Settings = new TestMsCodeCoverageOptions{ IncludeTestAssembly = true},
306306
ExcludedReferencedProjects = new List<string>{ "ExcludedReferenced2"},
307307
IncludedReferencedProjects = new List<string>{ "IncludedReferenced2" },
@@ -341,7 +341,7 @@ public void Should_Be_Empty_String_Replacement_When_Null()
341341
"Source1",
342342
new TestUserRunSettingsProjectDetails
343343
{
344-
OutputFolder = "",
344+
CoverageOutputFolder = "",
345345
Settings = new TestMsCodeCoverageOptions{ IncludeTestAssembly = true},
346346
ExcludedReferencedProjects = new List<string>(),
347347
IncludedReferencedProjects = new List<string>(),
@@ -351,7 +351,7 @@ public void Should_Be_Empty_String_Replacement_When_Null()
351351
"Source2",
352352
new TestUserRunSettingsProjectDetails
353353
{
354-
OutputFolder = "",
354+
CoverageOutputFolder = "",
355355
Settings = new TestMsCodeCoverageOptions{ IncludeTestAssembly = true},
356356
ExcludedReferencedProjects = new List<string>(),
357357
IncludedReferencedProjects = new List<string>(),
@@ -414,11 +414,11 @@ public void Should_Set_Enabled_From_The_CoverageProject_Settings(bool enabled)
414414
}
415415

416416
[Test]
417-
public void Should_Set_The_ResultsDirectory_To_The_Project_ProjectOutputFolder()
417+
public void Should_Set_The_ResultsDirectory_To_The_Project_CoverageOutputFolder()
418418
{
419-
var coverageProject = CreateCoverageProject(mock => mock.Setup(cp => cp.ProjectOutputFolder).Returns("ProjectOutputFolder"));
419+
var coverageProject = CreateCoverageProject(mock => mock.Setup(cp => cp.CoverageOutputFolder).Returns("CoverageOutputFolder"));
420420
var replacements = runSettingsTemplateReplacementsFactory.Create(coverageProject,null);
421-
Assert.AreEqual("ProjectOutputFolder", replacements.ResultsDirectory);
421+
Assert.AreEqual("CoverageOutputFolder", replacements.ResultsDirectory);
422422
}
423423

424424
[Test]

‎SharedProject/Core/MsTestPlatform/CodeCoverage/IUserRunSettingsProjectDetails.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ internal interface IUserRunSettingsProjectDetails
77
{
88
List<string> ExcludedReferencedProjects { get; set; }
99
List<string> IncludedReferencedProjects { get; set; }
10-
string OutputFolder { get; set; }
10+
string CoverageOutputFolder { get; set; }
1111
IMsCodeCoverageOptions Settings { get; set; }
1212
string TestDllFile { get; set; }
1313
}

‎SharedProject/Core/MsTestPlatform/CodeCoverage/MsCodeCoverageRunSettingsService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ internal class MsCodeCoverageRunSettingsService : IMsCodeCoverageRunSettingsServ
2626
private class UserRunSettingsProjectDetails : IUserRunSettingsProjectDetails
2727
{
2828
public IMsCodeCoverageOptions Settings { get; set; }
29-
public string OutputFolder { get; set; }
29+
public string CoverageOutputFolder { get; set; }
3030
public string TestDllFile { get; set; }
3131
public List<string> ExcludedReferencedProjects { get; set; }
3232
public List<string> IncludedReferencedProjects { get; set; }
@@ -250,7 +250,7 @@ private void SetUserRunSettingsProjectDetails()
250250
var userRunSettingsProjectDetails = new UserRunSettingsProjectDetails
251251
{
252252
Settings = coverageProjectWithRunSettings.Settings,
253-
OutputFolder = coverageProjectWithRunSettings.ProjectOutputFolder,
253+
CoverageOutputFolder = coverageProjectWithRunSettings.CoverageOutputFolder,
254254
TestDllFile = coverageProjectWithRunSettings.TestDllFile,
255255
ExcludedReferencedProjects = coverageProjectWithRunSettings.ExcludedReferencedProjects,
256256
IncludedReferencedProjects = coverageProjectWithRunSettings.IncludedReferencedProjects

‎SharedProject/Core/MsTestPlatform/CodeCoverage/ProjectRunSettingsGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ internal static string GeneratedProjectRunSettingsFilePath(ICoverageProject cove
5656

5757
private async Task WriteProjectRunSettingsAsync(Guid projectGuid, string projectRunSettingsFilePath, string projectRunSettings)
5858
{
59-
60-
if (await vsRunSettingsWriter.WriteRunSettingsFilePathAsync(projectGuid, projectRunSettingsFilePath))
59+
var ok = await vsRunSettingsWriter.WriteRunSettingsFilePathAsync(projectGuid, projectRunSettingsFilePath);
60+
if (ok)
6161
{
6262
projectRunSettings = XDocument.Parse(projectRunSettings).FormatXml();
6363
fileUtil.WriteAllText(projectRunSettingsFilePath, projectRunSettings);

‎SharedProject/Core/MsTestPlatform/CodeCoverage/RunSettingsTemplateReplacementsFactory.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public IRunSettingsTemplateReplacements Create(
144144
string testAdapter)
145145
{
146146
var allProjectDetails = testContainers.Select(tc => userRunSettingsProjectDetailsLookup[tc.Source]).ToList();
147-
var resultsDirectory = allProjectDetails[0].OutputFolder;
147+
var resultsDirectory = allProjectDetails[0].CoverageOutputFolder;
148148
var allSettings = allProjectDetails.Select(pd => pd.Settings);
149149
var mergedSettings = new MergedIncludesExcludesOptions(allSettings);
150150

@@ -178,7 +178,7 @@ public IRunSettingsTemplateReplacements Create(ICoverageProject coverageProject,
178178

179179
var additionalModulePathsInclude = coverageProject.IncludedReferencedProjects.Select(rp => MsCodeCoverageRegex.RegexModuleName(rp)).ToList();
180180
var settings = new CombinedIncludesExcludesOptions(projectSettings, additionalModulePathsInclude, additionalModulePathsExclude);
181-
return new RunSettingsTemplateReplacements(settings, coverageProject.ProjectOutputFolder, projectSettings.Enabled.ToString(), testAdapter);
181+
return new RunSettingsTemplateReplacements(settings, coverageProject.CoverageOutputFolder, projectSettings.Enabled.ToString(), testAdapter);
182182
}
183183
}
184184

0 commit comments

Comments
 (0)