Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalatest to 3.1.2 #227

Open
wants to merge 1 commit into
base: 0.4.x
Choose a base branch
from
Open

Update scalatest to 3.1.2 #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...neTransform/src/test/scala/com/thoughtworks/compute/NDimensionalAffineTransformSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion OpenCL/src/test/scala/com/thoughtworks/compute/OpenCLSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ package com.thoughtworks.compute

import java.nio.ByteBuffer

import org.scalatest.{AsyncFreeSpec, Matchers}
import org.lwjgl.opencl._
import CL10._
import CL12._
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)
Expand Down
5 changes: 3 additions & 2 deletions OpenCLKernelBuilder/src/test/scala/com/thoughtworks/compute/OpenCLKernelBuilderSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 2 additions & 0 deletions Tensors/src/test/scala/com/thoughtworks/compute/TensorsSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions Trees/src/test/scala/com/thoughtworks/compute/TreesSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion cpu/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.2" % Test

fork := true
5 changes: 3 additions & 2 deletions cpu/src/test/scala/com/thoughtworks/compute/cpuSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion gpu/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.2" % Test

fork := true