Browse Source

Code coverage unit tests fixed after changes to TextMarker behaviour (SD2-667). Multiline statements are now highlighted up to the end of the line.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1448 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 19 years ago
parent
commit
8e7e3453c0
  1. 4
      src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoverageHighlighter.cs
  2. 6
      src/AddIns/Misc/CodeCoverage/Test/AddCodeCoverageMarkersTestFixture.cs
  3. 8
      src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersCoverTwoLinesTestFixture.cs

4
src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoverageHighlighter.cs

@ -47,12 +47,12 @@ namespace ICSharpCode.CodeCoverage @@ -47,12 +47,12 @@ namespace ICSharpCode.CodeCoverage
LineSegment lineSegment = markerStrategy.Document.GetLineSegment(line - 1);
if (line == sequencePoint.Line) {
// First line.
markerStrategy.AddMarker(new CodeCoverageTextMarker(lineSegment.Offset + sequencePoint.Column - 1, lineSegment.Length - (lineSegment.DelimiterLength - 1) - sequencePoint.Column, sequencePoint));
markerStrategy.AddMarker(new CodeCoverageTextMarker(lineSegment.Offset + sequencePoint.Column - 1, lineSegment.Length - (sequencePoint.Column - 1), sequencePoint));
} else if (line == sequencePoint.EndLine) {
// Last line.
markerStrategy.AddMarker(new CodeCoverageTextMarker(lineSegment.Offset, sequencePoint.EndColumn - 1, sequencePoint));
} else {
markerStrategy.AddMarker(new CodeCoverageTextMarker(lineSegment.Offset, lineSegment.Length - (lineSegment.DelimiterLength - 1), sequencePoint));
markerStrategy.AddMarker(new CodeCoverageTextMarker(lineSegment.Offset, lineSegment.Length, sequencePoint));
}
}
}

6
src/AddIns/Misc/CodeCoverage/Test/AddCodeCoverageMarkersTestFixture.cs

@ -78,7 +78,7 @@ namespace ICSharpCode.CodeCoverage.Tests @@ -78,7 +78,7 @@ namespace ICSharpCode.CodeCoverage.Tests
[Test]
public void MarkerOneOffset()
{
Assert.AreEqual(3, markerOne.Offset);
Assert.AreEqual(2, markerOne.Offset);
}
[Test]
@ -108,7 +108,7 @@ namespace ICSharpCode.CodeCoverage.Tests @@ -108,7 +108,7 @@ namespace ICSharpCode.CodeCoverage.Tests
[Test]
public void MarkerTwoOffset()
{
Assert.AreEqual(9, markerTwo.Offset);
Assert.AreEqual(8, markerTwo.Offset);
}
[Test]
@ -132,7 +132,7 @@ namespace ICSharpCode.CodeCoverage.Tests @@ -132,7 +132,7 @@ namespace ICSharpCode.CodeCoverage.Tests
[Test]
public void MarkerThreeOffset()
{
Assert.AreEqual(27, markerThree.Offset);
Assert.AreEqual(26, markerThree.Offset);
}
[Test]

8
src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersCoverTwoLinesTestFixture.cs

@ -70,7 +70,7 @@ namespace ICSharpCode.CodeCoverage.Tests @@ -70,7 +70,7 @@ namespace ICSharpCode.CodeCoverage.Tests
[Test]
public void MarkerOneOffset()
{
Assert.AreEqual(3, markerOne.Offset);
Assert.AreEqual(2, markerOne.Offset);
}
[Test]
@ -82,13 +82,13 @@ namespace ICSharpCode.CodeCoverage.Tests @@ -82,13 +82,13 @@ namespace ICSharpCode.CodeCoverage.Tests
[Test]
public void MarkerTwoOffset()
{
Assert.AreEqual(9, markerTwo.Offset);
Assert.AreEqual(8, markerTwo.Offset);
}
[Test]
public void MarkerTwoLength()
{
Assert.AreEqual(56, markerTwo.Length);
Assert.AreEqual(58, markerTwo.Length);
}
[Test]
@ -112,7 +112,7 @@ namespace ICSharpCode.CodeCoverage.Tests @@ -112,7 +112,7 @@ namespace ICSharpCode.CodeCoverage.Tests
[Test]
public void MarkerFourOffset()
{
Assert.AreEqual(129, markerFour.Offset);
Assert.AreEqual(128, markerFour.Offset);
}
}
}

Loading…
Cancel
Save