Skip to content

Commit

Permalink
3rdparty: Upgrade scalatest to 3.1.2
Browse files Browse the repository at this point in the history
Problem / Solution

We need to upgrade scalatest, so that we can stay up to date, take advantage of
new features, and test our libraries against dotty.

This is a more involved upgrade than normal.  A lot of old names have been removed,
and a bunch of namespaces were moved into new modules, and so we've had to move a lot
of things around.

TBR=true

NO-QUEUE=true

NO_USER_HOOK=1

Differential Revision: https://phabricator.twitter.biz/D518553
  • Loading branch information
mosesn authored and jenkins committed Jul 17, 2020
1 parent 359473b commit 0976b23
Show file tree
Hide file tree
Showing 47 changed files with 95 additions and 17 deletions.
30 changes: 22 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ val jacksonVersion = "2.11.0"
val guavaLib = "com.google.guava" % "guava" % "25.1-jre"
val caffeineLib = "com.github.ben-manes.caffeine" % "caffeine" % "2.8.5"
val jsr305Lib = "com.google.code.findbugs" % "jsr305" % "2.0.1"
val scalacheckLib = "org.scalacheck" %% "scalacheck" % "1.14.0" % "test"
val scalacheckLib = "org.scalacheck" %% "scalacheck" % "1.14.3" % "test"
val slf4jApi = "org.slf4j" % "slf4j-api" % slf4jVersion

