fix scalatest warnings

mkows · Apr 2, 2020 · a6e7125 · a6e7125
1 parent 9263317
commit a6e7125
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 17 deletions.
diff --git a/cli-git/src/test/scala/giter8/GitRepositoryTest.scala b/cli-git/src/test/scala/giter8/GitRepositoryTest.scala
@@ -1,9 +1,10 @@
 package giter8
 
 import java.io.File
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class GitRepositoryTest extends FlatSpec with Matchers {
+class GitRepositoryTest extends AnyFlatSpec with Matchers {
 
   "JGit" should "resolve repo name correctly" in {
     val testCases: Map[String, GitRepository] = Map(

diff --git a/cli-git/src/test/scala/giter8/GitTest.scala b/cli-git/src/test/scala/giter8/GitTest.scala
@@ -6,12 +6,14 @@ import giter8.Git.{NoBranchError, NoTagError}
 import giter8.GitInteractor.TransportError
 import giter8.GitRepository.{GitHub, Local, Remote}
 import giter8.Ref.{Branch, Tag}
-import org.scalatest.{EitherValues, FlatSpec, Matchers, TryValues}
+import org.scalatest.{EitherValues, TryValues}
 import org.scalamock.scalatest.MockFactory
 
 import scala.util.{Failure, Success, Try}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class GitTest extends FlatSpec with Matchers with EitherValues with TryValues with MockFactory {
+class GitTest extends AnyFlatSpec with Matchers with EitherValues with TryValues with MockFactory {
   trait TestFixture {
     var directoryWasCleaned           = false
     var directoryWasCopied            = false

diff --git a/cli-git/src/test/scala/giter8/JGitInteractorTest.scala b/cli-git/src/test/scala/giter8/JGitInteractorTest.scala
@@ -4,11 +4,13 @@ import java.io.File
 
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.{Git => JGit}
-import org.scalatest.{BeforeAndAfter, FlatSpec, Matchers, TryValues}
+import org.scalatest.{BeforeAndAfter, TryValues}
 
 import scala.collection.JavaConverters._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class JGitInteractorTest extends FlatSpec with Matchers with BeforeAndAfter with TryValues {
+class JGitInteractorTest extends AnyFlatSpec with Matchers with BeforeAndAfter with TryValues {
   import TestFileHelpers._
 
   implicit class RichFile(file: File) {

diff --git a/library/src/test/scala/giter8/IntegrationTest.scala b/library/src/test/scala/giter8/IntegrationTest.scala
@@ -2,10 +2,11 @@ package giter8
 
 import java.io.File
 
-import org.scalatest.{FlatSpec, Matchers}
 import G8._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class IntegrationTest extends FlatSpec with IntegrationTestHelpers with Matchers {
+class IntegrationTest extends AnyFlatSpec with IntegrationTestHelpers with Matchers {
   import TestFileHelpers._
 
   "Giter8" should "treat sources root as template root" in testCase {

diff --git a/library/src/test/scala/giter8/JGitIgnoreTest.scala b/library/src/test/scala/giter8/JGitIgnoreTest.scala
@@ -3,11 +3,11 @@ package giter8
 import java.io.ByteArrayInputStream
 import java.net.URI
 
-import org.scalatest.{FlatSpec, Matchers}
-
 import scala.language.implicitConversions
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class JGitIgnoreTest extends FlatSpec with Matchers {
+class JGitIgnoreTest extends AnyFlatSpec with Matchers {
 
   implicit def toURI(s: String): URI = new URI(s)
 

diff --git a/library/src/test/scala/giter8/MavenTest.scala b/library/src/test/scala/giter8/MavenTest.scala
@@ -17,9 +17,11 @@
 
 package giter8
 
-import org.scalatest.{EitherValues, FlatSpec, Matchers}
+import org.scalatest.EitherValues
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-final class MavenTest extends FlatSpec with Matchers with EitherValues {
+final class MavenTest extends AnyFlatSpec with Matchers with EitherValues {
 
   "Maven" should "resolve the latest version when found" in {
     val xml =

diff --git a/library/src/test/scala/giter8/SampleTemplatesIntegrationTest.scala b/library/src/test/scala/giter8/SampleTemplatesIntegrationTest.scala
@@ -2,10 +2,10 @@ package giter8
 
 import java.io.File
 
-import org.scalatest.FunSuite
 import G8._
+import org.scalatest.funsuite.AnyFunSuite
 
-class SampleTemplatesIntegrationTest extends FunSuite with IntegrationTestHelpers {
+class SampleTemplatesIntegrationTest extends AnyFunSuite with IntegrationTestHelpers {
   import TestFileHelpers.tempDirectory
 
   case class TestCase(name: String, template: File, output: File)

diff --git a/library/src/test/scala/giter8/VerbatimTest.scala b/library/src/test/scala/giter8/VerbatimTest.scala
@@ -2,9 +2,10 @@ package giter8
 
 import java.io.File
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class VerbatimTest extends FlatSpec with Matchers {
+class VerbatimTest extends AnyFlatSpec with Matchers {
 
   "G8" should "ignore file based on extension" in {
     G8.verbatim(new File("/myProject/public/fr/index.html"), Map("verbatim" -> "*.html"), new File("/")) shouldBe true