From eaa90a2342fb4610ab7f8e4a585516b613062838 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 19 Jun 2020 06:51:26 +0200 Subject: [PATCH] Update scalatest to 3.2.0 --- .../compute/NDimensionalAffineTransformSpec.scala | 4 +++- .../test/scala/com/thoughtworks/compute/OpenCLSpec.scala | 3 ++- .../com/thoughtworks/compute/OpenCLKernelBuilderSpec.scala | 5 +++-- .../test/scala/com/thoughtworks/compute/TensorsSpec.scala | 2 ++ .../src/test/scala/com/thoughtworks/compute/TreesSpec.scala | 6 ++++-- cpu/build.sbt | 2 +- cpu/src/test/scala/com/thoughtworks/compute/cpuSpec.scala | 5 +++-- gpu/build.sbt | 2 +- 8 files changed, 19 insertions(+), 10 deletions(-) diff --git a/NDimensionalAffineTransform/src/test/scala/com/thoughtworks/compute/NDimensionalAffineTransformSpec.scala b/NDimensionalAffineTransform/src/test/scala/com/thoughtworks/compute/NDimensionalAffineTransformSpec.scala index e4cd74fe..aae542f8 100644 --- a/NDimensionalAffineTransform/src/test/scala/com/thoughtworks/compute/NDimensionalAffineTransformSpec.scala +++ b/NDimensionalAffineTransform/src/test/scala/com/thoughtworks/compute/NDimensionalAffineTransformSpec.scala @@ -5,11 +5,13 @@ import java.awt.geom.AffineTransform import org.scalatest._ import scala.util.Random +import org.scalatest.freespec.AnyFreeSpec +import org.scalatest.matchers.should.Matchers /** * @author 杨博 (Yang Bo) */ -final class NDimensionalAffineTransformSpec extends FreeSpec with Matchers { +final class NDimensionalAffineTransformSpec extends AnyFreeSpec with Matchers { def arrayToAffineTransform(matrix: Array[Double]): AffineTransform = { matrix match { diff --git a/OpenCL/src/test/scala/com/thoughtworks/compute/OpenCLSpec.scala b/OpenCL/src/test/scala/com/thoughtworks/compute/OpenCLSpec.scala index ac8d10c2..8c73e301 100644 --- a/OpenCL/src/test/scala/com/thoughtworks/compute/OpenCLSpec.scala +++ b/OpenCL/src/test/scala/com/thoughtworks/compute/OpenCLSpec.scala @@ -2,7 +2,6 @@ package com.thoughtworks.compute import java.nio.ByteBuffer -import org.scalatest.{AsyncFreeSpec, Matchers} import org.lwjgl.opencl._ import CL10._ import CL12._ @@ -10,6 +9,8 @@ import com.thoughtworks.raii.asynchronous._ import com.thoughtworks.each.Monadic._ import com.thoughtworks.feature.Factory import com.thoughtworks.future._ +import org.scalatest.freespec.AsyncFreeSpec +import org.scalatest.matchers.should.Matchers /** * @author 杨博 (Yang Bo) diff --git a/OpenCLKernelBuilder/src/test/scala/com/thoughtworks/compute/OpenCLKernelBuilderSpec.scala b/OpenCLKernelBuilder/src/test/scala/com/thoughtworks/compute/OpenCLKernelBuilderSpec.scala index 24fc4e1a..18846358 100644 --- a/OpenCLKernelBuilder/src/test/scala/com/thoughtworks/compute/OpenCLKernelBuilderSpec.scala +++ b/OpenCLKernelBuilder/src/test/scala/com/thoughtworks/compute/OpenCLKernelBuilderSpec.scala @@ -5,12 +5,13 @@ import com.thoughtworks.compute.Expressions.{Arrays, Floats, Tuples} import com.thoughtworks.compute.OpenCLKernelBuilder.GlobalContext import com.thoughtworks.compute.Trees.AllTrees import com.thoughtworks.feature.Factory -import org.scalatest.{FreeSpec, Matchers} +import org.scalatest.freespec.AnyFreeSpec +import org.scalatest.matchers.should.Matchers /** * @author 杨博 (Yang Bo) */ -class OpenCLKernelBuilderSpec extends FreeSpec with Matchers { +class OpenCLKernelBuilderSpec extends AnyFreeSpec with Matchers { "id" in { val category1 = { diff --git a/Tensors/src/test/scala/com/thoughtworks/compute/TensorsSpec.scala b/Tensors/src/test/scala/com/thoughtworks/compute/TensorsSpec.scala index 462f61e0..62fd9768 100644 --- a/Tensors/src/test/scala/com/thoughtworks/compute/TensorsSpec.scala +++ b/Tensors/src/test/scala/com/thoughtworks/compute/TensorsSpec.scala @@ -12,6 +12,8 @@ import scalaz.syntax.all._ import scala.language.existentials import org.scalatest._ +import org.scalatest.freespec.AsyncFreeSpec +import org.scalatest.matchers.should.Matchers /** * @author 杨博 (Yang Bo) diff --git a/Trees/src/test/scala/com/thoughtworks/compute/TreesSpec.scala b/Trees/src/test/scala/com/thoughtworks/compute/TreesSpec.scala index df6e7a24..32bd5e6b 100644 --- a/Trees/src/test/scala/com/thoughtworks/compute/TreesSpec.scala +++ b/Trees/src/test/scala/com/thoughtworks/compute/TreesSpec.scala @@ -2,12 +2,14 @@ package com.thoughtworks.compute import com.thoughtworks.compute.Trees.AllTrees import com.thoughtworks.feature.Factory -import org.scalatest.{Assertion, FreeSpec, Matchers} +import org.scalatest.Assertion +import org.scalatest.freespec.AnyFreeSpec +import org.scalatest.matchers.should.Matchers /** * @author 杨博 (Yang Bo) */ -final class TreesSpec extends FreeSpec with Matchers { +final class TreesSpec extends AnyFreeSpec with Matchers { private val trees: AllTrees = Factory[AllTrees with Trees.StructuralTrees].newInstance() private def reflexive(term: => trees.Term): Assertion = { diff --git a/cpu/build.sbt b/cpu/build.sbt index aa2079af..4158353c 100644 --- a/cpu/build.sbt +++ b/cpu/build.sbt @@ -23,6 +23,6 @@ libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.2.3" % Optional).jar().classi } } -libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % Test +libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.0" % Test fork := true diff --git a/cpu/src/test/scala/com/thoughtworks/compute/cpuSpec.scala b/cpu/src/test/scala/com/thoughtworks/compute/cpuSpec.scala index 133b1321..873aeb01 100644 --- a/cpu/src/test/scala/com/thoughtworks/compute/cpuSpec.scala +++ b/cpu/src/test/scala/com/thoughtworks/compute/cpuSpec.scala @@ -1,11 +1,12 @@ package com.thoughtworks.compute -import org.scalatest.{AsyncFreeSpec, FreeSpec, Matchers} +import org.scalatest.freespec.AnyFreeSpec +import org.scalatest.matchers.should.Matchers /** * @author 杨博 (Yang Bo) */ -class cpuSpec extends FreeSpec with Matchers { +class cpuSpec extends AnyFreeSpec with Matchers { "computational graph" in { import cpu._ val a = Tensor.fill(2.0f, Array(2, 3)).nonInline diff --git a/gpu/build.sbt b/gpu/build.sbt index b482b4ca..e373d802 100644 --- a/gpu/build.sbt +++ b/gpu/build.sbt @@ -21,6 +21,6 @@ libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.2.3" % Optional).jar().classi } } -libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % Test +libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.0" % Test fork := true