Fixed all tests after upgrading coverage filters

Author: sksamuel

build.sbt

@@ -12,9 +12,9 @@ resolvers := ("releases" at "https://oss.sonatype.org/service/local/staging/depl
 
 javacOptions ++= Seq("-source", "1.6", "-target", "1.6")
 
-scalaVersion := "2.11.0"
+scalaVersion := "2.11.2"
 
-crossScalaVersions := Seq("2.10.4", "2.11.0")
+crossScalaVersions := Seq("2.10.4", "2.11.2")
 
 libraryDependencies ++= Seq(
   "org.scala-lang"                 %     "scala-compiler"        % scalaVersion.value    % "provided",

src/test/scala/scoverage/IOUtilsTest.scala

@@ -14,13 +14,13 @@ class IOUtilsTest extends FunSuite with MockitoSugar with OneInstancePerTest {
     coverage.add(
       MeasuredStatement(
         "mysource",
-        Location("org.scoverage", "test", ClassType.Trait, "mymethod"),
+        Location("org.scoverage", "test", ClassType.Trait, "mymethod", "mypath"),
         14, 100, 200, 4, "def test : String", "test", "DefDef", true, 32
       )
     )
     val expected = <statements>
       <statement>
-        <source>mysource</source> <package>org.scoverage</package> <class>test</class> <classType>Trait</classType> <method>mymethod</method> <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>
+        <source>mysource</source> <package>org.scoverage</package> <class>test</class> <classType>Trait</classType> <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>
       </statement>
     </statements>
     val actual = IOUtils.serialize(coverage)
@@ -30,12 +30,12 @@ class IOUtilsTest extends FunSuite with MockitoSugar with OneInstancePerTest {
   test("coverage should be deserializable from xml") {
     val input = <statements>
       <statement>
-        <source>mysource</source> <package>org.scoverage</package> <class>test</class> <classType>Trait</classType> <method>mymethod</method> <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>
+        <source>mysource</source> <package>org.scoverage</package> <class>test</class> <classType>Trait</classType> <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>
       </statement>
     </statements>
     val statements = List(MeasuredStatement(
       "mysource",
-      Location("org.scoverage", "test", ClassType.Trait, "mymethod"),
+      Location("org.scoverage", "test", ClassType.Trait, "mymethod", "mypath"),
       14, 100, 200, 4, "def test : String", "test", "DefDef", true, 32
     ))
     val coverage = IOUtils.deserialize(input.toString())

src/test/scala/scoverage/PluginRunner.scala

@@ -11,7 +11,7 @@ import scala.tools.nsc.transform.{Transform, TypingTransformers}
 /** @author Stephen Samuel */
 trait PluginSupport {
 
-  val scalaVersion = "2.11.0"
+  val scalaVersion = "2.11.2"
   val shortScalaVersion = scalaVersion.dropRight(2)
 
   val classPath = getScalaJars.map(_.getAbsolutePath) :+ sbtCompileDir.getAbsolutePath
@@ -88,6 +88,8 @@ trait PluginSupport {
 class ScoverageAwareCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tools.nsc.reporters.Reporter)
   extends scala.tools.nsc.Global(settings, reporter) {
 
+
+
   val instrumentationComponent = new ScoverageInstrumentationComponent(this)
   instrumentationComponent.setOptions(new ScoverageOptions())
   val testStore = new ScoverageTestStoreComponent(this)

src/test/scala/scoverage/report/CoberturaXmlWriterTest.scala

@@ -28,21 +28,21 @@ class CoberturaXmlWriterTest extends FunSuite with BeforeAndAfter with OneInstan
     val dir = tempDir()
 
     val coverage = Coverage()
-    coverage.add(MeasuredStatement("a.scala", Location("com.sksamuel.scoverage", "A", ClassType.Object, "create"),
+    coverage.add(MeasuredStatement("a.scala", Location("com.sksamuel.scoverage", "A", ClassType.Object, "create", ""),
       1, 2, 3, 12, "", "", "", false, 3))
-    coverage.add(MeasuredStatement("a.scala", Location("com.sksamuel.scoverage", "A", ClassType.Object, "create2"),
+    coverage.add(MeasuredStatement("a.scala", Location("com.sksamuel.scoverage", "A", ClassType.Object, "create2", ""),
       2, 2, 3, 16, "", "", "", false, 3))
-    coverage.add(MeasuredStatement("b.scala", Location("com.sksamuel.scoverage2", "B", ClassType.Object, "retrieve"),
+    coverage.add(MeasuredStatement("b.scala", Location("com.sksamuel.scoverage2", "B", ClassType.Object, "retrieve", ""),
       3, 2, 3, 21, "", "", "", false, 0))
-    coverage.add(MeasuredStatement("b.scala", Location("com.sksamuel.scoverage2", "B", ClassType.Object, "retrieve2"),
+    coverage.add(MeasuredStatement("b.scala", Location("com.sksamuel.scoverage2", "B", ClassType.Object, "retrieve2", ""),
       4, 2, 3, 9, "", "", "", false, 3))
-    coverage.add(MeasuredStatement("c.scala", Location("com.sksamuel.scoverage3", "C", ClassType.Object, "update"),
+    coverage.add(MeasuredStatement("c.scala", Location("com.sksamuel.scoverage3", "C", ClassType.Object, "update", ""),
       5, 2, 3, 66, "", "", "", true, 3))
-    coverage.add(MeasuredStatement("c.scala", Location("com.sksamuel.scoverage3", "C", ClassType.Object, "update2"),
+    coverage.add(MeasuredStatement("c.scala", Location("com.sksamuel.scoverage3", "C", ClassType.Object, "update2", ""),
       6, 2, 3, 6, "", "", "", true, 3))
-    coverage.add(MeasuredStatement("d.scala", Location("com.sksamuel.scoverage4", "D", ClassType.Object, "delete"),
+    coverage.add(MeasuredStatement("d.scala", Location("com.sksamuel.scoverage4", "D", ClassType.Object, "delete", ""),
       7, 2, 3, 4, "", "", "", false, 0))
-    coverage.add(MeasuredStatement("d.scala", Location("com.sksamuel.scoverage4", "D", ClassType.Object, "delete2"),
+    coverage.add(MeasuredStatement("d.scala", Location("com.sksamuel.scoverage4", "D", ClassType.Object, "delete2", ""),
       8, 2, 3, 14, "", "", "", false, 0))
 
     val writer = new CoberturaXmlWriter(new File(""), dir)
@@ -77,11 +77,11 @@ class CoberturaXmlWriterTest extends FunSuite with BeforeAndAfter with OneInstan
     val dir = tempDir()
 
     val coverage = Coverage()
-    coverage.add(MeasuredStatement("a.scala", Location("com.sksamuel.scoverage", "A", ClassType.Object, "create"),
+    coverage.add(MeasuredStatement("a.scala", Location("com.sksamuel.scoverage", "A", ClassType.Object, "create", ""),
       1, 2, 3, 12, "", "", "", false))
-    coverage.add(MeasuredStatement("a.scala", Location("com.sksamuel.scoverage", "A", ClassType.Object, "create2"),
+    coverage.add(MeasuredStatement("a.scala", Location("com.sksamuel.scoverage", "A", ClassType.Object, "create2", ""),
       2, 2, 3, 16, "", "", "", true))
-    coverage.add(MeasuredStatement("a.scala", Location("com.sksamuel.scoverage", "A", ClassType.Object, "create3"),
+    coverage.add(MeasuredStatement("a.scala", Location("com.sksamuel.scoverage", "A", ClassType.Object, "create3", ""),
       3, 3, 3, 20, "", "", "", true, 1))
 
     val writer = new CoberturaXmlWriter(new File(""), dir)