Skip to content

Commit 417e42c

Browse files
committed
Remove 'org.mockito:mockito-core' dependency
It was needed only in one place. 'scala.reflect.io.VirtualFile' can be used instead of mocking 'scala.reflect.io.AbstractFile'.
1 parent 42ba571 commit 417e42c

File tree

6 files changed

+7
-21
lines changed

6 files changed

+7
-21
lines changed

build.sbt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import sbtcrossproject.CrossProject
66
import sbtcrossproject.CrossType
77

88
val Org = "org.scoverage"
9-
val MockitoVersion = "2.19.0"
109
val ScalatestVersion = "3.0.6-SNAP4"
1110

1211
val appSettings = Seq(
@@ -66,10 +65,7 @@ lazy val runtime = CrossProject("scalac-scoverage-runtime", file("scalac-scovera
6665
.settings(name := "scalac-scoverage-runtime")
6766
.settings(appSettings: _*)
6867
.jvmSettings(
69-
libraryDependencies ++= Seq(
70-
"org.mockito" % "mockito-core" % MockitoVersion % "test",
71-
"org.scalatest" %% "scalatest" % ScalatestVersion % "test"
72-
)
68+
libraryDependencies += "org.scalatest" %% "scalatest" % ScalatestVersion % "test"
7369
)
7470
.jsSettings(
7571
libraryDependencies += "org.scalatest" %%% "scalatest" % ScalatestVersion % "test",
@@ -84,7 +80,6 @@ lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plug
8480
.settings(name := "scalac-scoverage-plugin")
8581
.settings(appSettings: _*)
8682
.settings(libraryDependencies ++= Seq(
87-
"org.mockito" % "mockito-core" % MockitoVersion % "test",
8883
"org.scalatest" %% "scalatest" % ScalatestVersion % "test",
8984
"org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided"
9085
)).settings(libraryDependencies ++= {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ package scoverage
33
import java.io.{File, FileWriter}
44
import java.util.UUID
55

6-
import org.scalatest.mockito.MockitoSugar
76
import org.scalatest.{FreeSpec, Matchers, OneInstancePerTest}
87

98
/** @author Stephen Samuel */
10-
class IOUtilsTest extends FreeSpec with MockitoSugar with OneInstancePerTest with Matchers {
9+
class IOUtilsTest extends FreeSpec with OneInstancePerTest with Matchers {
1110

1211
"io utils" - {
1312
"should parse measurement files" in {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package scoverage
22

3-
import org.scalatest.mockito.MockitoSugar
43
import org.scalatest._
54

65
/** @author Stephen Samuel */
76
class PluginASTSupportTest
87
extends FunSuite
9-
with MockitoSugar
108
with OneInstancePerTest
119
with BeforeAndAfterEachTestData
1210
with ScalaLoggingSupport {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package scoverage
22

3-
import org.scalatest.mockito.MockitoSugar
43
import org.scalatest.{BeforeAndAfterEachTestData, FunSuite, OneInstancePerTest}
54

65
/** @author Stephen Samuel */
76
class PluginCoverageTest
87
extends FunSuite
9-
with MockitoSugar
108
with OneInstancePerTest
119
with BeforeAndAfterEachTestData
1210
with ScalaLoggingSupport {

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package scoverage
22

3-
import org.mockito.Mockito
4-
import org.scalatest.mockito.MockitoSugar
53
import org.scalatest.{FreeSpec, Matchers}
64

7-
import scala.reflect.internal.util._
8-
import scala.reflect.io.AbstractFile
5+
import scala.reflect.internal.util.{BatchSourceFile, NoFile, SourceFile}
6+
import scala.reflect.io.VirtualFile
97

10-
class RegexCoverageFilterTest extends FreeSpec with Matchers with MockitoSugar {
8+
class RegexCoverageFilterTest extends FreeSpec with Matchers {
119

1210
"isClassIncluded" - {
1311

@@ -40,8 +38,7 @@ class RegexCoverageFilterTest extends FreeSpec with Matchers with MockitoSugar {
4038
}
4139
}
4240
"isFileIncluded" - {
43-
val abstractFile = mock[AbstractFile]
44-
Mockito.when(abstractFile.path).thenReturn("sammy.scala")
41+
val abstractFile = new VirtualFile("sammy.scala")
4542
"should return true for empty excludes" in {
4643
val file = new BatchSourceFile(abstractFile, Array.emptyCharArray)
4744
new RegexCoverageFilter(Nil, Nil, Nil).isFileIncluded(file) shouldBe true

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ package scoverage
33
import java.io.StringWriter
44

55
import org.scalatest.{OneInstancePerTest, FunSuite}
6-
import org.scalatest.mockito.MockitoSugar
76

8-
class SerializerTest extends FunSuite with MockitoSugar with OneInstancePerTest {
7+
class SerializerTest extends FunSuite with OneInstancePerTest {
98

109
test("coverage should be serializable into plain text") {
1110
val coverage = Coverage()

0 commit comments

Comments
 (0)