Quick fix to get new Scala collections compatibility in test.

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

@@ -263,9 +263,9 @@ class PluginCoverageTest
                                    |    }
                                    |  }""".stripMargin)
     assert(!compiler.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.
-    compiler.assertNMeasuredStatements(11)
+    // 2 statements for the two applies in Seq, one for each literal which is 6, one for the operation passed to yield.
+    // Depending on the collections api version, there can be additional implicit canBuildFrom statements.
+    compiler.assertAtLeastNStatements(9)
   }
 
   test("plugin should not instrument local macro implementation") {

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

@@ -102,11 +102,16 @@ class ScoverageCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tool
 
   def assertNoCoverage() = assert(!testStore.sources.mkString(" ").contains(s"scoverage.Invoker.invoked"))
 
-  def assertNMeasuredStatements(n: Int): Unit = {
-    for ( k <- 1 to n ) {
+
+  def assertAtLeastNStatements(n: Int): Unit = {
+    for (k <- 1 to n) {
       assert(testStore.sources.mkString(" ").contains(s"scoverage.Invoker.invoked($k,"),
         s"Should be $n invoked statements but missing #$k")
     }
+  }
+
+  def assertNMeasuredStatements(n: Int): Unit = {
+    assertAtLeastNStatements(n)
     assert(!testStore.sources.mkString(" ").contains(s"scoverage.Invoker.invoked(${n + 1},"),
       s"Found statement ${n + 1} but only expected $n")
   }

scalac-scoverage-runtime/jvm/src/test/scala/scoverage/InvokerConcurrencyTest.scala

@@ -5,7 +5,6 @@ import java.util.concurrent.Executors
 
 import org.scalatest.{BeforeAndAfter, FunSuite}
 
-import scala.collection.breakOut
 import scala.concurrent._
 import scala.concurrent.duration._
 
@@ -33,7 +32,7 @@ class InvokerConcurrencyTest extends FunSuite with BeforeAndAfter {
       Future {
         Invoker.invoked(i, measurementDir.toString)
       }
-    }(breakOut)
+    }.toList
 
     futures.foreach(Await.result(_, 1.second))