def travisTestJavaOptions: Seq[String] = {
Expand Down Expand Up @@ -89,7 +89,9 @@ val baseSettings = Seq(
// See https://www.scala-sbt.org/0.13/docs/Testing.html#JUnit
"com.novocode" % "junit-interface" % "0.11" % "test",
"org.mockito" % "mockito-all" % "1.10.19" % "test",
"org.scalatest" %% "scalatest" % "3.0.8" % "test"
"org.scalatest" %% "scalatest" % "3.1.1" % "test",
"org.scalatestplus" %% "junit-4-12" % "3.1.2.0" % "test",
"org.scalatestplus" %% "mockito_1-10" % "3.1.0.0" % "test"
),
fork in Test := true, // We have to fork to get the JavaOptions
// Workaround for cross building HealthyQueue.scala, which is not compatible between
Expand Down Expand Up @@ -293,7 +295,8 @@ lazy val utilCore = Project(
caffeineLib % "test",
scalacheckLib,
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2"
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2",
"org.scalatestplus" %% "scalacheck-1-14" % "3.1.2.0" % "test"
),
resourceGenerators in Compile += Def.task {
val projectName = name.value
Expand Down Expand Up @@ -356,7 +359,10 @@ lazy val utilHashing = Project(
sharedSettings
).settings(
name := "util-hashing",
libraryDependencies += scalacheckLib
libraryDependencies ++= Seq(
scalacheckLib,
"org.scalatestplus" %% "scalacheck-1-14" % "3.1.2.0" % "test"
)
).dependsOn(utilCore % "test")

lazy val utilIntellij = Project(
Expand Down Expand Up @@ -436,7 +442,8 @@ lazy val utilSecurity = Project(
).settings(
name := "util-security",
libraryDependencies ++= Seq(
scalacheckLib
scalacheckLib,
"org.scalatestplus" %% "scalacheck-1-14" % "3.1.2.0" % "test"
)
).dependsOn(utilCore, utilLogging)

Expand All @@ -447,7 +454,12 @@ lazy val utilStats = Project(
sharedSettings
).settings(
name := "util-stats",
libraryDependencies ++= Seq(caffeineLib, jsr305Lib, scalacheckLib) ++ {
libraryDependencies ++= Seq(
caffeineLib,
jsr305Lib,
scalacheckLib,
"org.scalatestplus" %% "scalacheck-1-14" % "3.1.2.0" % "test"
) ++ {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, major)) if major >= 13 =>
Seq("org.scala-lang.modules" %% "scala-parallel-collections" % "0.2.0" % "test")
Expand All @@ -474,8 +486,10 @@ lazy val utilTest = Project(
).settings(
name := "util-test",
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.0.0",
"org.mockito" % "mockito-all" % "1.10.19"
"org.mockito" % "mockito-all" % "1.10.19",
"org.scalatest" %% "scalatest" % "3.1.1",
"org.scalatestplus" %% "junit-4-12" % "3.1.2.0",
"org.scalatestplus" %% "mockito_1-10" % "3.1.1.0"
)
).dependsOn(utilCore, utilLogging)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ junit_tests(
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-app-lifecycle/src/main/scala/com/twitter/app/lifecycle",
"util/util-core:util-core-util",
],
Expand Down
1 change: 1 addition & 0 deletions util-app/src/test/java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ junit_tests(
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scala-lang:scala-library",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-app/src/main/java/com/twitter/app",
"util/util-app/src/main/scala",
"util/util-core:util-core-util",
Expand Down
2 changes: 2 additions & 0 deletions util-app/src/test/scala/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ junit_tests(
"3rdparty/jvm/junit",
"3rdparty/jvm/org/mockito:mockito-all",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:mockito-1-10",
"util/util-app/src/main/scala",
"util/util-app/src/test/resources",
"util/util-core:util-core-util",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ junit_tests(
"3rdparty/jvm/com/google/guava",
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scala-lang:scala-library",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-cache-guava/src/main/scala/com/twitter/cache/guava",
"util/util-cache/src/main/scala/com/twitter/cache",
"util/util-core:util-core-util",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ junit_tests(
"3rdparty/jvm/com/google/guava",
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-cache-guava/src/main/scala/com/twitter/cache/guava",
"util/util-cache/src/main/scala/com/twitter/cache",
"util/util-cache/src/test/scala/com/twitter/cache:abstract_tests",
Expand Down
1 change: 1 addition & 0 deletions util-cache/src/test/java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ junit_tests(
"3rdparty/jvm/junit",
"3rdparty/jvm/org/mockito:mockito-all",
"3rdparty/jvm/org/scala-lang:scala-library",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-cache/src/main/scala/com/twitter/cache",
"util/util-core:util-core-util",
],
Expand Down
4 changes: 3 additions & 1 deletion util-cache/src/test/scala/com/twitter/cache/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ junit_tests(
"3rdparty/jvm/junit",
"3rdparty/jvm/org/mockito:mockito-all",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:mockito-1-10",
"util/util-cache/src/main/scala/com/twitter/cache",
"util/util-cache/src/main/scala/com/twitter/cache/caffeine",
"util/util-core:util-core-util",
Expand All @@ -28,7 +30,7 @@ scala_library(
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalatest",
"util/util-cache/src/main/scala/com/twitter/cache",
"util/util-core/src/main/scala/com/twitter/conversions",
"util/util-core:util-core-util",
"util/util-core/src/main/scala/com/twitter/conversions",
],
)
2 changes: 2 additions & 0 deletions util-cache/src/test/scala/com/twitter/cache/caffeine/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ junit_tests(
"3rdparty/jvm/junit",
"3rdparty/jvm/org/mockito:mockito-all",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:mockito-1-10",
"util/util-cache/src/main/scala/com/twitter/cache",
"util/util-cache/src/main/scala/com/twitter/cache/caffeine",
"util/util-cache/src/test/scala/com/twitter/cache:abstract_tests",
Expand Down
1 change: 1 addition & 0 deletions util-codec/src/test/scala/com/twitter/util/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ junit_tests(
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-codec/src/main/scala/com/twitter/util",
],
)
1 change: 1 addition & 0 deletions util-core/src/test/java/com/twitter/concurrent/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ junit_tests(
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scala-lang:scala-library",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-core/src/main/java/com/twitter/concurrent",
"util/util-core/src/main/scala/com/twitter/concurrent",
],
Expand Down
1 change: 1 addition & 0 deletions util-core/src/test/java/com/twitter/io/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ junit_tests(
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scala-lang:scala-library",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-core:scala",
"util/util-core/src/main/java/com/twitter/io",
],
Expand Down
1 change: 1 addition & 0 deletions util-core/src/test/java/com/twitter/service/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ junit_tests(
compiler_option_sets = ["fatal_warnings"],
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-core/src/main/java/com/twitter/service",
],
)
3 changes: 2 additions & 1 deletion util-core/src/test/java/com/twitter/util/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ java_library(
compiler_option_sets = ["fatal_warnings"],
dependencies = [
"3rdparty/jvm/com/github/ben-manes/caffeine",
"3rdparty/jvm/com/google/errorprone:error_prone_annotations"
"3rdparty/jvm/com/google/errorprone:error_prone_annotations",
],
)

Expand All @@ -19,6 +19,7 @@ junit_tests(
"3rdparty/jvm/com/github/ben-manes/caffeine",
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scala-lang:scala-library",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-core:util-core-util",
"util/util-core/src/main/java/com/twitter/util",
],
Expand Down
1 change: 1 addition & 0 deletions util-core/src/test/java/com/twitter/util/javainterop/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ junit_tests(
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scala-lang:scala-library",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-core/src/main/java/com/twitter/util/javainterop",
],
)
3 changes: 3 additions & 0 deletions util-core/src/test/scala/com/twitter/concurrent/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ junit_tests(
"3rdparty/jvm/org/mockito:mockito-all",
"3rdparty/jvm/org/scalacheck",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:mockito-1-10",
"3rdparty/jvm/org/scalatestplus:scalacheck",
"util/util-core:util-core-util",
"util/util-core/src/main/scala/com/twitter/concurrent",
"util/util-core/src/main/scala/com/twitter/conversions",
Expand Down
2 changes: 2 additions & 0 deletions util-core/src/test/scala/com/twitter/conversions/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ junit_tests(
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalacheck",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:scalacheck",
"util/util-core:util-core-util",
"util/util-core/src/main/scala/com/twitter/conversions",
],
Expand Down
3 changes: 3 additions & 0 deletions util-core/src/test/scala/com/twitter/io/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ junit_tests(
"3rdparty/jvm/org/mockito:mockito-all",
"3rdparty/jvm/org/scalacheck",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:mockito-1-10",
"3rdparty/jvm/org/scalatestplus:scalacheck",
"util/util-core:util-core-util",
"util/util-core/src/main/scala/com/twitter/concurrent",
"util/util-core/src/main/scala/com/twitter/conversions",
Expand Down
3 changes: 3 additions & 0 deletions util-core/src/test/scala/com/twitter/util/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ junit_tests(
"3rdparty/jvm/org/mockito:mockito-all",
"3rdparty/jvm/org/scalacheck",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:mockito-1-10",
"3rdparty/jvm/org/scalatestplus:scalacheck",
"util/util-core:util-core-util",
"util/util-core/src/main/scala/com/twitter/conversions",
"util/util-core/src/test/java/com/twitter/util:object_size_calculator",
Expand Down
2 changes: 2 additions & 0 deletions util-hashing/src/test/scala/com/twitter/hashing/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ junit_tests(
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalacheck",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:scalacheck",
"util/util-core/src/main/scala/com/twitter/io",
"util/util-hashing/src/main/scala/com/twitter/hashing",
"util/util-hashing/src/test/resources",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ junit_tests(
dependencies = [
"3rdparty/jvm/org/scala-lang/modules:scala-xml",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-core:util-core-util",
"util/util-intellij/src/main/resources",
],
Expand Down
1 change: 1 addition & 0 deletions util-jvm/src/test/java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ junit_tests(
compiler_option_sets = ["fatal_warnings"],
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-jvm/src/main/scala/com/twitter/jvm",
],
)
2 changes: 1 addition & 1 deletion util-jvm/src/test/scala/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ junit_tests(
"**/*.scala",
],
compiler_option_sets = ["fatal_warnings"],
dependencies = COMMON_DEPS,
dependencies = COMMON_DEPS + ["3rdparty/jvm/org/scalatestplus:junit"],
)

scala_library(
Expand Down
2 changes: 2 additions & 0 deletions util-lint/src/test/scala/com/twitter/util/lint/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ junit_tests(
"3rdparty/jvm/junit",
"3rdparty/jvm/org/mockito:mockito-all",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:mockito-1-10",
"util/util-lint/src/main/scala/com/twitter/util/lint",
],
)
1 change: 1 addition & 0 deletions util-logging/src/test/java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ junit_tests(
compiler_option_sets = ["fatal_warnings"],
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-logging/src/main/scala/com/twitter/logging",
],
)
3 changes: 2 additions & 1 deletion util-logging/src/test/scala/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ junit_tests(
"3rdparty/jvm/junit",
"3rdparty/jvm/org/mockito:mockito-all",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-app/src/main/scala",
"util/util-core/src/main/scala/com/twitter/io",
"util/util-core:util-core-util",
"util/util-core/src/main/scala/com/twitter/io",
"util/util-logging/src/main/scala/com/twitter/logging",
"util/util-stats/src/main/scala/com/twitter/finagle/stats",
],
Expand Down
1 change: 1 addition & 0 deletions util-reflect/src/test/scala/com/twitter/util/reflect/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ junit_tests(
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-core:util-core-util",
"util/util-reflect/src/main/scala/com/twitter/util/reflect",
],
Expand Down
1 change: 1 addition & 0 deletions util-registry/src/test/java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ junit_tests(
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scala-lang:scala-library",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-registry/src/main/scala/com/twitter/util/registry",
],
)
2 changes: 2 additions & 0 deletions util-registry/src/test/scala/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ junit_tests(
"3rdparty/jvm/junit",
"3rdparty/jvm/org/mockito:mockito-all",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:mockito-1-10",
"util/util-registry/src/main/scala/com/twitter/util/registry",
],
)
1 change: 1 addition & 0 deletions util-routing/src/test/java/com/twitter/util/routing/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ junit_tests(
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scala-lang:scala-library",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-core:util-core-util",
"util/util-logging/src/main/scala",
"util/util-routing/src/main/scala/com/twitter/util/routing",
Expand Down
2 changes: 2 additions & 0 deletions util-routing/src/test/scala/com/twitter/util/routing/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ junit_tests(
"3rdparty/jvm/junit",
"3rdparty/jvm/org/mockito:mockito-all",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:mockito-1-10",
"util/util-routing/src/main/scala/com/twitter/util/routing",
"util/util-routing/src/test/scala/com/twitter/util/routing/dynamic",
"util/util-routing/src/test/scala/com/twitter/util/routing/simple",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ junit_tests(
compiler_option_sets = ["fatal_warnings"],
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-core:util-core-util",
"util/util-security/src/main/scala/com/twitter/util/security",
],
Expand Down
2 changes: 2 additions & 0 deletions util-security/src/test/scala/com/twitter/util/security/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ junit_tests(
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalacheck",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:scalacheck",
"util/util-core:util-core-util",
"util/util-core/src/main/scala/com/twitter/io",
"util/util-security/src/main/scala/com/twitter/util/security",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ junit_tests(
compiler_option_sets = ["fatal_warnings"],
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/slf4j:slf4j-api",
"3rdparty/jvm/org/slf4j:slf4j-simple",
"util/util-slf4j-api/src/main/scala",
Expand Down
2 changes: 2 additions & 0 deletions util-slf4j-api/src/test/scala/com/twitter/util/logging/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ junit_tests(
dependencies = [
"3rdparty/jvm/org/mockito:mockito-all",
"3rdparty/jvm/org/scalatest",
"3rdparty/jvm/org/scalatestplus:junit",
"3rdparty/jvm/org/scalatestplus:mockito-1-10",
"3rdparty/jvm/org/slf4j:slf4j-api",
"3rdparty/jvm/org/slf4j:slf4j-simple",
"util/util-core/src/main/scala/com/twitter/io",
Expand Down
1 change: 1 addition & 0 deletions util-stats/src/test/java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ junit_tests(
compiler_option_sets = ["fatal_warnings"],
dependencies = [
"3rdparty/jvm/junit",
"3rdparty/jvm/org/scalatestplus:junit",
"util/util-core:util-core-util",
"util/util-stats/src/main/scala/com/twitter/finagle/stats",
],
Expand Down
Loading

0 comments on commit 0976b23

Please sign in to comment.