Skip to content

Commit 11b9478

Browse files
scala-stewardscala-steward
committed
See https://github.com/scalatest/autofix/blob/master/3.1.x/README.md for details
1 parent eabf298 commit 11b9478

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+108
-85
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ import akka.http.scaladsl.Http
55
import akka.http.scaladsl.model.{HttpRequest, HttpResponse, StatusCodes}
66
import akka.stream.ActorMaterializer
77
import akka.util.ByteString
8-
import org.scalatest.FunSpec
98

109
import scala.concurrent.duration.Duration
1110
import scala.concurrent.{Await, Future}
1211

1312
import scala.concurrent.ExecutionContext.Implicits.global
13+
import org.scalatest.funspec.AnyFunSpec
1414

1515
/** Created by blacky on 17/05/29.
1616
*/
17-
class AkkaHttpSpec extends FunSpec {
17+
class AkkaHttpSpec extends AnyFunSpec {
1818

1919
override def suiteName: String = "Akka HTTP"
2020

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package org.nomadblacky.scala.samples.akka.streams
22

33
import akka.actor.ActorSystem
4-
import org.scalatest.{FunSpec, Matchers}
4+
import org.scalatest.funspec.AnyFunSpec
5+
import org.scalatest.matchers.should.Matchers
56

67
/** Akka Streams 非同期ストリーム処理のライブラリ
78
*
89
* 特徴 + バックプレッシャー … サブスクライバが処理できる量をパブリッシャに送ることで、無駄なく処理ができる。 + リアクティブストリーム … 異なるストリーム処理ツール間でもバックプレッシャを実現できる。 + 非同期 +
910
* 直感的なAPI + DSLによるグラフ処理
1011
*/
11-
class AkkaStreamsSpec extends FunSpec with Matchers {
12+
class AkkaStreamsSpec extends AnyFunSpec with Matchers {
1213

1314
override def suiteName: String = "Akka Streams"
1415

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.nomadblacky.scala.samples.ammonite
22

33
import ammonite.ops._
4-
import org.scalatest.{BeforeAndAfterAll, FunSpec, Matchers}
4+
import org.scalatest.BeforeAndAfterAll
5+
import org.scalatest.funspec.AnyFunSpec
6+
import org.scalatest.matchers.should.Matchers
57

68
/** http://ammonite.io/#Ammonite-Ops
79
*/
8-
class AmmoniteSpec extends FunSpec with Matchers with BeforeAndAfterAll {
10+
class AmmoniteSpec extends AnyFunSpec with Matchers with BeforeAndAfterAll {
911

1012
override def suiteName: String = "Ammonite-Ops"
1113

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import java.awt.Point
44
import java.io.File
55
import java.util.Scanner
66

7-
import org.scalatest.{FunSpec, Matchers}
87

98
import scala.annotation.tailrec
9+
import org.scalatest.funspec.AnyFunSpec
10+
import org.scalatest.matchers.should.Matchers
1011

11-
class DesignPatternsInScalaSpec extends FunSpec with Matchers {
12+
class DesignPatternsInScalaSpec extends AnyFunSpec with Matchers {
1213

1314
override def suiteName: String = "[BestPractice] Scalaでのデザインパターン"
1415

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ package org.nomadblacky.scala.samples.best_practice
22

33
import java.util.concurrent.{ConcurrentHashMap, ConcurrentLinkedQueue}
44

5-
import org.scalatest.{FunSpec, Matchers}
65

76
import scala.collection.mutable
7+
import org.scalatest.funspec.AnyFunSpec
8+
import org.scalatest.matchers.should.Matchers
89

910
/** Effective Scala http://twitter.github.io/effectivescala/index-ja.html
1011
*/
11-
class EffectiveScalaSpec extends FunSpec with Matchers {
12+
class EffectiveScalaSpec extends AnyFunSpec with Matchers {
1213

1314
it("関数定義の中で直接パターンマッチを使う") {
1415
// これは

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.nomadblacky.scala.samples.collections
22

3-
import org.scalatest.FunSpec
3+
import org.scalatest.funspec.AnyFunSpec
44

55
/** Created by blacky on 17/02/06.
66
*/
7-
class IterableSpec extends FunSpec {
7+
class IterableSpec extends AnyFunSpec {
88

99
override def suiteName: String = "Iterable - コレクションの要素をひとつずつ返すトレイト"
1010

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.nomadblacky.scala.samples.collections
22

3-
import org.scalatest.FunSpec
43
import scala.collection.immutable.List
54
import scala.collection.immutable.Nil
65
import scala.collection.mutable.ListBuffer
6+
import org.scalatest.funspec.AnyFunSpec
77

88
/** 要素同士を連結するデータ構造のリスト。 順次呼び出しや再帰アクセスに強い。 ランダムアクセスは遅い。
99
*/
10-
class ListSpec extends FunSpec {
10+
class ListSpec extends AnyFunSpec {
1111

1212
override def suiteName: String = "List - 単方向リスト"
1313

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.nomadblacky.scala.samples.collections
22

3-
import org.scalatest.FunSpec
43
import scala.collection.immutable.Set
4+
import org.scalatest.funspec.AnyFunSpec
55

6-
class MapSpec extends FunSpec {
6+
class MapSpec extends AnyFunSpec {
77

88
override def suiteName: String = "Map - キーと値で構成されるコレクション"
99

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.nomadblacky.scala.samples.collections
22

3-
import org.scalatest.FunSpec
3+
import org.scalatest.funspec.AnyFunSpec
44

55
/** 集合 http://docs.scala-lang.org/ja/overviews/collections/sets
66
*
77
* Created by blacky on 17/03/18.
88
*/
9-
class SetSpec extends FunSpec {
9+
class SetSpec extends AnyFunSpec {
1010

1111
override def suiteName: String = "Set - 重複する要素を含まないコレクション"
1212

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.nomadblacky.scala.samples.collections
22

3-
import org.scalatest.FunSpec
43

54
import scala.collection.mutable.ArrayBuffer
5+
import org.scalatest.funspec.AnyFunSpec
66

77
/** Created by blacky on 17/01/16.
88
*
99
* Traversable ... 操作可能
1010
*/
11-
class TraversableSpec extends FunSpec {
11+
class TraversableSpec extends AnyFunSpec {
1212

1313
override def suiteName: String = "Traversable - コレクションの最上位に位置するトレイト"
1414

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.nomadblacky.scala.samples.collections
22

3-
import org.scalatest.FunSpec
3+
import org.scalatest.funspec.AnyFunSpec
44

5-
class TupleSpec extends FunSpec {
5+
class TupleSpec extends AnyFunSpec {
66

77
override def suiteName: String = "Tuple - 任意の複数の値を保持するクラス"
88

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.nomadblacky.scala.samples.event.understanding_scala
22

3-
import org.scalatest.FunSpec
43

54
import scala.annotation.tailrec
5+
import org.scalatest.funspec.AnyFunSpec
66

77
/** 6/10 Understanding Scala ~Scalaを理解しよう~ https://connpass.com/event/55308/
88
*
99
* Scalaの実行時の挙動を学ぶ http://kmizu.github.io/understanding_scala/semantics/#/22
1010
*/
11-
class UnderstandingScalaFormulaSpec extends FunSpec {
11+
class UnderstandingScalaFormulaSpec extends AnyFunSpec {
1212

1313
override def suiteName: String = "[勉強会] Understanding Scala - Scalaの実行時の挙動を学ぶ"
1414

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.nomadblacky.scala.samples.event.understanding_scala
22

3-
import org.scalatest.FunSpec
3+
import org.scalatest.funspec.AnyFunSpec
44

55
/** 6/10 Understanding Scala ~Scalaを理解しよう~ https://connpass.com/event/55308/
66
*
77
* Scalaのimplicit parameterを学ぶ http://kmizu.github.io/understanding_scala/implicit_parameter/#/14
88
*/
9-
class UnderstandingScalaImplicitSpec extends FunSpec {
9+
class UnderstandingScalaImplicitSpec extends AnyFunSpec {
1010

1111
override def suiteName: String = "[勉強会] Understanding Scala - Scalaのimplicit parameterを学ぶ"
1212

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.nomadblacky.scala.samples.event.understanding_scala
22

3-
import org.scalatest.FunSpec
43

54
import scala.concurrent.Future
5+
import org.scalatest.funspec.AnyFunSpec
66

77
/** 6/10 Understanding Scala ~Scalaを理解しよう~ https://connpass.com/event/55308/
88
*
99
* Scalaの謎・落とし穴を学ぶ http://kmizu.github.io/understanding_scala/pitfall/#/7
1010
*/
11-
class UnderstandingScalaTrapSpec extends FunSpec {
11+
class UnderstandingScalaTrapSpec extends AnyFunSpec {
1212

1313
override def suiteName: String = "[勉強会] Understanding Scala - Scalaの落とし穴を学ぶ"
1414

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package org.nomadblacky.scala.samples.event.understanding_scala
33
import java.io.FileInputStream
44
import java.util
55

6-
import org.scalatest.FunSpec
6+
import org.scalatest.funspec.AnyFunSpec
77

88
/** 6/10 Understanding Scala ~Scalaを理解しよう~ https://connpass.com/event/55308/
99
*
1010
* Scalaの型システムを学ぶ http://kmizu.github.io/understanding_scala/type_system/#/14
1111
*/
12-
class UnderstandingScalaTypeSpec extends FunSpec {
12+
class UnderstandingScalaTypeSpec extends AnyFunSpec {
1313

1414
override def suiteName: String = "[勉強会] Understanding Scala - Scalaの型システムを学ぶ"
1515

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.nomadblacky.scala.samples.exceptions
22

3-
import org.scalatest.FunSpec
3+
import org.scalatest.funspec.AnyFunSpec
44

55
/** try-catch-finally
66
*
77
* try { 式 } catch { case 変数:例外クラスの型 => 例外処理の式 ... } finally { 式 }
88
*/
9-
class ExceptionSpec extends FunSpec {
9+
class ExceptionSpec extends AnyFunSpec {
1010

1111
override def suiteName: String = "例外処理"
1212

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package org.nomadblacky.scala.samples.exceptions
22

3-
import org.scalatest.{FunSpec, Matchers}
3+
import org.scalatest.funspec.AnyFunSpec
4+
import org.scalatest.matchers.should.Matchers
45

56
/** Created by blacky on 16/12/04.
67
*/
7-
class OptionSpec extends FunSpec with Matchers {
8+
class OptionSpec extends AnyFunSpec with Matchers {
89

910
override def suiteName: String = "Option - 値が存在しない可能性があることを表すクラス"
1011

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.nomadblacky.scala.samples.functional.programming.in.scala.chapter02
22

3-
import org.scalatest.FunSpec
3+
import org.scalatest.funspec.AnyFunSpec
44

55
/** Created by blacky on 17/02/13.
66
*
77
* Scala関数型デザイン&プログラミング―Scalazコントリビューターによる関数型徹底ガイド
88
* https://www.amazon.co.jp/dp/B00WM54V5Q/ref=dp-kindle-redirect?_encoding=UTF8&btkr=1
99
*/
10-
class Chapter02Spec extends FunSpec {
10+
class Chapter02Spec extends AnyFunSpec {
1111

1212
override def suiteName: String = "[FP in Scala] 第2章 Scala関数型プログラミングの準備"
1313

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.nomadblacky.scala.samples.functional.programming.in.scala.chapter03
22

3-
import org.scalatest.FunSpec
3+
import org.scalatest.funspec.AnyFunSpec
44

55
/** Created by blacky on 17/02/13.
66
*
77
* Scala関数型デザイン&プログラミング―Scalazコントリビューターによる関数型徹底ガイド
88
* https://www.amazon.co.jp/dp/B00WM54V5Q/ref=dp-kindle-redirect?_encoding=UTF8&btkr=1
99
*/
10-
class Chapter03Spec extends FunSpec {
10+
class Chapter03Spec extends AnyFunSpec {
1111

1212
override def suiteName: String = "[FP in Scala] 第3章 関数型プログラミングのデータ構造"
1313

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.nomadblacky.scala.samples.functional.programming.in.scala.chapter06
22

33
import org.scalactic.{Equality, TolerantNumerics}
4-
import org.scalatest.{FunSpec, Matchers}
4+
import org.scalatest.funspec.AnyFunSpec
5+
import org.scalatest.matchers.should.Matchers
56

6-
class Chapter06Spec extends FunSpec with Matchers {
7+
class Chapter06Spec extends AnyFunSpec with Matchers {
78

89
implicit val doubleEquality: Equality[Double] = TolerantNumerics.tolerantDoubleEquality(0.0001)
910

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.nomadblacky.scala.samples.functional.programming.in.scala.chapter10
22

3-
import org.scalatest.FunSpec
3+
import org.scalatest.funspec.AnyFunSpec
44

55
/** Created by blacky on 17/03/08.
66
*
@@ -9,7 +9,7 @@ import org.scalatest.FunSpec
99
*
1010
* Github https://github.com/fpinscala/fpinscala/tree/master/answerkey/monoids
1111
*/
12-
class Chapter10Spec extends FunSpec {
12+
class Chapter10Spec extends AnyFunSpec {
1313

1414
override def suiteName: String = "[FP in Scala] 第10章 モノイド"
1515

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.nomadblacky.scala.samples.functional.programming.in.scala.chapter11
22

3-
import org.scalatest.FunSpec
3+
import org.scalatest.funspec.AnyFunSpec
44

55
/** Created by blacky on 17/04/25.
66
*
@@ -9,7 +9,7 @@ import org.scalatest.FunSpec
99
*
1010
* Github https://github.com/fpinscala/fpinscala/tree/master/answerkey/monads
1111
*/
12-
class Chapter11Spec extends FunSpec {
12+
class Chapter11Spec extends AnyFunSpec {
1313

1414
override def suiteName: String = "[FP in Scala] 第11章 モナド"
1515

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.nomadblacky.scala.samples.libraries.cats
22

33
import cats.data.NonEmptyList
4-
import org.scalatest.{FunSpec, Matchers}
4+
import org.scalatest.funspec.AnyFunSpec
5+
import org.scalatest.matchers.should.Matchers
56

6-
class CatsSpec extends FunSpec with Matchers {
7+
class CatsSpec extends AnyFunSpec with Matchers {
78

89
override def suiteName: String = "[Cats] Catsの基礎"
910

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ import org.jfree.chart.plot.{PiePlot, PlotOrientation}
55
import org.jfree.chart.{ChartFactory, ChartUtils, JFreeChart}
66
import org.jfree.data.general.DefaultPieDataset
77
import org.jfree.data.statistics.HistogramDataset
8-
import org.scalatest.{BeforeAndAfter, FunSpec}
8+
import org.scalatest.BeforeAndAfter
99

1010
import scala.util.Random
11+
import org.scalatest.funspec.AnyFunSpec
1112

1213
/** Created by blacky on 17/02/26.
1314
*/
14-
class JFreeChartSpec extends FunSpec with BeforeAndAfter {
15+
class JFreeChartSpec extends AnyFunSpec with BeforeAndAfter {
1516

1617
override def suiteName: String = "JFreeChart - グラフを描画するJavaライブラリ"
1718

‎legacy/src/test/scala/org/nomadblacky/scala/samples/libraries/scalaz/DisjunctionSpec.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package org.nomadblacky.scala.samples.libraries.scalaz
22

3-
import org.scalatest.FunSpec
43

54
import scalaz._
65
import Scalaz._
6+
import org.scalatest.funspec.AnyFunSpec
77

88
/** Created by blacky on 17/04/14.
99
*
1010
* \/ Disjunction, Either 数学の論理和の記号が由来 ∨
1111
*
1212
* -\/ ... Left \/- ... Right
1313
*/
14-
class DisjunctionSpec extends FunSpec {
14+
class DisjunctionSpec extends AnyFunSpec {
1515

1616
override def suiteName: String = "[Scalaz] Disjunction - 強化版Either"
1717

0 commit comments

Comments
 (0)