Skip to content

Ms runsettings exception handler #311

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
merged 2 commits into from
Dec 12, 2022
Merged

Ms runsettings exception handler #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ab8755
write out ms runsettings template when XDocument.Parse throws
tonyhallett Dec 12, 2022
a240bf7
save projitems
tonyhallett Dec 12, 2022
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
25 changes: 25 additions & 0 deletions SharedProject/Core/MsTestPlatform/CodeCoverage/MsTemplateReplacementException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using System;
using System.Xml;

namespace FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage
{
public class MsTemplateReplacementException : Exception
{
private XmlException innerException;
private string replacedRunSettingsTemplate;
public MsTemplateReplacementException(XmlException innerException, string replacedRunSettingsTemplate)
{
this.innerException = innerException;
this.replacedRunSettingsTemplate = replacedRunSettingsTemplate;
}

public override string ToString()
{
return $@"${innerException}
Replaced template :
${replacedRunSettingsTemplate}
";
}

}
}
11 changes: 10 additions & 1 deletion SharedProject/Core/MsTestPlatform/CodeCoverage/RunSettingsTemplate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Xml;
using System.Xml.Linq;
using System.Xml.XPath;

namespace FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage
{

[Export(typeof(IRunSettingsTemplate))]
internal class RunSettingsTemplate : IRunSettingsTemplate
{
Expand Down Expand Up @@ -186,7 +188,14 @@ bool isNetFramework

private string AddRecommendedYouDoNotChangeElementsIfNotProvided(string replacedRunSettingsTemplate, bool isNetFramework)
{
var templateDocument = XDocument.Parse(replacedRunSettingsTemplate);
XDocument templateDocument = null;
try
{
templateDocument = XDocument.Parse(replacedRunSettingsTemplate);
}catch(XmlException exc)
{
throw new MsTemplateReplacementException(exc, replacedRunSettingsTemplate);
}
var msDataCollectorCodeCoverageElement = GetMsDataCollectorCodeCoverageElement(templateDocument);
if (msDataCollectorCodeCoverageElement != null)
{
Expand Down
1 change: 1 addition & 0 deletions SharedProject/SharedProject.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Core\Model\SettingsMerger.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Core\Model\VsBuildFCCSettingsProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Core\MsTestPlatform\CodeCoverage\ITemplatedRunSettingsService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Core\MsTestPlatform\CodeCoverage\MsTemplateReplacementException.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Core\MsTestPlatform\CodeCoverage\RunSettingsTemplate.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Core\MsTestPlatform\CodeCoverage\CustomRunSettingsTemplateProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Core\MsTestPlatform\CodeCoverage\IRunSettingsTemplate.cs" />
Expand Down