Update scalatest to 3.2.19

build.sbt

@@ -93,7 +93,7 @@ lazy val legacy = (project in file("legacy"))
     ),
     libraryDependencies ++= Seq(
       "org.scalactic"        %% "scalactic"              % "3.0.9",
-      "org.scalatest"        %% "scalatest"              % "3.0.9"              % "test",
+      "org.scalatest"        %% "scalatest"              % "3.2.19"             % "test",
       "org.scalacheck"       %% "scalacheck"             % "1.18.1"             % "test",
       "com.github.scopt"     %% "scopt"                  % "4.1.0",
       "org.pegdown"           % "pegdown"                % "1.6.0",

legacy/src/test/scala/org/nomadblacky/scala/samples/akka/http/AkkaHttpSpec.scala

@@ -5,16 +5,16 @@ import akka.http.scaladsl.Http
 import akka.http.scaladsl.model.{HttpRequest, HttpResponse, StatusCodes}
 import akka.stream.ActorMaterializer
 import akka.util.ByteString
-import org.scalatest.FunSpec
 
 import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, Future}
 
 import scala.concurrent.ExecutionContext.Implicits.global
+import org.scalatest.funspec.AnyFunSpec
 
 /** Created by blacky on 17/05/29.
   */
-class AkkaHttpSpec extends FunSpec {
+class AkkaHttpSpec extends AnyFunSpec {
 
   override def suiteName: String = "Akka HTTP"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/akka/streams/AkkaStreamsSpec.scala

@@ -1,14 +1,15 @@
 package org.nomadblacky.scala.samples.akka.streams
 
 import akka.actor.ActorSystem
-import org.scalatest.{FunSpec, Matchers}
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
 /** Akka Streams 非同期ストリーム処理のライブラリ
   *
   * 特徴 + バックプレッシャー … サブスクライバが処理できる量をパブリッシャに送ることで、無駄なく処理ができる。 + リアクティブストリーム … 異なるストリーム処理ツール間でもバックプレッシャを実現できる。 + 非同期 +
   * 直感的なAPI + DSLによるグラフ処理
   */
-class AkkaStreamsSpec extends FunSpec with Matchers {
+class AkkaStreamsSpec extends AnyFunSpec with Matchers {
 
   override def suiteName: String = "Akka Streams"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/ammonite/AmmoniteSpec.scala

@@ -1,11 +1,13 @@
 package org.nomadblacky.scala.samples.ammonite
 
 import ammonite.ops._
-import org.scalatest.{BeforeAndAfterAll, FunSpec, Matchers}
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
 /** http://ammonite.io/#Ammonite-Ops
   */
-class AmmoniteSpec extends FunSpec with Matchers with BeforeAndAfterAll {
+class AmmoniteSpec extends AnyFunSpec with Matchers with BeforeAndAfterAll {
 
   override def suiteName: String = "Ammonite-Ops"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/best_practice/DesignPatternsInScalaSpec.scala

@@ -4,11 +4,12 @@ import java.awt.Point
 import java.io.File
 import java.util.Scanner
 
-import org.scalatest.{FunSpec, Matchers}
 
 import scala.annotation.tailrec
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class DesignPatternsInScalaSpec extends FunSpec with Matchers {
+class DesignPatternsInScalaSpec extends AnyFunSpec with Matchers {
 
   override def suiteName: String = "[BestPractice] Scalaでのデザインパターン"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/best_practice/EffectiveScalaSpec.scala

@@ -2,13 +2,14 @@ package org.nomadblacky.scala.samples.best_practice
 
 import java.util.concurrent.{ConcurrentHashMap, ConcurrentLinkedQueue}
 
-import org.scalatest.{FunSpec, Matchers}
 
 import scala.collection.mutable
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
 /** Effective Scala http://twitter.github.io/effectivescala/index-ja.html
   */
-class EffectiveScalaSpec extends FunSpec with Matchers {
+class EffectiveScalaSpec extends AnyFunSpec with Matchers {
 
   it("関数定義の中で直接パターンマッチを使う") {
     // これは

legacy/src/test/scala/org/nomadblacky/scala/samples/collections/IterableSpec.scala

@@ -1,10 +1,10 @@
 package org.nomadblacky.scala.samples.collections
 
-import org.scalatest.FunSpec
+import org.scalatest.funspec.AnyFunSpec
 
 /** Created by blacky on 17/02/06.
   */
-class IterableSpec extends FunSpec {
+class IterableSpec extends AnyFunSpec {
 
   override def suiteName: String = "Iterable - コレクションの要素をひとつずつ返すトレイト"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/collections/ListSpec.scala

@@ -1,13 +1,13 @@
 package org.nomadblacky.scala.samples.collections
 
-import org.scalatest.FunSpec
 import scala.collection.immutable.List
 import scala.collection.immutable.Nil
 import scala.collection.mutable.ListBuffer
+import org.scalatest.funspec.AnyFunSpec
 
 /** 要素同士を連結するデータ構造のリスト。 順次呼び出しや再帰アクセスに強い。 ランダムアクセスは遅い。
   */
-class ListSpec extends FunSpec {
+class ListSpec extends AnyFunSpec {
 
   override def suiteName: String = "List - 単方向リスト"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/collections/MapSpec.scala

@@ -1,9 +1,9 @@
 package org.nomadblacky.scala.samples.collections
 
-import org.scalatest.FunSpec
 import scala.collection.immutable.Set
+import org.scalatest.funspec.AnyFunSpec
 
-class MapSpec extends FunSpec {
+class MapSpec extends AnyFunSpec {
 
   override def suiteName: String = "Map - キーと値で構成されるコレクション"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/collections/SetSpec.scala

@@ -1,12 +1,12 @@
 package org.nomadblacky.scala.samples.collections
 
-import org.scalatest.FunSpec
+import org.scalatest.funspec.AnyFunSpec
 
 /** 集合 http://docs.scala-lang.org/ja/overviews/collections/sets
   *
   * Created by blacky on 17/03/18.
   */
-class SetSpec extends FunSpec {
+class SetSpec extends AnyFunSpec {
 
   override def suiteName: String = "Set - 重複する要素を含まないコレクション"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/collections/TraversableSpec.scala

@@ -1,14 +1,14 @@
 package org.nomadblacky.scala.samples.collections
 
-import org.scalatest.FunSpec
 
 import scala.collection.mutable.ArrayBuffer
+import org.scalatest.funspec.AnyFunSpec
 
 /** Created by blacky on 17/01/16.
   *
   * Traversable ... 操作可能
   */
-class TraversableSpec extends FunSpec {
+class TraversableSpec extends AnyFunSpec {
 
   override def suiteName: String = "Traversable - コレクションの最上位に位置するトレイト"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/collections/TupleSpec.scala

@@ -1,8 +1,8 @@
 package org.nomadblacky.scala.samples.collections
 
-import org.scalatest.FunSpec
+import org.scalatest.funspec.AnyFunSpec
 
-class TupleSpec extends FunSpec {
+class TupleSpec extends AnyFunSpec {
 
   override def suiteName: String = "Tuple - 任意の複数の値を保持するクラス"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaFormulaSpec.scala

@@ -1,14 +1,14 @@
 package org.nomadblacky.scala.samples.event.understanding_scala
 
-import org.scalatest.FunSpec
 
 import scala.annotation.tailrec
+import org.scalatest.funspec.AnyFunSpec
 
 /** 6/10 Understanding Scala ~Scalaを理解しよう~ https://connpass.com/event/55308/
   *
   * Scalaの実行時の挙動を学ぶ http://kmizu.github.io/understanding_scala/semantics/#/22
   */
-class UnderstandingScalaFormulaSpec extends FunSpec {
+class UnderstandingScalaFormulaSpec extends AnyFunSpec {
 
   override def suiteName: String = "[勉強会] Understanding Scala - Scalaの実行時の挙動を学ぶ"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaImplicitSpec.scala

@@ -1,12 +1,12 @@
 package org.nomadblacky.scala.samples.event.understanding_scala
 
-import org.scalatest.FunSpec
+import org.scalatest.funspec.AnyFunSpec
 
 /** 6/10 Understanding Scala ~Scalaを理解しよう~ https://connpass.com/event/55308/
   *
   * Scalaのimplicit parameterを学ぶ http://kmizu.github.io/understanding_scala/implicit_parameter/#/14
   */
-class UnderstandingScalaImplicitSpec extends FunSpec {
+class UnderstandingScalaImplicitSpec extends AnyFunSpec {
 
   override def suiteName: String = "[勉強会] Understanding Scala - Scalaのimplicit parameterを学ぶ"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaTrapSpec.scala

@@ -1,14 +1,14 @@
 package org.nomadblacky.scala.samples.event.understanding_scala
 
-import org.scalatest.FunSpec
 
 import scala.concurrent.Future
+import org.scalatest.funspec.AnyFunSpec
 
 /** 6/10 Understanding Scala ~Scalaを理解しよう~ https://connpass.com/event/55308/
   *
   * Scalaの謎・落とし穴を学ぶ http://kmizu.github.io/understanding_scala/pitfall/#/7
   */
-class UnderstandingScalaTrapSpec extends FunSpec {
+class UnderstandingScalaTrapSpec extends AnyFunSpec {
 
   override def suiteName: String = "[勉強会] Understanding Scala - Scalaの落とし穴を学ぶ"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaTypeSpec.scala

@@ -3,13 +3,13 @@ package org.nomadblacky.scala.samples.event.understanding_scala
 import java.io.FileInputStream
 import java.util
 
-import org.scalatest.FunSpec
+import org.scalatest.funspec.AnyFunSpec
 
 /** 6/10 Understanding Scala ~Scalaを理解しよう~ https://connpass.com/event/55308/
   *
   * Scalaの型システムを学ぶ http://kmizu.github.io/understanding_scala/type_system/#/14
   */
-class UnderstandingScalaTypeSpec extends FunSpec {
+class UnderstandingScalaTypeSpec extends AnyFunSpec {
 
   override def suiteName: String = "[勉強会] Understanding Scala - Scalaの型システムを学ぶ"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/exceptions/ExceptionSpec.scala

@@ -1,12 +1,12 @@
 package org.nomadblacky.scala.samples.exceptions
 
-import org.scalatest.FunSpec
+import org.scalatest.funspec.AnyFunSpec
 
 /** try-catch-finally
   *
   * try { 式 } catch { case 変数:例外クラスの型 => 例外処理の式 ... } finally { 式 }
   */
-class ExceptionSpec extends FunSpec {
+class ExceptionSpec extends AnyFunSpec {
 
   override def suiteName: String = "例外処理"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/exceptions/OptionSpec.scala

@@ -1,10 +1,11 @@
 package org.nomadblacky.scala.samples.exceptions
 
-import org.scalatest.{FunSpec, Matchers}
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
 /** Created by blacky on 16/12/04.
   */
-class OptionSpec extends FunSpec with Matchers {
+class OptionSpec extends AnyFunSpec with Matchers {
 
   override def suiteName: String = "Option - 値が存在しない可能性があることを表すクラス"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter02/Chapter02Spec.scala

@@ -1,13 +1,13 @@
 package org.nomadblacky.scala.samples.functional.programming.in.scala.chapter02
 
-import org.scalatest.FunSpec
+import org.scalatest.funspec.AnyFunSpec
 
 /** Created by blacky on 17/02/13.
   *
   * Scala関数型デザイン&プログラミング―Scalazコントリビューターによる関数型徹底ガイド
   * https://www.amazon.co.jp/dp/B00WM54V5Q/ref=dp-kindle-redirect?_encoding=UTF8&btkr=1
   */
-class Chapter02Spec extends FunSpec {
+class Chapter02Spec extends AnyFunSpec {
 
   override def suiteName: String = "[FP in Scala] 第2章 Scala関数型プログラミングの準備"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter03/Chapter03Spec.scala

@@ -1,13 +1,13 @@
 package org.nomadblacky.scala.samples.functional.programming.in.scala.chapter03
 
-import org.scalatest.FunSpec
+import org.scalatest.funspec.AnyFunSpec
 
 /** Created by blacky on 17/02/13.
   *
   * Scala関数型デザイン&プログラミング―Scalazコントリビューターによる関数型徹底ガイド
   * https://www.amazon.co.jp/dp/B00WM54V5Q/ref=dp-kindle-redirect?_encoding=UTF8&btkr=1
   */
-class Chapter03Spec extends FunSpec {
+class Chapter03Spec extends AnyFunSpec {
 
   override def suiteName: String = "[FP in Scala] 第3章 関数型プログラミングのデータ構造"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter06/Chapter06Spec.scala

@@ -1,9 +1,10 @@
 package org.nomadblacky.scala.samples.functional.programming.in.scala.chapter06
 
 import org.scalactic.{Equality, TolerantNumerics}
-import org.scalatest.{FunSpec, Matchers}
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class Chapter06Spec extends FunSpec with Matchers {
+class Chapter06Spec extends AnyFunSpec with Matchers {
 
   implicit val doubleEquality: Equality[Double] = TolerantNumerics.tolerantDoubleEquality(0.0001)
 

legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter10/Chapter10Spec.scala

@@ -1,6 +1,6 @@
 package org.nomadblacky.scala.samples.functional.programming.in.scala.chapter10
 
-import org.scalatest.FunSpec
+import org.scalatest.funspec.AnyFunSpec
 
 /** Created by blacky on 17/03/08.
   *
@@ -9,7 +9,7 @@ import org.scalatest.FunSpec
   *
   * Github https://github.com/fpinscala/fpinscala/tree/master/answerkey/monoids
   */
-class Chapter10Spec extends FunSpec {
+class Chapter10Spec extends AnyFunSpec {
 
   override def suiteName: String = "[FP in Scala] 第10章 モノイド"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter11/Chapter11Spec.scala

@@ -1,6 +1,6 @@
 package org.nomadblacky.scala.samples.functional.programming.in.scala.chapter11
 
-import org.scalatest.FunSpec
+import org.scalatest.funspec.AnyFunSpec
 
 /** Created by blacky on 17/04/25.
   *
@@ -9,7 +9,7 @@ import org.scalatest.FunSpec
   *
   * Github https://github.com/fpinscala/fpinscala/tree/master/answerkey/monads
   */
-class Chapter11Spec extends FunSpec {
+class Chapter11Spec extends AnyFunSpec {
 
   override def suiteName: String = "[FP in Scala] 第11章 モナド"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/cats/CatsSpec.scala

@@ -1,9 +1,10 @@
 package org.nomadblacky.scala.samples.libraries.cats
 
 import cats.data.NonEmptyList
-import org.scalatest.{FunSpec, Matchers}
+import org.scalatest.funspec.AnyFunSpec
+import org.scalatest.matchers.should.Matchers
 
-class CatsSpec extends FunSpec with Matchers {
+class CatsSpec extends AnyFunSpec with Matchers {
 
   override def suiteName: String = "[Cats] Catsの基礎"
 

legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/jfreechart/JFreeChartSpec.scala

@@ -5,13 +5,14 @@ import org.jfree.chart.plot.{PiePlot, PlotOrientation}
 import org.jfree.chart.{ChartFactory, ChartUtils, JFreeChart}
 import org.jfree.data.general.DefaultPieDataset
 import org.jfree.data.statistics.HistogramDataset
-import org.scalatest.{BeforeAndAfter, FunSpec}
+import org.scalatest.BeforeAndAfter
 
 import scala.util.Random
+import org.scalatest.funspec.AnyFunSpec
 
 /** Created by blacky on 17/02/26.
   */
-class JFreeChartSpec extends FunSpec with BeforeAndAfter {
+class JFreeChartSpec extends AnyFunSpec with BeforeAndAfter {
 
   override def suiteName: String = "JFreeChart - グラフを描画するJavaライブラリ"