diff --git a/build.sbt b/build.sbt index ea2b7569f0..27d376574d 100644 --- a/build.sbt +++ b/build.sbt @@ -48,6 +48,7 @@ lazy val core = myCrossProject("core") Dependencies.logbackClassic % Runtime, Dependencies.catsKernelLaws % Test, Dependencies.circeLiteral % Test, + Dependencies.disciplineScalatest % Test, Dependencies.http4sDsl % Test, Dependencies.refinedScalacheck % Test, Dependencies.scalacheck % Test, diff --git a/modules/core/src/test/scala/org/scalasteward/core/application/CliTest.scala b/modules/core/src/test/scala/org/scalasteward/core/application/CliTest.scala index 2cb6ccef3e..6194e3d44a 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/application/CliTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/application/CliTest.scala @@ -3,10 +3,11 @@ package org.scalasteward.core.application import cats.implicits._ import org.http4s.Http4sLiteralSyntax import org.scalasteward.core.application.Cli.EnvVar -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite import scala.concurrent.duration._ -class CliTest extends FunSuite with Matchers { +class CliTest extends AnyFunSuite with Matchers { type Result[A] = Either[Throwable, A] val cli: Cli[Result] = new Cli[Result] diff --git a/modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/Http4sBitbucketApiAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/Http4sBitbucketApiAlgTest.scala index c3543746f0..74cbea2a8c 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/Http4sBitbucketApiAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/Http4sBitbucketApiAlgTest.scala @@ -7,15 +7,15 @@ import org.http4s.circe._ import org.http4s.client.Client import org.http4s.dsl.io._ import org.http4s.implicits._ -import org.http4s.{HttpRoutes} -import org.scalasteward.core.git._ import org.scalasteward.core.git.Sha1.HexString +import org.scalasteward.core.git._ import org.scalasteward.core.mock.MockContext.config import org.scalasteward.core.util.HttpJsonClient import org.scalasteward.core.vcs.data._ -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class Http4sBitbucketApiAlgTest extends FunSuite with Matchers { +class Http4sBitbucketApiAlgTest extends AnyFunSuite with Matchers { private val routes: HttpRoutes[IO] = HttpRoutes.of[IO] { case GET -> Root / "repositories" / "fthomas" / "base.g8" => @@ -202,7 +202,7 @@ class Http4sBitbucketApiAlgTest extends FunSuite with Matchers { test("listPullRequests") { val prs = bitbucketApiAlg.listPullRequests(repo, "master", master).unsafeRunSync() - prs should contain only pullRequest + (prs should contain).only(pullRequest) } } diff --git a/modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/JsonCodecTest.scala b/modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/JsonCodecTest.scala index 4ed6e53f43..9df832c3e9 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/JsonCodecTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/bitbucket/http4s/JsonCodecTest.scala @@ -1,10 +1,11 @@ package org.scalasteward.core.bitbucket.http4s import io.circe.Json -import org.scalatest.{FunSuite, Matchers} import org.scalasteward.core.vcs.data.PullRequestState +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class JsonCodecTest extends FunSuite with Matchers { +class JsonCodecTest extends AnyFunSuite with Matchers { test("PullRequestStatus decoding of expected values") { diff --git a/modules/core/src/test/scala/org/scalasteward/core/coursier/CoursierAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/coursier/CoursierAlgTest.scala index 4bab23462c..b97faf0712 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/coursier/CoursierAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/coursier/CoursierAlgTest.scala @@ -3,9 +3,10 @@ package org.scalasteward.core.coursier import org.scalasteward.core.data.Dependency import org.scalasteward.core.mock.MockContext._ import org.scalasteward.core.mock.MockState -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class CoursierAlgTest extends FunSuite with Matchers { +class CoursierAlgTest extends AnyFunSuite with Matchers { test("getArtifactUrl") { val dep = Dependency("org.typelevel", "cats-effect", "cats-effect_2.12", "1.0.0") diff --git a/modules/core/src/test/scala/org/scalasteward/core/data/ExampleTest.scala b/modules/core/src/test/scala/org/scalasteward/core/data/ExampleTest.scala index 29f01dd3d7..9727844b48 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/data/ExampleTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/data/ExampleTest.scala @@ -1,11 +1,12 @@ package org.scalasteward.core.data -import org.scalasteward.core.edit.UpdateHeuristicTest.UpdateOps import org.scalasteward.core.data.Update.Single +import org.scalasteward.core.edit.UpdateHeuristicTest.UpdateOps import org.scalasteward.core.util.Nel -import org.scalatest.{Matchers, WordSpec} +import org.scalatest.Matchers +import org.scalatest.wordspec.AnyWordSpec -class ExampleTest extends WordSpec with Matchers { +class ExampleTest extends AnyWordSpec with Matchers { "Good examples of dependency definitions".which { "will be identified by scala-steward without any problems are".that { diff --git a/modules/core/src/test/scala/org/scalasteward/core/data/SemVerTest.scala b/modules/core/src/test/scala/org/scalasteward/core/data/SemVerTest.scala index fa942aafed..5485b8ed94 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/data/SemVerTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/data/SemVerTest.scala @@ -3,9 +3,10 @@ package org.scalasteward.core.data import eu.timepit.refined.types.numeric.NonNegBigInt import eu.timepit.refined.types.string.NonEmptyString import org.scalasteward.core.data.SemVer.Change -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class SemVerTest extends FunSuite with Matchers { +class SemVerTest extends AnyFunSuite with Matchers { implicit val toNonNegBigInt: Int => NonNegBigInt = i => NonNegBigInt.unsafeFrom(BigInt(i)) diff --git a/modules/core/src/test/scala/org/scalasteward/core/data/UpdateTest.scala b/modules/core/src/test/scala/org/scalasteward/core/data/UpdateTest.scala index ee5467c5ed..2028848fad 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/data/UpdateTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/data/UpdateTest.scala @@ -2,9 +2,10 @@ package org.scalasteward.core.data import org.scalasteward.core.data.Update.{Group, Single} import org.scalasteward.core.util.Nel -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class UpdateTest extends FunSuite with Matchers { +class UpdateTest extends AnyFunSuite with Matchers { test("Group.artifactId") { Group( diff --git a/modules/core/src/test/scala/org/scalasteward/core/data/VersionTest.scala b/modules/core/src/test/scala/org/scalasteward/core/data/VersionTest.scala index 7aab7c4dfa..14397ead8b 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/data/VersionTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/data/VersionTest.scala @@ -4,11 +4,12 @@ import cats.implicits._ import cats.kernel.Comparison.{EqualTo, GreaterThan, LessThan} import cats.kernel.laws.discipline.OrderTests import org.scalasteward.core.TestInstances._ +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite import org.scalatest.prop.TableDrivenPropertyChecks._ -import org.scalatest.{FunSuite, Matchers} import org.typelevel.discipline.scalatest.Discipline -class VersionTest extends FunSuite with Discipline with Matchers { +class VersionTest extends AnyFunSuite with Discipline with Matchers { checkAll("Order[Version]", OrderTests[Version].order) test("comparison") { diff --git a/modules/core/src/test/scala/org/scalasteward/core/edit/EditAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/edit/EditAlgTest.scala index 606d9a01f3..b04430cab0 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/edit/EditAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/edit/EditAlgTest.scala @@ -1,14 +1,15 @@ package org.scalasteward.core.edit import better.files.File +import org.scalasteward.core.data.Update import org.scalasteward.core.mock.MockContext.editAlg import org.scalasteward.core.mock.MockState -import org.scalasteward.core.data.Update import org.scalasteward.core.util.Nel import org.scalasteward.core.vcs.data.Repo -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class EditAlgTest extends FunSuite with Matchers { +class EditAlgTest extends AnyFunSuite with Matchers { test("applyUpdate") { val repo = Repo("fthomas", "scala-steward") diff --git a/modules/core/src/test/scala/org/scalasteward/core/edit/UpdateHeuristicTest.scala b/modules/core/src/test/scala/org/scalasteward/core/edit/UpdateHeuristicTest.scala index 17e5025c1d..825021aee9 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/edit/UpdateHeuristicTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/edit/UpdateHeuristicTest.scala @@ -1,12 +1,13 @@ package org.scalasteward.core.edit -import org.scalasteward.core.edit.UpdateHeuristicTest.UpdateOps import org.scalasteward.core.data.Update import org.scalasteward.core.data.Update.{Group, Single} +import org.scalasteward.core.edit.UpdateHeuristicTest.UpdateOps import org.scalasteward.core.util.Nel -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class UpdateHeuristicTest extends FunSuite with Matchers { +class UpdateHeuristicTest extends AnyFunSuite with Matchers { test("sbt: build.properties") { val original = """sbt.version=1.3.0-RC1""" diff --git a/modules/core/src/test/scala/org/scalasteward/core/edit/editTest.scala b/modules/core/src/test/scala/org/scalasteward/core/edit/editTest.scala index b22cba7e38..f3e8ec83fa 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/edit/editTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/edit/editTest.scala @@ -2,10 +2,11 @@ package org.scalasteward.core.edit import cats.implicits._ import org.scalacheck.{Arbitrary, Gen} -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks -class editTest extends FunSuite with Matchers with ScalaCheckPropertyChecks { +class editTest extends AnyFunSuite with Matchers with ScalaCheckPropertyChecks { private val lineGen = Gen.frequency( 3 -> Arbitrary.arbString.arbitrary, 1 -> Gen.oneOf("scala-steward:off", "scala-steward:on"), diff --git a/modules/core/src/test/scala/org/scalasteward/core/git/GitAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/git/GitAlgTest.scala index 5937b6366c..5fc1e6900b 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/git/GitAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/git/GitAlgTest.scala @@ -13,9 +13,10 @@ import org.scalasteward.core.mock.MockContext._ import org.scalasteward.core.mock.MockState import org.scalasteward.core.util.Nel import org.scalasteward.core.vcs.data.Repo -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class GitAlgTest extends FunSuite with Matchers { +class GitAlgTest extends AnyFunSuite with Matchers { implicit val workspaceAlg: WorkspaceAlg[IO] = WorkspaceAlg.create[IO] val ioGitAlg: GitAlg[IO] = GitAlg.create[IO] diff --git a/modules/core/src/test/scala/org/scalasteward/core/github/GitHubRepoAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/github/GitHubRepoAlgTest.scala index 7e62a52984..5ef0adf387 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/github/GitHubRepoAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/github/GitHubRepoAlgTest.scala @@ -2,13 +2,14 @@ package org.scalasteward.core.github import org.http4s.Http4sLiteralSyntax import org.scalasteward.core.git.Branch -import org.scalasteward.core.vcs.data.{Repo, RepoOut, UserOut} import org.scalasteward.core.mock.MockContext.{config, gitAlg, gitHubRepoAlg} import org.scalasteward.core.mock.{MockContext, MockState} import org.scalasteward.core.vcs.VCSRepoAlg -import org.scalatest.{FunSuite, Matchers} +import org.scalasteward.core.vcs.data.{Repo, RepoOut, UserOut} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class GitHubRepoAlgTest extends FunSuite with Matchers { +class GitHubRepoAlgTest extends AnyFunSuite with Matchers { val repo = Repo("fthomas", "datapackage") val repoDir: String = (config.workspace / "fthomas/datapackage").toString val askPass = s"GIT_ASKPASS=${config.gitAskPass}" diff --git a/modules/core/src/test/scala/org/scalasteward/core/github/UrlTest.scala b/modules/core/src/test/scala/org/scalasteward/core/github/UrlTest.scala index f525896d10..af1ab40216 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/github/UrlTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/github/UrlTest.scala @@ -3,9 +3,10 @@ package org.scalasteward.core.github import org.http4s.Http4sLiteralSyntax import org.scalasteward.core.git.Branch import org.scalasteward.core.vcs.data.Repo -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class UrlTest extends FunSuite with Matchers { +class UrlTest extends AnyFunSuite with Matchers { val url = new Url(uri"https://api.github.com") import url._ diff --git a/modules/core/src/test/scala/org/scalasteward/core/github/http4s/Http4sGitHubApiAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/github/http4s/Http4sGitHubApiAlgTest.scala index 962df8dfbd..2075fdd9d9 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/github/http4s/Http4sGitHubApiAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/github/http4s/Http4sGitHubApiAlgTest.scala @@ -9,12 +9,13 @@ import org.http4s.implicits._ import org.http4s.{Http4sLiteralSyntax, HttpRoutes} import org.scalasteward.core.git.Sha1.HexString import org.scalasteward.core.git.{Branch, Sha1} -import org.scalasteward.core.vcs.data._ import org.scalasteward.core.mock.MockContext.config import org.scalasteward.core.util.HttpJsonClient -import org.scalatest.{FunSuite, Matchers} +import org.scalasteward.core.vcs.data._ +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class Http4sGitHubApiAlgTest extends FunSuite with Matchers { +class Http4sGitHubApiAlgTest extends AnyFunSuite with Matchers { val routes: HttpRoutes[IO] = HttpRoutes.of[IO] { diff --git a/modules/core/src/test/scala/org/scalasteward/core/github/http4s/authenticationTest.scala b/modules/core/src/test/scala/org/scalasteward/core/github/http4s/authenticationTest.scala index c5c3cd0328..78cceff1f5 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/github/http4s/authenticationTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/github/http4s/authenticationTest.scala @@ -4,9 +4,10 @@ import cats.Id import org.http4s.headers.{Accept, Authorization} import org.http4s.{BasicCredentials, Headers, MediaType, Request} import org.scalasteward.core.vcs.data.AuthenticatedUser -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class authenticationTest extends FunSuite with Matchers { +class authenticationTest extends AnyFunSuite with Matchers { test("addCredentials") { val request = authentication .addCredentials(AuthenticatedUser("user", "pass")) diff --git a/modules/core/src/test/scala/org/scalasteward/core/gitlab/Http4sGitlabApiAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/gitlab/Http4sGitlabApiAlgTest.scala index d6cdcbb2a5..a846292767 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/gitlab/Http4sGitlabApiAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/gitlab/Http4sGitlabApiAlgTest.scala @@ -1,26 +1,24 @@ package org.scalasteward.core.gitlab.http4s import cats.effect.IO -import io.circe.parser._ import io.circe.literal._ -import org.scalatest.{FunSuite, Matchers} -import org.scalasteward.core.vcs.data._ -import org.scalasteward.core.nurture.UpdateData -import org.scalasteward.core.repoconfig.RepoConfig -import org.scalasteward.core.data.Update -import org.scalasteward.core.git.Sha1 -import org.scalasteward.core.vcs.data.NewPullRequestData -import org.scalasteward.core.git.Branch -import org.scalasteward.core.util.Nel -import org.scalasteward.core.util.HttpJsonClient -import org.scalasteward.core.mock.MockContext.{config, user} +import io.circe.parser._ import org.http4s.circe._ import org.http4s.client.Client import org.http4s.dsl.io._ import org.http4s.implicits._ import org.http4s.{Http4sLiteralSyntax, HttpRoutes} +import org.scalasteward.core.data.Update +import org.scalasteward.core.git.{Branch, Sha1} +import org.scalasteward.core.mock.MockContext.{config, user} +import org.scalasteward.core.nurture.UpdateData +import org.scalasteward.core.repoconfig.RepoConfig +import org.scalasteward.core.util.{HttpJsonClient, Nel} +import org.scalasteward.core.vcs.data.{NewPullRequestData, _} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class Http4sGitlabApiAlgTest extends FunSuite with Matchers { +class Http4sGitlabApiAlgTest extends AnyFunSuite with Matchers { import GitlabJsonCodec._ val routes: HttpRoutes[IO] = diff --git a/modules/core/src/test/scala/org/scalasteward/core/io/FileAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/io/FileAlgTest.scala index 1ceb490b48..77b1bd4194 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/io/FileAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/io/FileAlgTest.scala @@ -8,9 +8,10 @@ import org.scalasteward.core.TestInstances.ioLogger import org.scalasteward.core.io.FileAlgTest.ioFileAlg import org.scalasteward.core.mock.MockContext.fileAlg import org.scalasteward.core.mock.MockState -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class FileAlgTest extends FunSuite with Matchers { +class FileAlgTest extends AnyFunSuite with Matchers { test("createTemporarily") { val file = File.temp / "test-scala-steward3.tmp" val content = Arbitrary.arbitrary[String].sample.getOrElse("") diff --git a/modules/core/src/test/scala/org/scalasteward/core/io/ProcessAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/io/ProcessAlgTest.scala index 2967e16bc9..9b2a687793 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/io/ProcessAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/io/ProcessAlgTest.scala @@ -7,9 +7,10 @@ import org.scalasteward.core.io.ProcessAlgTest.ioProcessAlg import org.scalasteward.core.mock.MockContext._ import org.scalasteward.core.mock.MockState import org.scalasteward.core.util.Nel -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class ProcessAlgTest extends FunSuite with Matchers { +class ProcessAlgTest extends AnyFunSuite with Matchers { test("exec echo") { ioProcessAlg .exec(Nel.of("echo", "-n", "hello"), File.currentWorkingDirectory) diff --git a/modules/core/src/test/scala/org/scalasteward/core/io/processTest.scala b/modules/core/src/test/scala/org/scalasteward/core/io/processTest.scala index fcdacdde3b..5ed5e928db 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/io/processTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/io/processTest.scala @@ -3,10 +3,11 @@ package org.scalasteward.core.io import cats.effect.IO import org.scalasteward.core.TestInstances._ import org.scalasteward.core.util.Nel -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite import scala.concurrent.duration._ -class processTest extends FunSuite with Matchers { +class processTest extends AnyFunSuite with Matchers { def slurp1(cmd: Nel[String]): IO[List[String]] = process.slurp[IO](cmd, None, Map.empty, 1.minute, _ => IO.unit) diff --git a/modules/core/src/test/scala/org/scalasteward/core/repoconfig/RepoConfigAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/repoconfig/RepoConfigAlgTest.scala index c169f85ebc..e9ca800b83 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/repoconfig/RepoConfigAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/repoconfig/RepoConfigAlgTest.scala @@ -1,14 +1,15 @@ package org.scalasteward.core.repoconfig import better.files.File -import org.scalasteward.core.vcs.data.Repo +import org.scalasteward.core.data.Update import org.scalasteward.core.mock.MockContext.repoConfigAlg import org.scalasteward.core.mock.MockState -import org.scalasteward.core.data.Update import org.scalasteward.core.util.Nel -import org.scalatest.{FunSuite, Matchers} +import org.scalasteward.core.vcs.data.Repo +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class RepoConfigAlgTest extends FunSuite with Matchers { +class RepoConfigAlgTest extends AnyFunSuite with Matchers { test("config with all fields set") { val repo = Repo("fthomas", "scala-steward") val configFile = File.temp / "ws/fthomas/scala-steward/.scala-steward.conf" diff --git a/modules/core/src/test/scala/org/scalasteward/core/sbt/SbtAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/sbt/SbtAlgTest.scala index 928f053d5a..6ccde1e568 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/sbt/SbtAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/sbt/SbtAlgTest.scala @@ -8,9 +8,10 @@ import org.scalasteward.core.mock.{MockContext, MockState} import org.scalasteward.core.scalafix.Migration import org.scalasteward.core.util.Nel import org.scalasteward.core.vcs.data.Repo -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class SbtAlgTest extends FunSuite with Matchers { +class SbtAlgTest extends AnyFunSuite with Matchers { test("addGlobalPlugins") { sbtAlg.addGlobalPlugins.runS(MockState.empty).unsafeRunSync() shouldBe MockState.empty.copy( diff --git a/modules/core/src/test/scala/org/scalasteward/core/sbt/data/ArtificialProjectTest.scala b/modules/core/src/test/scala/org/scalasteward/core/sbt/data/ArtificialProjectTest.scala index fb2e52a8b6..9f3a89dbd4 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/sbt/data/ArtificialProjectTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/sbt/data/ArtificialProjectTest.scala @@ -1,9 +1,10 @@ package org.scalasteward.core.sbt.data import org.scalasteward.core.data.Dependency -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class ArtificialProjectTest extends FunSuite with Matchers { +class ArtificialProjectTest extends AnyFunSuite with Matchers { val catsEffect = Dependency("org.typelevel", "cats-effect", "cats-effect_2.12", "1.0.0", None) val scalaLibrary = diff --git a/modules/core/src/test/scala/org/scalasteward/core/sbt/parserTest.scala b/modules/core/src/test/scala/org/scalasteward/core/sbt/parserTest.scala index 6459395617..aeb9b44bff 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/sbt/parserTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/sbt/parserTest.scala @@ -4,9 +4,10 @@ import org.scalasteward.core.data.{Dependency, Update} import org.scalasteward.core.sbt.data.SbtVersion import org.scalasteward.core.sbt.parser._ import org.scalasteward.core.util.Nel -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class parserTest extends FunSuite with Matchers { +class parserTest extends AnyFunSuite with Matchers { test("parseBuildProperties: with whitespace") { parseBuildProperties("sbt.version = 1.2.8") shouldBe Some(SbtVersion("1.2.8")) } diff --git a/modules/core/src/test/scala/org/scalasteward/core/scalafmt/ScalafmtAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/scalafmt/ScalafmtAlgTest.scala index d13fd15f34..b909ca80ae 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/scalafmt/ScalafmtAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/scalafmt/ScalafmtAlgTest.scala @@ -4,9 +4,10 @@ import org.scalasteward.core.data.Version import org.scalasteward.core.mock.MockContext._ import org.scalasteward.core.mock.MockState import org.scalasteward.core.vcs.data.Repo -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class ScalafmtAlgTest extends FunSuite with Matchers { +class ScalafmtAlgTest extends AnyFunSuite with Matchers { test("getScalafmtVersion on unquoted version") { val repo = Repo("fthomas", "scala-steward") diff --git a/modules/core/src/test/scala/org/scalasteward/core/update/FilterAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/update/FilterAlgTest.scala index a6f4615830..a4a79c52ad 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/update/FilterAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/update/FilterAlgTest.scala @@ -1,15 +1,16 @@ package org.scalasteward.core.update import cats.implicits._ +import org.scalasteward.core.data.Update import org.scalasteward.core.mock.MockContext.filterAlg import org.scalasteward.core.mock.MockState -import org.scalasteward.core.data.Update import org.scalasteward.core.repoconfig.{RepoConfig, UpdatePattern, UpdatesConfig} import org.scalasteward.core.update.FilterAlg.{BadVersions, NonSnapshotToSnapshotUpdate} import org.scalasteward.core.util.Nel -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class FilterAlgTest extends FunSuite with Matchers { +class FilterAlgTest extends AnyFunSuite with Matchers { test("ignoreNonSnapshotToSnapshotUpdate: SNAP -> SNAP") { val update = Update.Single("org.scalatest", "scalatest", "3.0.8-SNAP2", Nel.of("3.1.0-SNAP10")) FilterAlg.ignoreNonSnapshotToSnapshotUpdate(update) shouldBe Right(update) diff --git a/modules/core/src/test/scala/org/scalasteward/core/update/UpdateServiceTest.scala b/modules/core/src/test/scala/org/scalasteward/core/update/UpdateServiceTest.scala index b00b41ad50..d91433a826 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/update/UpdateServiceTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/update/UpdateServiceTest.scala @@ -2,9 +2,10 @@ package org.scalasteward.core.update import org.scalasteward.core.data.{Dependency, Update} import org.scalasteward.core.util.Nel -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class UpdateServiceTest extends FunSuite with Matchers { +class UpdateServiceTest extends AnyFunSuite with Matchers { test("findUpdateUnderNewGroup: returns empty if dep is not listed") { val original = new Dependency("org.spire-math", "UNKNOWN", "_2.12", "1.0.0") diff --git a/modules/core/src/test/scala/org/scalasteward/core/update/showTest.scala b/modules/core/src/test/scala/org/scalasteward/core/update/showTest.scala index 11f1abe968..47e8dd18b0 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/update/showTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/update/showTest.scala @@ -2,9 +2,10 @@ package org.scalasteward.core.update import org.scalasteward.core.data.Update.{Group, Single} import org.scalasteward.core.util.Nel -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class showTest extends FunSuite with Matchers { +class showTest extends AnyFunSuite with Matchers { test("oneLiner: cats-core") { val update = Single("org.typelevel", "cats-core", "0.9.0", Nel.one("1.0.0")) diff --git a/modules/core/src/test/scala/org/scalasteward/core/util/ChangeTest.scala b/modules/core/src/test/scala/org/scalasteward/core/util/ChangeTest.scala index 13f2d47c1b..264131b47b 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/util/ChangeTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/util/ChangeTest.scala @@ -4,9 +4,9 @@ import cats.implicits._ import cats.kernel.laws.discipline.MonoidTests import org.scalasteward.core.TestInstances._ import org.scalasteward.core.util.Change._ -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import org.typelevel.discipline.scalatest.Discipline -class ChangeTest extends FunSuite with Discipline { +class ChangeTest extends AnyFunSuite with Discipline { checkAll("Monoid[Change[T]]", MonoidTests[Change[String]].monoid) } diff --git a/modules/core/src/test/scala/org/scalasteward/core/util/dateTimeTest.scala b/modules/core/src/test/scala/org/scalasteward/core/util/dateTimeTest.scala index f754fbd15f..6b2497258d 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/util/dateTimeTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/util/dateTimeTest.scala @@ -1,10 +1,11 @@ package org.scalasteward.core.util import org.scalasteward.core.util.dateTime._ -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite import scala.concurrent.duration._ -class dateTimeTest extends FunSuite with Matchers { +class dateTimeTest extends AnyFunSuite with Matchers { test("showDuration") { showDuration(247023586491264L.nanoseconds) shouldBe "2d 20h 37m 3s 586ms 491µs 264ns" } diff --git a/modules/core/src/test/scala/org/scalasteward/core/util/loggerTest.scala b/modules/core/src/test/scala/org/scalasteward/core/util/loggerTest.scala index 8eb10e88b5..bae6b42345 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/util/loggerTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/util/loggerTest.scala @@ -4,9 +4,10 @@ import cats.effect.Sync import org.scalasteward.core.mock.MockContext._ import org.scalasteward.core.mock.{MockEff, MockState} import org.scalasteward.core.util.logger.LoggerOps -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class loggerTest extends FunSuite with Matchers { +class loggerTest extends AnyFunSuite with Matchers { test("attemptLog_") { final case class Err(msg: String) extends Throwable(msg) val err = Err("hmm?") diff --git a/modules/core/src/test/scala/org/scalasteward/core/util/stringTest.scala b/modules/core/src/test/scala/org/scalasteward/core/util/stringTest.scala index 060024fe13..83c381db1d 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/util/stringTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/util/stringTest.scala @@ -1,10 +1,11 @@ package org.scalasteward.core.util import org.scalacheck.Gen -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks -class stringTest extends FunSuite with Matchers with ScalaCheckPropertyChecks { +class stringTest extends AnyFunSuite with Matchers with ScalaCheckPropertyChecks { test("splitBetweenLowerAndUpperChars(s).mkString == s") { forAll(Gen.asciiStr) { s: String => string.splitBetweenLowerAndUpperChars(s).mkString shouldBe s diff --git a/modules/core/src/test/scala/org/scalasteward/core/util/uriTest.scala b/modules/core/src/test/scala/org/scalasteward/core/util/uriTest.scala index 962829aff0..5ebe260f71 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/util/uriTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/util/uriTest.scala @@ -1,9 +1,10 @@ package org.scalasteward.core.util import org.http4s.Http4sLiteralSyntax -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class uriTest extends FunSuite with Matchers { +class uriTest extends AnyFunSuite with Matchers { test("withUserInfo") { val url = uri"https://api.github.com/repos/" diff --git a/modules/core/src/test/scala/org/scalasteward/core/util/utilTest.scala b/modules/core/src/test/scala/org/scalasteward/core/util/utilTest.scala index 5bedf72595..2d9bb84b16 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/util/utilTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/util/utilTest.scala @@ -4,10 +4,11 @@ import cats.effect.IO import cats.implicits._ import eu.timepit.refined.scalacheck.numeric._ import eu.timepit.refined.types.numeric.PosInt -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks -class utilTest extends FunSuite with Matchers with ScalaCheckPropertyChecks { +class utilTest extends AnyFunSuite with Matchers with ScalaCheckPropertyChecks { test("bindUntilTrue: empty list") { bindUntilTrue(List.empty[Option[Boolean]]) shouldBe Some(false) } diff --git a/modules/core/src/test/scala/org/scalasteward/core/vcs/VCSExtraAlgTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/VCSExtraAlgTest.scala index 53a78a79a7..472b4d4dc1 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/vcs/VCSExtraAlgTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/VCSExtraAlgTest.scala @@ -8,9 +8,10 @@ import org.http4s.implicits._ import org.scalasteward.core.TestInstances.ioLogger import org.scalasteward.core.data.Update import org.scalasteward.core.util.{HttpExistenceClient, Nel} -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class VCSExtraAlgTest extends FunSuite with Matchers { +class VCSExtraAlgTest extends AnyFunSuite with Matchers { val routes: HttpRoutes[IO] = HttpRoutes.of[IO] { case HEAD -> Root / "foo" / "bar" / "compare" / "v0.1.0...v0.2.0" => Ok("exist") diff --git a/modules/core/src/test/scala/org/scalasteward/core/vcs/VCSPackageTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/VCSPackageTest.scala index 93b89c89aa..e2c1b0ef2c 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/vcs/VCSPackageTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/VCSPackageTest.scala @@ -1,14 +1,13 @@ package org.scalasteward.core.vcs -import org.scalasteward.core.application.SupportedVCS.GitHub -import org.scalasteward.core.application.SupportedVCS.Gitlab +import org.scalasteward.core.application.SupportedVCS.{GitHub, Gitlab} +import org.scalasteward.core.data.Update import org.scalasteward.core.util.Nel import org.scalasteward.core.vcs.data.Repo -import org.scalasteward.core.data.Update - -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class VCSPackageTest extends FunSuite with Matchers { +class VCSPackageTest extends AnyFunSuite with Matchers { val repo = Repo("foo", "bar") val update = Update.Single("ch.qos.logback", "logback-classic", "1.2.0", Nel.of("1.2.3")) diff --git a/modules/core/src/test/scala/org/scalasteward/core/vcs/data/BranchOutTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/data/BranchOutTest.scala index 1e9e7a6773..f675e27328 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/vcs/data/BranchOutTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/data/BranchOutTest.scala @@ -3,10 +3,11 @@ package org.scalasteward.core.vcs.data import io.circe.parser import org.scalasteward.core.git.Sha1.HexString import org.scalasteward.core.git.{Branch, Sha1} -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite import scala.io.Source -class BranchOutTest extends FunSuite with Matchers { +class BranchOutTest extends AnyFunSuite with Matchers { test("decode") { val input = Source.fromResource("get-branch.json").mkString parser.decode[BranchOut](input) shouldBe diff --git a/modules/core/src/test/scala/org/scalasteward/core/vcs/data/NewPullRequestDataTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/data/NewPullRequestDataTest.scala index b5f6e37277..127e8e4190 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/vcs/data/NewPullRequestDataTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/data/NewPullRequestDataTest.scala @@ -1,14 +1,15 @@ package org.scalasteward.core.vcs.data import io.circe.syntax._ -import org.scalasteward.core.git.{Branch, Sha1} import org.scalasteward.core.data.Update +import org.scalasteward.core.git.{Branch, Sha1} import org.scalasteward.core.nurture.UpdateData import org.scalasteward.core.repoconfig.RepoConfig import org.scalasteward.core.util.Nel -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class NewPullRequestDataTest extends FunSuite with Matchers { +class NewPullRequestDataTest extends AnyFunSuite with Matchers { test("asJson") { val data = UpdateData( Repo("foo", "bar"), diff --git a/modules/core/src/test/scala/org/scalasteward/core/vcs/data/PullRequestOutTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/data/PullRequestOutTest.scala index 0bfa2e6ace..4311d6f440 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/vcs/data/PullRequestOutTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/data/PullRequestOutTest.scala @@ -3,10 +3,11 @@ package org.scalasteward.core.vcs.data import io.circe.parser import org.http4s.Http4sLiteralSyntax import org.scalasteward.core.vcs.data.PullRequestState.Open -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite import scala.io.Source -class PullRequestOutTest extends FunSuite with Matchers { +class PullRequestOutTest extends AnyFunSuite with Matchers { test("decode") { val expected = List( diff --git a/modules/core/src/test/scala/org/scalasteward/core/vcs/data/PullRequestStateTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/data/PullRequestStateTest.scala index 957856dc3b..34b0993106 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/vcs/data/PullRequestStateTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/data/PullRequestStateTest.scala @@ -3,9 +3,10 @@ package org.scalasteward.core.vcs.data import io.circe.Decoder import io.circe.syntax._ import org.scalasteward.core.vcs.data.PullRequestState.{Closed, Open} -import org.scalatest.{Assertion, FunSuite, Matchers} +import org.scalatest.funsuite.AnyFunSuite +import org.scalatest.{Assertion, Matchers} -class PullRequestStateTest extends FunSuite with Matchers { +class PullRequestStateTest extends AnyFunSuite with Matchers { def roundTrip(state: PullRequestState): Assertion = Decoder[PullRequestState].decodeJson(state.asJson) shouldBe Right(state) diff --git a/modules/core/src/test/scala/org/scalasteward/core/vcs/data/RepoOutTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/data/RepoOutTest.scala index 472b4f6977..e21bcab9b4 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/vcs/data/RepoOutTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/data/RepoOutTest.scala @@ -4,10 +4,11 @@ import cats.effect.IO import io.circe.parser import org.http4s.Http4sLiteralSyntax import org.scalasteward.core.git.Branch -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite import scala.io.Source -class RepoOutTest extends FunSuite with Matchers { +class RepoOutTest extends AnyFunSuite with Matchers { val parent = RepoOut( "base.g8", diff --git a/modules/core/src/test/scala/org/scalasteward/core/vcs/data/RepoTest.scala b/modules/core/src/test/scala/org/scalasteward/core/vcs/data/RepoTest.scala index 6181083edf..3458da6e2f 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/vcs/data/RepoTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/vcs/data/RepoTest.scala @@ -1,9 +1,10 @@ package org.scalasteward.core.vcs.data import org.scalasteward.core.vcs.data.Repo.repoKeyDecoder -import org.scalatest.{FunSuite, Matchers} +import org.scalatest.Matchers +import org.scalatest.funsuite.AnyFunSuite -class RepoTest extends FunSuite with Matchers { +class RepoTest extends AnyFunSuite with Matchers { test("decode") { repoKeyDecoder("owner/repo") shouldBe Some(Repo("owner", "repo")) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 1f6d3943ef..d347ff73b2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -22,6 +22,7 @@ object Dependencies { val commonsIo = "commons-io" % "commons-io" % "2.6" val coursierCore = "io.get-coursier" %% "coursier" % Versions.coursier val coursierCatsInterop = "io.get-coursier" %% "coursier-cats-interop" % Versions.coursier + val disciplineScalatest = "org.typelevel" %% "discipline-scalatest" % "1.0.0-M1" val fs2Core = "co.fs2" %% "fs2-core" % "1.0.5" val http4sAsyncHttpClient = "org.http4s" %% "http4s-async-http-client" % Versions.http4s val http4sCirce = "org.http4s" %% "http4s-circe" % Versions.http4s @@ -34,5 +35,5 @@ object Dependencies { val refinedCats = "eu.timepit" %% "refined-cats" % Versions.refined val refinedScalacheck = "eu.timepit" %% "refined-scalacheck" % Versions.refined val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.0" - val scalaTest = "org.scalatest" %% "scalatest" % "3.0.8" + val scalaTest = "org.scalatest" %% "scalatest" % "3.1.0-SNAP13" }