Skip to content

Commit e46887b

Browse files
committed
Fixing broken tests
1 parent 0e00774 commit e46887b

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

scalac-scoverage-plugin/src/main/scala/scoverage/coverage.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ trait FileBuilders {
7171
}
7272

7373
case class MeasuredMethod(name: String, statements: Iterable[Statement]) extends CoverageMetrics {
74-
override def ignoredStatements: Iterable[Statement] = ???
74+
override def ignoredStatements: Iterable[Statement] = Seq()
7575
}
7676

7777
case class MeasuredClass(name: String, statements: Iterable[Statement])
@@ -80,20 +80,20 @@ case class MeasuredClass(name: String, statements: Iterable[Statement])
8080
def simpleName = name.split('.').last
8181
def loc = statements.map(_.line).max
8282

83-
override def ignoredStatements: Iterable[Statement] = ???
83+
override def ignoredStatements: Iterable[Statement] = Seq()
8484
}
8585

8686
case class MeasuredPackage(name: String, statements: Iterable[Statement])
8787
extends CoverageMetrics with ClassCoverage with ClassBuilders with FileBuilders {
88-
override def ignoredStatements: Iterable[Statement] = ???
88+
override def ignoredStatements: Iterable[Statement] = Seq()
8989
}
9090

9191
case class MeasuredFile(source: String, statements: Iterable[Statement])
9292
extends CoverageMetrics with ClassCoverage with ClassBuilders {
9393
def filename = new File(source).getName
9494
def loc = statements.map(_.line).max
9595

96-
override def ignoredStatements: Iterable[Statement] = ???
96+
override def ignoredStatements: Iterable[Statement] = Seq()
9797
}
9898

9999
case class Statement(source: String,

scalac-scoverage-plugin/src/test/scala/scoverage/CoverageMetricsTest.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ class CoverageMetricsTest extends FreeSpec with Matchers {
1717
null,
1818
false,
1919
1))
20+
21+
override def ignoredStatements: Iterable[Statement] = Seq()
2022
}
2123
metrics.branchCount shouldBe 0
2224
metrics.branchCoverage - 1 shouldBe < (0.0001)
@@ -35,6 +37,8 @@ class CoverageMetricsTest extends FreeSpec with Matchers {
3537
null,
3638
false,
3739
0))
40+
41+
override def ignoredStatements: Iterable[Statement] = Seq()
3842
}
3943
metrics.branchCount shouldBe 0
4044
metrics.branchCoverage shouldBe 0

scalac-scoverage-plugin/src/test/scala/scoverage/SerializerTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class SerializerTest extends FunSuite with MockitoSugar with OneInstancePerTest
2020
)
2121
val expected = <statements>
2222
<statement>
23-
<source>mysource</source> <package>org.scoverage</package> <class>test</class> <classType>Trait</classType> <topLevelClass>test</topLevelClass> <method>mymethod</method> <path>mypath</path> <id>14</id> <start>100</start> <end>200</end> <line>4</line> <description>def test : String</description> <symbolName>test</symbolName> <treeName>DefDef</treeName> <branch>true</branch> <count>32</count>
23+
<source>mysource</source> <package>org.scoverage</package> <class>test</class> <classType>Trait</classType> <topLevelClass>test</topLevelClass> <method>mymethod</method> <path>mypath</path> <id>14</id> <start>100</start> <end>200</end> <line>4</line> <description>def test : String</description> <symbolName>test</symbolName> <treeName>DefDef</treeName> <branch>true</branch> <count>32</count> <ignored>false</ignored>
2424
</statement>
2525
</statements>
2626
val writer = new StringWriter()
@@ -31,7 +31,7 @@ class SerializerTest extends FunSuite with MockitoSugar with OneInstancePerTest
3131
test("coverage should be deserializable from xml") {
3232
val input = <statements>
3333
<statement>
34-
<source>mysource</source> <package>org.scoverage</package> <class>test</class> <classType>Trait</classType> <topLevelClass>test</topLevelClass> <method>mymethod</method> <path>mypath</path> <id>14</id> <start>100</start> <end>200</end> <line>4</line> <description>def test : String</description> <symbolName>test</symbolName> <treeName>DefDef</treeName> <branch>true</branch> <count>32</count>
34+
<source>mysource</source> <package>org.scoverage</package> <class>test</class> <classType>Trait</classType> <topLevelClass>test</topLevelClass> <method>mymethod</method> <path>mypath</path> <id>14</id> <start>100</start> <end>200</end> <line>4</line> <description>def test : String</description> <symbolName>test</symbolName> <treeName>DefDef</treeName> <branch>true</branch> <count>32</count> <ignored>false</ignored>
3535
</statement>
3636
</statements>
3737
val statements = List(Statement(

0 commit comments

Comments
 (0)