diff --git a/pom.xml b/pom.xml index 1e18dee..1ef0c6e 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ nl.knaw.dans.shared dans-scala-app-project - 6.0.1 + 6.0.2 4.0.0 nl.knaw.dans.easy diff --git a/src/test/scala/nl.knaw.dans.easy.springfield/AddSubtitlesSpec.scala b/src/test/scala/nl.knaw.dans.easy.springfield/AddSubtitlesSpec.scala index 896880a..3fd2c3d 100644 --- a/src/test/scala/nl.knaw.dans.easy.springfield/AddSubtitlesSpec.scala +++ b/src/test/scala/nl.knaw.dans.easy.springfield/AddSubtitlesSpec.scala @@ -18,9 +18,11 @@ package nl.knaw.dans.easy.springfield import java.net.URI import java.nio.file.{ Path, Paths } -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class AddSubtitlesSpec extends FlatSpec with Matchers with CustomMatchers with AddSubtitles with Smithers2 { + +class AddSubtitlesSpec extends AnyFlatSpec with Matchers with CustomMatchers with AddSubtitles with Smithers2 { override val springFieldDataDir: Path = Paths.get("/data/dansstreaming") override val smithers2BaseUri: URI = new URI("http://localhost:8080/smithers2/") override val smithers2ConnectionTimeoutMs: Int = 100000 diff --git a/src/test/scala/nl.knaw.dans.easy.springfield/ReadmeSpec.scala b/src/test/scala/nl.knaw.dans.easy.springfield/ReadmeSpec.scala index f11bbe0..4b4382c 100644 --- a/src/test/scala/nl.knaw.dans.easy.springfield/ReadmeSpec.scala +++ b/src/test/scala/nl.knaw.dans.easy.springfield/ReadmeSpec.scala @@ -19,9 +19,10 @@ import java.io.{ ByteArrayOutputStream, File } import java.nio.file.Paths import org.apache.commons.configuration.PropertiesConfiguration -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class ReadmeSpec extends FlatSpec with Matchers with CustomMatchers { +class ReadmeSpec extends AnyFlatSpec with Matchers with CustomMatchers { val mockedConfigurationProperties = new PropertiesConfiguration() { setDelimiterParsingDisabled(true) diff --git a/src/test/scala/nl.knaw.dans.easy.springfield/TestSupportFixture.scala b/src/test/scala/nl.knaw.dans.easy.springfield/TestSupportFixture.scala index e02438b..9ae75a9 100644 --- a/src/test/scala/nl.knaw.dans.easy.springfield/TestSupportFixture.scala +++ b/src/test/scala/nl.knaw.dans.easy.springfield/TestSupportFixture.scala @@ -15,6 +15,8 @@ */ package nl.knaw.dans.easy.springfield -import org.scalatest.{ FlatSpec, Matchers, OneInstancePerTest } +import org.scalatest.OneInstancePerTest +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -trait TestSupportFixture extends FlatSpec with Matchers with OneInstancePerTest +trait TestSupportFixture extends AnyFlatSpec with Matchers with OneInstancePerTest