From aa8b1141f89eed50487c5626e498f0e951f60da1 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 14 Nov 2021 22:00:10 +0900 Subject: [PATCH] Update scalatest --- internal/util-collection/src/test/scala/UnitSpec.scala | 5 +++-- internal/util-complete/src/test/scala/UnitSpec.scala | 5 +++-- .../scala/sbt/internal/util/complete/SizeParserSpec.scala | 4 ++-- internal/util-logging/src/test/scala/LogExchangeSpec.scala | 5 +++-- internal/util-logging/src/test/scala/ManagedLoggerSpec.scala | 5 +++-- .../src/test/scala/sbt/internal/util/CleanStringSpec.scala | 4 ++-- .../src/test/scala/sbt/internal/util/ProgressStateSpec.scala | 5 +++-- .../src/test/scala/sbt/internal/util/UTF8DecoderSpec.scala | 4 ++-- .../test/scala/sbt/internal/util/SourcePositionSpec.scala | 4 ++-- main-command/src/test/scala/sbt/MultiParserSpec.scala | 4 ++-- .../src/test/scala/sbt/internal/ClassLoaderCacheTest.scala | 5 +++-- main-settings/src/test/scala/sbt/ScopeDisplaySpec.scala | 4 ++-- main-settings/src/test/scala/sbt/std/TaskConfigSpec.scala | 4 ++-- main-settings/src/test/scala/sbt/std/neg/TaskNegSpec.scala | 4 ++-- main/src/test/scala/sbt/internal/CrossJavaTest.scala | 5 +++-- main/src/test/scala/sbt/internal/FileStampJsonSpec.scala | 4 ++-- main/src/test/scala/sbt/internal/GCMonitorTest.scala | 4 ++-- main/src/test/scala/sbt/internal/InstallSbtnSpec.scala | 4 ++-- .../scala/sbt/internal/graph/rendering/TreeViewTest.scala | 5 +++-- project/Dependencies.scala | 2 +- sbt-app/src/test/scala/sbt/IllegalReferenceSpec.scala | 4 ++-- util-cache/src/test/scala/CacheSpec.scala | 4 ++-- util-cache/src/test/scala/FileInfoSpec.scala | 4 ++-- util-cache/src/test/scala/SingletonCacheSpec.scala | 4 ++-- util-tracking/src/test/scala/sbt/util/TrackedSpec.scala | 4 ++-- .../sbt/internal/inc/IvyBridgeProviderSpecification.scala | 3 ++- 26 files changed, 59 insertions(+), 50 deletions(-) diff --git a/internal/util-collection/src/test/scala/UnitSpec.scala b/internal/util-collection/src/test/scala/UnitSpec.scala index ed582c3bb..912b39d16 100644 --- a/internal/util-collection/src/test/scala/UnitSpec.scala +++ b/internal/util-collection/src/test/scala/UnitSpec.scala @@ -7,6 +7,7 @@ package sbt.internal.util -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -abstract class UnitSpec extends FlatSpec with Matchers +abstract class UnitSpec extends AnyFlatSpec with Matchers diff --git a/internal/util-complete/src/test/scala/UnitSpec.scala b/internal/util-complete/src/test/scala/UnitSpec.scala index ed582c3bb..912b39d16 100644 --- a/internal/util-complete/src/test/scala/UnitSpec.scala +++ b/internal/util-complete/src/test/scala/UnitSpec.scala @@ -7,6 +7,7 @@ package sbt.internal.util -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -abstract class UnitSpec extends FlatSpec with Matchers +abstract class UnitSpec extends AnyFlatSpec with Matchers diff --git a/internal/util-complete/src/test/scala/sbt/internal/util/complete/SizeParserSpec.scala b/internal/util-complete/src/test/scala/sbt/internal/util/complete/SizeParserSpec.scala index 521f2d10a..6d68fdae9 100644 --- a/internal/util-complete/src/test/scala/sbt/internal/util/complete/SizeParserSpec.scala +++ b/internal/util-complete/src/test/scala/sbt/internal/util/complete/SizeParserSpec.scala @@ -7,9 +7,9 @@ package sbt.internal.util.complete -import org.scalatest.FlatSpec +import org.scalatest.flatspec.AnyFlatSpec -class SizeParserSpec extends FlatSpec { +class SizeParserSpec extends AnyFlatSpec { "SizeParser" should "handle raw bytes" in { assert(Parser.parse(str = "123456", SizeParser.value) == Right(123456L)) } diff --git a/internal/util-logging/src/test/scala/LogExchangeSpec.scala b/internal/util-logging/src/test/scala/LogExchangeSpec.scala index 3a26b44ab..7e3e44131 100644 --- a/internal/util-logging/src/test/scala/LogExchangeSpec.scala +++ b/internal/util-logging/src/test/scala/LogExchangeSpec.scala @@ -9,9 +9,10 @@ package sbt.util import sbt.internal.util._ -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class LogExchangeSpec extends FlatSpec with Matchers { +class LogExchangeSpec extends AnyFlatSpec with Matchers { import LogExchange._ checkTypeTag("stringTypeTagThrowable", stringTypeTagThrowable, StringTypeTag.fast[Throwable]) diff --git a/internal/util-logging/src/test/scala/ManagedLoggerSpec.scala b/internal/util-logging/src/test/scala/ManagedLoggerSpec.scala index d8b07e310..9a0ecd2c7 100644 --- a/internal/util-logging/src/test/scala/ManagedLoggerSpec.scala +++ b/internal/util-logging/src/test/scala/ManagedLoggerSpec.scala @@ -7,13 +7,14 @@ package sbt.internal.util -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import sbt.util._ import java.io.{ File, PrintWriter } import sbt.io.Using import scala.annotation.nowarn -class ManagedLoggerSpec extends FlatSpec with Matchers { +class ManagedLoggerSpec extends AnyFlatSpec with Matchers { val context = LoggerContext(useLog4J = true) @nowarn val asyncStdout = new ConsoleAppenderFromLog4J("asyncStdout", LogExchange.asyncStdout) diff --git a/internal/util-logging/src/test/scala/sbt/internal/util/CleanStringSpec.scala b/internal/util-logging/src/test/scala/sbt/internal/util/CleanStringSpec.scala index f734923a6..ee1abdd66 100644 --- a/internal/util-logging/src/test/scala/sbt/internal/util/CleanStringSpec.scala +++ b/internal/util-logging/src/test/scala/sbt/internal/util/CleanStringSpec.scala @@ -7,9 +7,9 @@ package sbt.internal.util -import org.scalatest.FlatSpec +import org.scalatest.flatspec.AnyFlatSpec -class CleanStringSpec extends FlatSpec { +class CleanStringSpec extends AnyFlatSpec { "EscHelpers" should "not modify normal strings" in { val cleanString = s"1234" assert(EscHelpers.stripColorsAndMoves(cleanString) == cleanString) diff --git a/internal/util-logging/src/test/scala/sbt/internal/util/ProgressStateSpec.scala b/internal/util-logging/src/test/scala/sbt/internal/util/ProgressStateSpec.scala index 4c3ae123a..909c64968 100644 --- a/internal/util-logging/src/test/scala/sbt/internal/util/ProgressStateSpec.scala +++ b/internal/util-logging/src/test/scala/sbt/internal/util/ProgressStateSpec.scala @@ -9,12 +9,13 @@ package sbt.internal.util import java.io.{ File, PrintStream } -import org.scalatest.{ BeforeAndAfterAll, FlatSpec } +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.BeforeAndAfterAll import sbt.internal.util.Terminal.SimpleTerminal import scala.io.Source -class ProgressStateSpec extends FlatSpec with BeforeAndAfterAll { +class ProgressStateSpec extends AnyFlatSpec with BeforeAndAfterAll { private lazy val fileIn = new File("/tmp/tmp.txt") private lazy val fileOut = Source.fromFile("/tmp/tmp.txt") diff --git a/internal/util-logging/src/test/scala/sbt/internal/util/UTF8DecoderSpec.scala b/internal/util-logging/src/test/scala/sbt/internal/util/UTF8DecoderSpec.scala index 957a95b4e..06c2e711b 100644 --- a/internal/util-logging/src/test/scala/sbt/internal/util/UTF8DecoderSpec.scala +++ b/internal/util-logging/src/test/scala/sbt/internal/util/UTF8DecoderSpec.scala @@ -9,10 +9,10 @@ package sbt.internal.util import java.io.InputStream import java.nio.charset.Charset -import org.scalatest.FlatSpec +import org.scalatest.flatspec.AnyFlatSpec import java.util.concurrent.LinkedBlockingQueue -class UTF8DecoderSpec extends FlatSpec { +class UTF8DecoderSpec extends AnyFlatSpec { val decoder = Charset.forName("UTF-8").newDecoder "ascii characters" should "not be modified" in { val inputStream = new InputStream { diff --git a/internal/util-position/src/test/scala/sbt/internal/util/SourcePositionSpec.scala b/internal/util-position/src/test/scala/sbt/internal/util/SourcePositionSpec.scala index 93ed9fb96..60206dcc6 100644 --- a/internal/util-position/src/test/scala/sbt/internal/util/SourcePositionSpec.scala +++ b/internal/util-position/src/test/scala/sbt/internal/util/SourcePositionSpec.scala @@ -7,9 +7,9 @@ package sbt.internal.util -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec -class SourcePositionSpec extends FlatSpec { +class SourcePositionSpec extends AnyFlatSpec { "SourcePosition()" should "return a sane SourcePosition" in { val filename = "SourcePositionSpec.scala" val lineNumber = 16 diff --git a/main-command/src/test/scala/sbt/MultiParserSpec.scala b/main-command/src/test/scala/sbt/MultiParserSpec.scala index 88aea432d..2e8b54584 100644 --- a/main-command/src/test/scala/sbt/MultiParserSpec.scala +++ b/main-command/src/test/scala/sbt/MultiParserSpec.scala @@ -8,7 +8,7 @@ package sbt import scala.concurrent.duration._ -import org.scalatest.FlatSpec +import org.scalatest.flatspec.AnyFlatSpec import sbt.internal.util.complete.Parser object MultiParserSpec { @@ -22,7 +22,7 @@ object MultiParserSpec { } } import sbt.MultiParserSpec._ -class MultiParserSpec extends FlatSpec { +class MultiParserSpec extends AnyFlatSpec { "parsing" should "parse single commands" in { assert(";foo".parse == Seq("foo")) assert("; foo".parse == Seq("foo")) diff --git a/main-command/src/test/scala/sbt/internal/ClassLoaderCacheTest.scala b/main-command/src/test/scala/sbt/internal/ClassLoaderCacheTest.scala index eec114f40..089bbd034 100644 --- a/main-command/src/test/scala/sbt/internal/ClassLoaderCacheTest.scala +++ b/main-command/src/test/scala/sbt/internal/ClassLoaderCacheTest.scala @@ -10,7 +10,8 @@ package sbt.internal import java.io.File import java.nio.file.Files -import org.scalatest.{ FlatSpec, Matchers } +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import sbt.internal.classpath.ClassLoaderCache import sbt.io.IO @@ -19,7 +20,7 @@ object ClassLoaderCacheTest { def get(classpath: Seq[File]): ClassLoader = c(classpath.toList) } } -class ClassLoaderCacheTest extends FlatSpec with Matchers { +class ClassLoaderCacheTest extends AnyFlatSpec with Matchers { import ClassLoaderCacheTest._ private def withCache[R](f: ClassLoaderCache => R): R = { val cache = new ClassLoaderCache(ClassLoader.getSystemClassLoader) diff --git a/main-settings/src/test/scala/sbt/ScopeDisplaySpec.scala b/main-settings/src/test/scala/sbt/ScopeDisplaySpec.scala index c1af590b4..e38fecdff 100644 --- a/main-settings/src/test/scala/sbt/ScopeDisplaySpec.scala +++ b/main-settings/src/test/scala/sbt/ScopeDisplaySpec.scala @@ -7,12 +7,12 @@ package sbt -import org.scalatest.FlatSpec +import org.scalatest.flatspec.AnyFlatSpec import sbt.internal.util.{ AttributeKey, AttributeMap } import sbt.io.syntax.file import scala.annotation.nowarn -class ScopeDisplaySpec extends FlatSpec { +class ScopeDisplaySpec extends AnyFlatSpec { val project = ProjectRef(file("foo/bar"), "bar") val mangledName = "bar_slash_blah_blah_blah" diff --git a/main-settings/src/test/scala/sbt/std/TaskConfigSpec.scala b/main-settings/src/test/scala/sbt/std/TaskConfigSpec.scala index e43b655a6..210284215 100644 --- a/main-settings/src/test/scala/sbt/std/TaskConfigSpec.scala +++ b/main-settings/src/test/scala/sbt/std/TaskConfigSpec.scala @@ -7,12 +7,12 @@ package sbt.std -import org.scalatest.{ TestData, fixture } +import org.scalatest.{ TestData, fixture, funsuite } import sbt.std.TestUtil._ import scala.tools.reflect.{ FrontEnd, ToolBoxError } -class TaskConfigSpec extends fixture.FunSuite with fixture.TestDataFixture { +class TaskConfigSpec extends funsuite.FixtureAnyFunSuite with fixture.TestDataFixture { private def expectError( errorSnippet: String, compileOptions: String = "", diff --git a/main-settings/src/test/scala/sbt/std/neg/TaskNegSpec.scala b/main-settings/src/test/scala/sbt/std/neg/TaskNegSpec.scala index 0e08b5e96..e2d214657 100644 --- a/main-settings/src/test/scala/sbt/std/neg/TaskNegSpec.scala +++ b/main-settings/src/test/scala/sbt/std/neg/TaskNegSpec.scala @@ -8,11 +8,11 @@ package sbt.std.neg import scala.tools.reflect.ToolBoxError -import org.scalatest.{ TestData, fixture } +import org.scalatest.{ TestData, fixture, funsuite } import sbt.std.{ TaskLinterDSLFeedback, TestUtil } import sbt.std.TestUtil._ -class TaskNegSpec extends fixture.FunSuite with fixture.TestDataFixture { +class TaskNegSpec extends funsuite.FixtureAnyFunSuite with fixture.TestDataFixture { def expectError( errorSnippet: String, compileOptions: String = "", diff --git a/main/src/test/scala/sbt/internal/CrossJavaTest.scala b/main/src/test/scala/sbt/internal/CrossJavaTest.scala index cd0caa645..c884c31c8 100644 --- a/main/src/test/scala/sbt/internal/CrossJavaTest.scala +++ b/main/src/test/scala/sbt/internal/CrossJavaTest.scala @@ -8,11 +8,12 @@ package sbt package internal -import org.scalatest._ +import org.scalatest.diagrams.Diagrams +import org.scalatest.funsuite.AnyFunSuite import sbt.internal.CrossJava.JavaDiscoverConfig._ import scala.collection.immutable.ListMap -class CrossJavaTest extends FunSuite with DiagrammedAssertions { +class CrossJavaTest extends AnyFunSuite with Diagrams { test("The Java home selector should select the most recent") { assert( List("jdk1.8.0.jdk", "jdk1.8.0_121.jdk", "jdk1.8.0_45.jdk") diff --git a/main/src/test/scala/sbt/internal/FileStampJsonSpec.scala b/main/src/test/scala/sbt/internal/FileStampJsonSpec.scala index fe4dacb53..bf0f127f3 100644 --- a/main/src/test/scala/sbt/internal/FileStampJsonSpec.scala +++ b/main/src/test/scala/sbt/internal/FileStampJsonSpec.scala @@ -9,13 +9,13 @@ package sbt.internal import java.nio.file.{ Path, Paths } -import org.scalatest.FlatSpec +import org.scalatest.flatspec.AnyFlatSpec import sbt.nio.FileStamp import sbt.nio.FileStamp.Formats import sjsonnew.JsonFormat import sjsonnew.support.scalajson.unsafe.Converter -class FileStampJsonSpec extends FlatSpec { +class FileStampJsonSpec extends AnyFlatSpec { "file hashes" should "be serializable" in { val hashes = Seq( Paths.get("foo") -> FileStamp.hash("bar"), diff --git a/main/src/test/scala/sbt/internal/GCMonitorTest.scala b/main/src/test/scala/sbt/internal/GCMonitorTest.scala index 02356e0a3..d646b88f1 100644 --- a/main/src/test/scala/sbt/internal/GCMonitorTest.scala +++ b/main/src/test/scala/sbt/internal/GCMonitorTest.scala @@ -9,12 +9,12 @@ package sbt.internal import java.util.concurrent.atomic.AtomicReference -import org.scalatest.FunSuite +import org.scalatest.funsuite.AnyFunSuite import scala.collection.mutable.ListBuffer import scala.concurrent.duration._ -class GCMonitorTest extends FunSuite { +class GCMonitorTest extends AnyFunSuite { class TestMonitor extends GCMonitorBase { val loggedTotals = ListBuffer.empty[Long] override protected val window = 10.seconds diff --git a/main/src/test/scala/sbt/internal/InstallSbtnSpec.scala b/main/src/test/scala/sbt/internal/InstallSbtnSpec.scala index 3580007ed..626faa679 100644 --- a/main/src/test/scala/sbt/internal/InstallSbtnSpec.scala +++ b/main/src/test/scala/sbt/internal/InstallSbtnSpec.scala @@ -13,10 +13,10 @@ import java.lang.ProcessBuilder import java.lang.ProcessBuilder.Redirect import java.nio.file.{ Files, Path } import java.util.concurrent.TimeUnit -import org.scalatest.FlatSpec +import org.scalatest.flatspec.AnyFlatSpec import sbt.io.IO -class InstallSbtnSpec extends FlatSpec { +class InstallSbtnSpec extends AnyFlatSpec { private def withTemp[R](ext: String)(f: Path => R): R = { val tmp = Files.createTempFile("sbt-1.4.1-", ext) try f(tmp) diff --git a/main/src/test/scala/sbt/internal/graph/rendering/TreeViewTest.scala b/main/src/test/scala/sbt/internal/graph/rendering/TreeViewTest.scala index 6e1a96a8f..6b291b4e3 100644 --- a/main/src/test/scala/sbt/internal/graph/rendering/TreeViewTest.scala +++ b/main/src/test/scala/sbt/internal/graph/rendering/TreeViewTest.scala @@ -7,11 +7,12 @@ package sbt.internal.graph.rendering -import org.scalatest.{ FlatSpec, Matchers } +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import sbt.internal.graph.rendering.TreeView.createJson import sbt.internal.graph.{ GraphModuleId, Module, ModuleGraph, ModuleModel } -class TreeViewTest extends FlatSpec with Matchers { +class TreeViewTest extends AnyFlatSpec with Matchers { val modA = GraphModuleId("orgA", "nameA", "1.0") val modB = GraphModuleId("orgB", "nameB", "2.0") val modC = GraphModuleId("orgC", "nameC", "3.0") diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 974fa291b..7dc4fb126 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -94,7 +94,7 @@ object Dependencies { val jline3Reader = "org.jline" % "jline-reader" % jline3Version val jline3Builtins = "org.jline" % "jline-builtins" % jline3Version val jansi = "org.fusesource.jansi" % "jansi" % "2.1.0" - val scalatest = "org.scalatest" %% "scalatest" % "3.0.8" + val scalatest = "org.scalatest" %% "scalatest" % "3.2.10" val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.0" val junit = "junit" % "junit" % "4.13.1" val scalaVerify = "com.eed3si9n.verify" %% "verify" % "1.0.0" diff --git a/sbt-app/src/test/scala/sbt/IllegalReferenceSpec.scala b/sbt-app/src/test/scala/sbt/IllegalReferenceSpec.scala index e94817b57..de4dfb96c 100644 --- a/sbt-app/src/test/scala/sbt/IllegalReferenceSpec.scala +++ b/sbt-app/src/test/scala/sbt/IllegalReferenceSpec.scala @@ -8,11 +8,11 @@ package sbt import org.scalatest -import org.scalatest.{ TestData, fixture } +import org.scalatest.{ TestData, fixture, funsuite } import scala.tools.reflect.{ FrontEnd, ToolBoxError } -class IllegalReferenceSpec extends fixture.FunSuite with fixture.TestDataFixture { +class IllegalReferenceSpec extends funsuite.FixtureAnyFunSuite with fixture.TestDataFixture { private def toolboxClasspath(td: TestData): String = td.configMap.get("sbt.server.classpath") match { case Some(s: String) => s diff --git a/util-cache/src/test/scala/CacheSpec.scala b/util-cache/src/test/scala/CacheSpec.scala index 587efed32..70d0f6245 100644 --- a/util-cache/src/test/scala/CacheSpec.scala +++ b/util-cache/src/test/scala/CacheSpec.scala @@ -12,9 +12,9 @@ import sbt.io.syntax._ import CacheImplicits._ -import org.scalatest.FlatSpec +import org.scalatest.flatspec.AnyFlatSpec -class CacheSpec extends FlatSpec { +class CacheSpec extends AnyFlatSpec { "A cache" should "NOT throw an exception if read without being written previously" in { testCache[String, Int] { diff --git a/util-cache/src/test/scala/FileInfoSpec.scala b/util-cache/src/test/scala/FileInfoSpec.scala index cfaf3af37..5ea495195 100644 --- a/util-cache/src/test/scala/FileInfoSpec.scala +++ b/util-cache/src/test/scala/FileInfoSpec.scala @@ -9,10 +9,10 @@ package sbt.util import sjsonnew.shaded.scalajson.ast.unsafe._ import sjsonnew._, support.scalajson.unsafe._ -import org.scalatest.FlatSpec +import org.scalatest.flatspec.AnyFlatSpec import sbt.io.IO -class FileInfoSpec extends FlatSpec { +class FileInfoSpec extends AnyFlatSpec { val file = new java.io.File(".").getAbsoluteFile val fileInfo: ModifiedFileInfo = FileModified(file, IO.getModifiedTimeOrZero(file)) val filesInfo = FilesInfo(Set(fileInfo)) diff --git a/util-cache/src/test/scala/SingletonCacheSpec.scala b/util-cache/src/test/scala/SingletonCacheSpec.scala index 568a5e2aa..ab6de3adb 100644 --- a/util-cache/src/test/scala/SingletonCacheSpec.scala +++ b/util-cache/src/test/scala/SingletonCacheSpec.scala @@ -13,9 +13,9 @@ import sbt.io.syntax._ import CacheImplicits._ import sjsonnew.{ Builder, deserializationError, JsonFormat, Unbuilder } -import org.scalatest.FlatSpec +import org.scalatest.flatspec.AnyFlatSpec -class SingletonCacheSpec extends FlatSpec { +class SingletonCacheSpec extends AnyFlatSpec { case class ComplexType(val x: Int, y: String, z: List[Int]) object ComplexType { diff --git a/util-tracking/src/test/scala/sbt/util/TrackedSpec.scala b/util-tracking/src/test/scala/sbt/util/TrackedSpec.scala index f456931f0..1298adfb7 100644 --- a/util-tracking/src/test/scala/sbt/util/TrackedSpec.scala +++ b/util-tracking/src/test/scala/sbt/util/TrackedSpec.scala @@ -7,7 +7,7 @@ package sbt.util -import org.scalatest.FlatSpec +import org.scalatest.flatspec.AnyFlatSpec import sbt.io.IO import sbt.io.syntax._ import sbt.util.CacheImplicits._ @@ -15,7 +15,7 @@ import sjsonnew.{ Builder, JsonWriter } import scala.concurrent.Promise -class TrackedSpec extends FlatSpec { +class TrackedSpec extends AnyFlatSpec { "lastOutput" should "store the last output" in { withStore { store => val value = 5 diff --git a/zinc-lm-integration/src/test/scala/sbt/internal/inc/IvyBridgeProviderSpecification.scala b/zinc-lm-integration/src/test/scala/sbt/internal/inc/IvyBridgeProviderSpecification.scala index a4c30bf0c..e465c397a 100644 --- a/zinc-lm-integration/src/test/scala/sbt/internal/inc/IvyBridgeProviderSpecification.scala +++ b/zinc-lm-integration/src/test/scala/sbt/internal/inc/IvyBridgeProviderSpecification.scala @@ -17,6 +17,7 @@ import sbt.librarymanagement.ivy._ import sbt.util.Logger import xsbti.compile.CompilerBridgeProvider import org.scalatest._ +import org.scalatest.matchers.should.Matchers /** * Base class for test suites that must be able to fetch and compile the compiler bridge. @@ -24,7 +25,7 @@ import org.scalatest._ * This is a very good example on how to instantiate the compiler bridge provider. */ abstract class IvyBridgeProviderSpecification - extends fixture.FlatSpec + extends flatspec.FixtureAnyFlatSpec with fixture.TestDataFixture with Matchers { def currentBase: File = new File(".")