Added tests for yields

Author: sksamuel

src/test/scala/scoverage/PluginASTSupportTest.scala

@@ -93,5 +93,16 @@ class PluginASTSupportTest
     assert(!reporter.hasErrors)
     assert(!reporter.hasWarnings)
   }
+
+  test("type param with default arg supported") {
+    compileCodeSnippet( """   class TypeTreeObjects {
+                          |      class Container {
+                          |        def typeParamAndDefaultArg[C](name: String = "sammy"): String = name
+                          |      }
+                          |      new Container().typeParamAndDefaultArg[Any]()
+                          |    } """.stripMargin)
+    assert(!reporter.hasErrors)
+    assert(!reporter.hasWarnings)
+  }
 }
 

src/test/scala/scoverage/PluginCoverageTest.scala

@@ -80,6 +80,22 @@ class PluginCoverageTest
     assertNMeasuredStatements(7)
   }
 
+
+
+  test("scoverage should support yields") {
+    compileCodeSnippet( """
+                          |  object Yielder {
+                          |    val holidays = for ( name <- Seq("sammy", "clint", "lee");
+                          |                         place <- Seq("london", "philly", "iowa") ) yield {
+                          |      name + " has been to " + place
+                          |    }
+                          |  }""".stripMargin)
+    assert(!reporter.hasErrors)
+    // 2 statements for the two applies in Seq, one for each literal which is 6, one for the flat map,
+    // one for the map, one for the yield op.
+    assertNMeasuredStatements(11)
+  }
+
   test("scoverage should not instrument local macro implementation") {
     compileCodeSnippet( """
                           | object MyMacro {

src/test/scala/scoverage/PluginRunner.scala

@@ -4,7 +4,7 @@ import java.io.{FileNotFoundException, File}
 import scala.tools.nsc.transform.{TypingTransformers, Transform}
 import java.net.URL
 import scala.tools.nsc.plugins.PluginComponent
-import scala.tools.nsc.Global
+import scala.tools.nsc.{Phase, Global}
 import scala.collection.mutable.ListBuffer
 
 /** @author Stephen Samuel */
@@ -19,6 +19,7 @@ trait PluginSupport {
     val s = new scala.tools.nsc.Settings
     s.Xprint.value = List("all")
     s.Yrangepos.value = true
+    s.Yposdebug.value = true
     s.classpath.value = classPath.mkString(":")
     s
   }
@@ -94,8 +95,6 @@ class ScoverageAwareCompiler(settings: scala.tools.nsc.Settings, reporter: scala
 
   class PositionValidator(val global: Global) extends PluginComponent with TypingTransformers with Transform {
 
-    val sources = new ListBuffer[String]
-
     override val phaseName: String = "scoverage-validator"
     override val runsAfter: List[String] = List("typer")
     override val runsBefore = List[String]("scoverage-instrumentation")