From 070e9c003b654a918ad4dc2bd9540190edf597d7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 18 Sep 2024 18:52:54 +0000 Subject: [PATCH 1/2] Applied Scalafix rule(s) https://raw.githubusercontent.com/scalatest/autofix/e4de53fa40fac423bd64d165ff36bde38ce52388/3.1.x/rules/src/main/scala/org/scalatest/autofix/v3_1_x/RewriteDeprecatedNames.scala See https://github.com/scalatest/autofix/blob/master/3.1.x/README.md for details --- .../nomadblacky/scala/samples/akka/http/AkkaHttpSpec.scala | 4 ++-- .../scala/samples/akka/streams/AkkaStreamsSpec.scala | 5 +++-- .../nomadblacky/scala/samples/ammonite/AmmoniteSpec.scala | 6 ++++-- .../samples/best_practice/DesignPatternsInScalaSpec.scala | 5 +++-- .../scala/samples/best_practice/EffectiveScalaSpec.scala | 5 +++-- .../scala/samples/collections/IterableSpec.scala | 4 ++-- .../nomadblacky/scala/samples/collections/ListSpec.scala | 4 ++-- .../org/nomadblacky/scala/samples/collections/MapSpec.scala | 4 ++-- .../org/nomadblacky/scala/samples/collections/SetSpec.scala | 4 ++-- .../scala/samples/collections/TraversableSpec.scala | 4 ++-- .../nomadblacky/scala/samples/collections/TupleSpec.scala | 4 ++-- .../understanding_scala/UnderstandingScalaFormulaSpec.scala | 4 ++-- .../UnderstandingScalaImplicitSpec.scala | 4 ++-- .../understanding_scala/UnderstandingScalaTrapSpec.scala | 4 ++-- .../understanding_scala/UnderstandingScalaTypeSpec.scala | 4 ++-- .../scala/samples/exceptions/ExceptionSpec.scala | 4 ++-- .../nomadblacky/scala/samples/exceptions/OptionSpec.scala | 5 +++-- .../programming/in/scala/chapter02/Chapter02Spec.scala | 4 ++-- .../programming/in/scala/chapter03/Chapter03Spec.scala | 4 ++-- .../programming/in/scala/chapter06/Chapter06Spec.scala | 5 +++-- .../programming/in/scala/chapter10/Chapter10Spec.scala | 4 ++-- .../programming/in/scala/chapter11/Chapter11Spec.scala | 4 ++-- .../nomadblacky/scala/samples/libraries/cats/CatsSpec.scala | 5 +++-- .../scala/samples/libraries/jfreechart/JFreeChartSpec.scala | 5 +++-- .../scala/samples/libraries/scalaz/DisjunctionSpec.scala | 4 ++-- .../scala/samples/libraries/scalaz/NonEmptyListSpec.scala | 4 ++-- .../samples/libraries/scalikejdbc/ScalikeJDBCSpec.scala | 4 +++- .../libraries/scalikejdbc/ScalikeJDBCUnitTestSpec.scala | 6 ++++-- .../scala/samples/libraries/scopt/ScoptSpec.scala | 4 ++-- .../nomadblacky/scala/samples/nlp100/Chapter01Spec.scala | 5 +++-- .../nomadblacky/scala/samples/nlp100/Chapter02Spec.scala | 5 +++-- .../samples/parsercombinator/ParserCombinatorSpec.scala | 4 ++-- .../org/nomadblacky/scala/samples/play/ws/PlayWSSpec.scala | 5 +++-- .../scala/org/nomadblacky/scala/samples/s99/S99Spec.scala | 5 +++-- .../scala/org/nomadblacky/scala/samples/scala/JVMSpec.scala | 5 +++-- .../org/nomadblacky/scala/samples/scala/TypeClassSpec.scala | 4 ++-- .../nomadblacky/scala/samples/scala/TypeParameterSpec.scala | 4 ++-- .../samples/scala_kansai/y2018/N01PatternMatching.scala | 5 +++-- .../scala/samples/scala_kansai/y2018/N02ForSyntax.scala | 5 +++-- .../nomadblacky/scala/samples/testing/ScalaCheckSpec.scala | 5 +++-- .../nomadblacky/scala/samples/with_java/WithJavaSpec.scala | 5 +++-- .../scala/org/nomadblacky/scala/samples/xml/XmlSpec.scala | 4 ++-- .../scala/org/nomadblacky/scala/reporter/UsingSpec.scala | 5 +++-- 43 files changed, 108 insertions(+), 85 deletions(-) diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/akka/http/AkkaHttpSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/akka/http/AkkaHttpSpec.scala index 6b4e7b04..e91c36fa 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/akka/http/AkkaHttpSpec.scala +++ b/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" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/akka/streams/AkkaStreamsSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/akka/streams/AkkaStreamsSpec.scala index 5ca51ed3..755a0b29 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/akka/streams/AkkaStreamsSpec.scala +++ b/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" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/ammonite/AmmoniteSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/ammonite/AmmoniteSpec.scala index fe95e394..e504a15f 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/ammonite/AmmoniteSpec.scala +++ b/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" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/best_practice/DesignPatternsInScalaSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/best_practice/DesignPatternsInScalaSpec.scala index 402e6d33..b3f0a03f 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/best_practice/DesignPatternsInScalaSpec.scala +++ b/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でのデザインパターン" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/best_practice/EffectiveScalaSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/best_practice/EffectiveScalaSpec.scala index 790275cc..f7ebd5b6 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/best_practice/EffectiveScalaSpec.scala +++ b/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("関数定義の中で直接パターンマッチを使う") { // これは diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/IterableSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/IterableSpec.scala index b4ae299e..a017eddc 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/IterableSpec.scala +++ b/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 - コレクションの要素をひとつずつ返すトレイト" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/ListSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/ListSpec.scala index d3fd602c..40fe67c3 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/ListSpec.scala +++ b/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 - 単方向リスト" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/MapSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/MapSpec.scala index 756632f3..11a357c0 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/MapSpec.scala +++ b/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 - キーと値で構成されるコレクション" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/SetSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/SetSpec.scala index 971b1f31..8e17bf5c 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/SetSpec.scala +++ b/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 - 重複する要素を含まないコレクション" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/TraversableSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/TraversableSpec.scala index db2747bc..3f323b36 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/TraversableSpec.scala +++ b/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 - コレクションの最上位に位置するトレイト" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/TupleSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/TupleSpec.scala index bec3633b..3ca9d14e 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/collections/TupleSpec.scala +++ b/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 - 任意の複数の値を保持するクラス" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaFormulaSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaFormulaSpec.scala index 304bf193..49d202a8 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaFormulaSpec.scala +++ b/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の実行時の挙動を学ぶ" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaImplicitSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaImplicitSpec.scala index 98b2d834..086bf594 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaImplicitSpec.scala +++ b/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を学ぶ" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaTrapSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaTrapSpec.scala index d26589c7..c8d10b84 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaTrapSpec.scala +++ b/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の落とし穴を学ぶ" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaTypeSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaTypeSpec.scala index 70ac6c8f..51e0bfe7 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/event/understanding_scala/UnderstandingScalaTypeSpec.scala +++ b/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の型システムを学ぶ" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/exceptions/ExceptionSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/exceptions/ExceptionSpec.scala index 17908163..9e5112b5 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/exceptions/ExceptionSpec.scala +++ b/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 = "例外処理" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/exceptions/OptionSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/exceptions/OptionSpec.scala index 5c067e21..913954c8 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/exceptions/OptionSpec.scala +++ b/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 - 値が存在しない可能性があることを表すクラス" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter02/Chapter02Spec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter02/Chapter02Spec.scala index 2e41e165..539cc2e3 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter02/Chapter02Spec.scala +++ b/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関数型プログラミングの準備" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter03/Chapter03Spec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter03/Chapter03Spec.scala index a0d1e5a2..747c6718 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter03/Chapter03Spec.scala +++ b/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章 関数型プログラミングのデータ構造" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter06/Chapter06Spec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter06/Chapter06Spec.scala index f7f7fb17..2911ae76 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter06/Chapter06Spec.scala +++ b/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) diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter10/Chapter10Spec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter10/Chapter10Spec.scala index 46992cb0..c7bc1e2d 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter10/Chapter10Spec.scala +++ b/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章 モノイド" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter11/Chapter11Spec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter11/Chapter11Spec.scala index 81799811..8f9a5e9b 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/functional/programming/in/scala/chapter11/Chapter11Spec.scala +++ b/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章 モナド" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/cats/CatsSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/cats/CatsSpec.scala index 9daa2590..f7be162a 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/cats/CatsSpec.scala +++ b/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の基礎" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/jfreechart/JFreeChartSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/jfreechart/JFreeChartSpec.scala index d461cf34..7d883409 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/jfreechart/JFreeChartSpec.scala +++ b/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ライブラリ" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalaz/DisjunctionSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalaz/DisjunctionSpec.scala index 8b9917cf..10241e65 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalaz/DisjunctionSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalaz/DisjunctionSpec.scala @@ -1,9 +1,9 @@ package org.nomadblacky.scala.samples.libraries.scalaz -import org.scalatest.FunSpec import scalaz._ import Scalaz._ +import org.scalatest.funspec.AnyFunSpec /** Created by blacky on 17/04/14. * @@ -11,7 +11,7 @@ import Scalaz._ * * -\/ ... Left \/- ... Right */ -class DisjunctionSpec extends FunSpec { +class DisjunctionSpec extends AnyFunSpec { override def suiteName: String = "[Scalaz] Disjunction - 強化版Either" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalaz/NonEmptyListSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalaz/NonEmptyListSpec.scala index 98448277..7c7da1d0 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalaz/NonEmptyListSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalaz/NonEmptyListSpec.scala @@ -1,15 +1,15 @@ package org.nomadblacky.scala.samples.libraries.scalaz -import org.scalatest.FunSpec import scalaz._ import Scalaz._ +import org.scalatest.funspec.AnyFunSpec /** Created by blacky on 17/04/13. * * NonEmptyList ... 要素がひとつ以上含まれることが保証されているList */ -class NonEmptyListSpec extends FunSpec { +class NonEmptyListSpec extends AnyFunSpec { override def suiteName: String = "[Scalaz] NonEmptyList - 空でないことが保証されるリスト" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalikejdbc/ScalikeJDBCSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalikejdbc/ScalikeJDBCSpec.scala index 74439e3c..9cb171c9 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalikejdbc/ScalikeJDBCSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalikejdbc/ScalikeJDBCSpec.scala @@ -8,13 +8,15 @@ import scalikejdbc._ import skinny.orm.{Alias, SkinnyCRUDMapper} import scala.util.Try +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers /** scalikejdbc-cookbook https://github.com/scalikejdbc/scalikejdbc-cookbook * * FIXME: Unit tests are failed */ @Ignore -class ScalikeJDBCSpec extends FunSpec with Matchers with BeforeAndAfterAll with BeforeAndAfter { +class ScalikeJDBCSpec extends AnyFunSpec with Matchers with BeforeAndAfterAll with BeforeAndAfter { override def suiteName: String = "ScalikeJDBC" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalikejdbc/ScalikeJDBCUnitTestSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalikejdbc/ScalikeJDBCUnitTestSpec.scala index 9c876cf1..15e083be 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalikejdbc/ScalikeJDBCUnitTestSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalikejdbc/ScalikeJDBCUnitTestSpec.scala @@ -1,11 +1,13 @@ package org.nomadblacky.scala.samples.libraries.scalikejdbc -import org.scalatest.{fixture, BeforeAndAfterAll, Matchers} +import org.scalatest.{fixture, BeforeAndAfterAll} import scalikejdbc._ import scalikejdbc.config.DBs import scalikejdbc.scalatest.AutoRollback +import org.scalatest.funspec +import org.scalatest.matchers.should.Matchers -class ScalikeJDBCUnitTestSpec extends fixture.FunSpec with Matchers with BeforeAndAfterAll with AutoRollback { +class ScalikeJDBCUnitTestSpec extends funspec.FixtureAnyFunSpec with Matchers with BeforeAndAfterAll with AutoRollback { override def suiteName: String = "ScalikeJDBCでのユニットテスト" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scopt/ScoptSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scopt/ScoptSpec.scala index 50c5230b..6952e03c 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scopt/ScoptSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scopt/ScoptSpec.scala @@ -3,11 +3,11 @@ package org.nomadblacky.scala.samples.libraries.scopt import java.io.File import java.util.Calendar -import org.scalatest.FunSpec +import org.scalatest.funspec.AnyFunSpec /** Created by blacky on 16/10/14. */ -class ScoptSpec extends FunSpec { +class ScoptSpec extends AnyFunSpec { override def suiteName: String = "Scopt - コマンドライン引数を解析するライブラリ" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/nlp100/Chapter01Spec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/nlp100/Chapter01Spec.scala index c37669ae..5e8c2e94 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/nlp100/Chapter01Spec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/nlp100/Chapter01Spec.scala @@ -1,16 +1,17 @@ package org.nomadblacky.scala.samples.nlp100 -import org.scalatest.{FunSpec, Matchers} import scala.annotation.tailrec import scala.collection.mutable import scala.util.Random +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers /** 言語処理100本ノック 第1章: 準備運動 * * Weeble Scalaもくもく勉強会にて回答されたコードです。 https://weeyble-scala.connpass.com/ */ -class Chapter01Spec extends FunSpec with Matchers { +class Chapter01Spec extends AnyFunSpec with Matchers { override def suiteName: String = "言語処理100本ノック 第1章: 準備運動" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/nlp100/Chapter02Spec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/nlp100/Chapter02Spec.scala index 438b8e07..af0b1952 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/nlp100/Chapter02Spec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/nlp100/Chapter02Spec.scala @@ -1,14 +1,15 @@ package org.nomadblacky.scala.samples.nlp100 -import org.scalatest.{FunSpec, Matchers} import scala.io.Source +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers /** 言語処理100本ノック 第2章: UNIXコマンド * * Weeble Scalaもくもく勉強会にて回答されたコードです。 https://weeyble-scala.connpass.com/ */ -class Chapter02Spec extends FunSpec with Matchers { +class Chapter02Spec extends AnyFunSpec with Matchers { it("テキストファイルの読み込み") { val strings: Iterator[String] = Source.fromFile("data/hightemp.txt").getLines() diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/parsercombinator/ParserCombinatorSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/parsercombinator/ParserCombinatorSpec.scala index f0e4f088..ccee0f05 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/parsercombinator/ParserCombinatorSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/parsercombinator/ParserCombinatorSpec.scala @@ -1,15 +1,15 @@ package org.nomadblacky.scala.samples.parsercombinator -import org.scalatest.FunSpec import scala.util.parsing.combinator.{JavaTokenParsers, RegexParsers} +import org.scalatest.funspec.AnyFunSpec /** 参考資料 * Scalaスケーラブルプログラミング 第33章 パーサー・コンビネーター * 面倒くさいパーサの実装もDSLで書くだけ！そう、Scalaならね - Qiita * http://qiita.com/suin/items/35bc4afe618cb77f80f6 * * Created by blacky on 17/04/20. */ -class ParserCombinatorSpec extends FunSpec { +class ParserCombinatorSpec extends AnyFunSpec { override def suiteName: String = "パーザコンビネータ" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/play/ws/PlayWSSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/play/ws/PlayWSSpec.scala index 808e4673..1d9a01e1 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/play/ws/PlayWSSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/play/ws/PlayWSSpec.scala @@ -4,14 +4,15 @@ import akka.actor.ActorSystem import akka.stream.ActorMaterializer import akka.stream.scaladsl.{Flow, Keep, Sink} import akka.util.ByteString -import org.scalatest.{FunSpec, Matchers} import play.api.libs.ws.StandaloneWSRequest import play.api.libs.ws.ahc.StandaloneAhcWSClient import scala.concurrent.duration.Duration import scala.concurrent.{Await, Future} +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers -class PlayWSSpec extends FunSpec with Matchers { +class PlayWSSpec extends AnyFunSpec with Matchers { import scala.concurrent.ExecutionContext.Implicits.global override def suiteName: String = "Play WS ... Play製のHTTPクライアント" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/s99/S99Spec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/s99/S99Spec.scala index a2f3d25a..1de60f35 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/s99/S99Spec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/s99/S99Spec.scala @@ -1,12 +1,13 @@ package org.nomadblacky.scala.samples.s99 -import org.scalatest.{FunSpec, Matchers} import scala.annotation.tailrec +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers /** Weeble ゆるふわScala勉強会にて回答されたコードです。 https://weeyble-scala.connpass.com/ */ -class S99Spec extends FunSpec with Matchers { +class S99Spec extends AnyFunSpec with Matchers { override def suiteName: String = "Ninety-Nine Scala Problems" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/scala/JVMSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/scala/JVMSpec.scala index da971f7f..675b56cc 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/scala/JVMSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/scala/JVMSpec.scala @@ -1,8 +1,9 @@ package org.nomadblacky.scala.samples.scala -import org.scalatest.{FunSpec, Matchers} +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers -class JVMSpec extends FunSpec with Matchers { +class JVMSpec extends AnyFunSpec with Matchers { override def suiteName: String = "JVM関連のあれこれ" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/scala/TypeClassSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/scala/TypeClassSpec.scala index 8ef6e34d..e376b97b 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/scala/TypeClassSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/scala/TypeClassSpec.scala @@ -1,8 +1,8 @@ package org.nomadblacky.scala.samples.scala -import org.scalatest.FunSpec import scala.math.Ordering +import org.scalatest.funspec.AnyFunSpec /** Created by blacky on 17/05/23. * @@ -13,7 +13,7 @@ import scala.math.Ordering * http://chopl.in/post/2012/11/06/introduction-to-typeclass-with-scala/ + Twitter検索 + * https://twitter.com/search?l=&q=型クラス&src=typd&lang=ja */ -class TypeClassSpec extends FunSpec { +class TypeClassSpec extends AnyFunSpec { override def suiteName: String = "型クラスの使い方" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/scala/TypeParameterSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/scala/TypeParameterSpec.scala index adef4338..d1dd758f 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/scala/TypeParameterSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/scala/TypeParameterSpec.scala @@ -1,10 +1,10 @@ package org.nomadblacky.scala.samples.scala -import org.scalatest.FunSpec +import org.scalatest.funspec.AnyFunSpec /** Created by blacky on 16/11/19. */ -class TypeParameterSpec extends FunSpec { +class TypeParameterSpec extends AnyFunSpec { it("Scalaにおける型の検査") { val v1: Any = "hoge" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/scala_kansai/y2018/N01PatternMatching.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/scala_kansai/y2018/N01PatternMatching.scala index cbe1aa78..ee16becc 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/scala_kansai/y2018/N01PatternMatching.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/scala_kansai/y2018/N01PatternMatching.scala @@ -2,11 +2,12 @@ package org.nomadblacky.scala.samples.scala_kansai.y2018 import java.io.IOException -import org.scalatest.{FunSpec, Matchers} import scala.util.{Failure, Success, Try} +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers -class N01PatternMatching extends FunSpec with Matchers { +class N01PatternMatching extends AnyFunSpec with Matchers { override def suiteName: String = "Readable Code in Scala ~ パターンマッチ編" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/scala_kansai/y2018/N02ForSyntax.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/scala_kansai/y2018/N02ForSyntax.scala index f4b997e7..44c30144 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/scala_kansai/y2018/N02ForSyntax.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/scala_kansai/y2018/N02ForSyntax.scala @@ -1,10 +1,11 @@ package org.nomadblacky.scala.samples.scala_kansai.y2018 -import org.scalatest.{FunSpec, Matchers} import scala.util.Try +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers -class N02ForSyntax extends FunSpec with Matchers { +class N02ForSyntax extends AnyFunSpec with Matchers { override def suiteName: String = "Readable Code in Scala ~ for式編" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/testing/ScalaCheckSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/testing/ScalaCheckSpec.scala index 8947b95d..0279e405 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/testing/ScalaCheckSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/testing/ScalaCheckSpec.scala @@ -1,10 +1,11 @@ package org.nomadblacky.scala.samples.testing import org.scalacheck.{Arbitrary, Gen} -import org.scalatest.{FunSpec, Matchers} import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers -class ScalaCheckSpec extends FunSpec with Matchers with ScalaCheckDrivenPropertyChecks { +class ScalaCheckSpec extends AnyFunSpec with Matchers with ScalaCheckDrivenPropertyChecks { it("forAll ... ランダムに生成された値でテストを行う") { forAll { (s1: String, s2: String) => diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/with_java/WithJavaSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/with_java/WithJavaSpec.scala index 0335b6cd..09cc086b 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/with_java/WithJavaSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/with_java/WithJavaSpec.scala @@ -1,8 +1,9 @@ package org.nomadblacky.scala.samples.with_java -import org.scalatest.{FunSpec, Matchers} +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers -class WithJavaSpec extends FunSpec with Matchers { +class WithJavaSpec extends AnyFunSpec with Matchers { override def suiteName: String = "ScalaとJavaの結合" diff --git a/legacy/src/test/scala/org/nomadblacky/scala/samples/xml/XmlSpec.scala b/legacy/src/test/scala/org/nomadblacky/scala/samples/xml/XmlSpec.scala index 8b5404a1..fd37e0db 100644 --- a/legacy/src/test/scala/org/nomadblacky/scala/samples/xml/XmlSpec.scala +++ b/legacy/src/test/scala/org/nomadblacky/scala/samples/xml/XmlSpec.scala @@ -1,10 +1,10 @@ package org.nomadblacky.scala.samples.xml -import org.scalatest.FunSpec import scala.xml.{Elem, XML} +import org.scalatest.funspec.AnyFunSpec -class XmlSpec extends FunSpec { +class XmlSpec extends AnyFunSpec { override def suiteName: String = "XMLを扱う" diff --git a/reporter/src/test/scala/org/nomadblacky/scala/reporter/UsingSpec.scala b/reporter/src/test/scala/org/nomadblacky/scala/reporter/UsingSpec.scala index 5c2da1e5..82637304 100644 --- a/reporter/src/test/scala/org/nomadblacky/scala/reporter/UsingSpec.scala +++ b/reporter/src/test/scala/org/nomadblacky/scala/reporter/UsingSpec.scala @@ -1,8 +1,9 @@ package org.nomadblacky.scala.reporter -import org.scalatest.{FunSpec, Matchers} +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers -class UsingSpec extends FunSpec with Matchers { +class UsingSpec extends AnyFunSpec with Matchers { class Resource extends AutoCloseable { var isClosed = false From 245072153b4981ee148ccd7a8f21ac6c765798f4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 18 Sep 2024 18:52:57 +0000 Subject: [PATCH 2/2] Update scalatest to 3.2.19 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index dce290b1..12ee5091 100644 --- a/build.sbt +++ b/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",