Merge pull request #7628 from sfc-gh-mpilman/features/code-coverage-test-harness
Change test harness to include comments
This commit is contained in:
commit
ade9d20780
|
@ -789,7 +789,7 @@ namespace SummarizeTest
|
|||
int stderrSeverity = (int)Magnesium.Severity.SevError;
|
||||
|
||||
Dictionary<KeyValuePair<string, Magnesium.Severity>, Magnesium.Severity> severityMap = new Dictionary<KeyValuePair<string, Magnesium.Severity>, Magnesium.Severity>();
|
||||
Dictionary<Tuple<string, string>, bool> codeCoverage = new Dictionary<Tuple<string, string>, bool>();
|
||||
var codeCoverage = new Dictionary<Tuple<string, string, string>, bool>();
|
||||
|
||||
foreach (var traceFileName in traceFiles)
|
||||
{
|
||||
|
@ -902,12 +902,17 @@ namespace SummarizeTest
|
|||
if (ev.Type == "CodeCoverage" && !willRestart)
|
||||
{
|
||||
bool covered = true;
|
||||
if(ev.DDetails.ContainsKey("Covered"))
|
||||
if (ev.DDetails.ContainsKey("Covered"))
|
||||
{
|
||||
covered = int.Parse(ev.Details.Covered) != 0;
|
||||
}
|
||||
|
||||
var key = new Tuple<string, string>(ev.Details.File, ev.Details.Line);
|
||||
var comment = "";
|
||||
if (ev.DDetails.ContainsKey("Comment"))
|
||||
{
|
||||
comment = ev.Details.Comment;
|
||||
}
|
||||
var key = new Tuple<string, string, string>(ev.Details.File, ev.Details.Line, comment);
|
||||
if (covered || !codeCoverage.ContainsKey(key))
|
||||
{
|
||||
codeCoverage[key] = covered;
|
||||
|
@ -961,6 +966,9 @@ namespace SummarizeTest
|
|||
{
|
||||
element.Add(new XAttribute("Covered", "0"));
|
||||
}
|
||||
if (kv.Key.Item3.Length > 0) {
|
||||
element.Add(new XAttribute("Comment", kv.Key.Item3));
|
||||
}
|
||||
|
||||
xout.Add(element);
|
||||
}
|
||||
|
|
|
@ -228,7 +228,7 @@ struct CodeProbeImpl : ICodeProbe {
|
|||
evt.detail("File", filename())
|
||||
.detail("Line", Line)
|
||||
.detail("Condition", Condition::value())
|
||||
.detail("ProbeHit", condition)
|
||||
.detail("Covered", condition)
|
||||
.detail("Comment", Comment::value());
|
||||
annotations.trace(this, evt, condition);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue