Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit 6722b54

Browse files
exoegoexoego
authored
Merge pull request #147 from exoego/update-scalatest
Migrate to scalatest new fashion
2 parents e81435c + cd7d011 commit 6722b54

37 files changed

+73
-76
lines changed

‎app/current/src/test/scala/io/scalajs/nodejs/TopLevelTest.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package io.scalajs.nodejs
22

3-
import org.scalatest.FunSuite
4-
53
import scala.scalajs.js
4+
import org.scalatest.funsuite.AnyFunSuite
65

7-
class TopLevelTest extends FunSuite {
6+
class TopLevelTest extends AnyFunSuite {
87
test("queueMicrotask") {
98
assert(queueMicrotask.isInstanceOf[js.Function])
109
queueMicrotask(() => println("printed from queueMicrotask"))

‎app/current/src/test/scala/io/scalajs/nodejs/buffer/BufferTest.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package io.scalajs.nodejs.buffer
22

3-
import org.scalatest.FunSpec
4-
53
import scala.scalajs.js
4+
import org.scalatest.funspec.AnyFunSpec
65

76
/**
87
* Buffer Tests
98
*/
10-
class BufferTest extends FunSpec {
9+
class BufferTest extends AnyFunSpec {
1110
it("should support writeBigInt64BE, writeBigInt64LE, writeBigInt64BE and writeBigInt64BE") {
1211
val buf = Buffer.allocUnsafe(8)
1312
val v = js.BigInt("0x0102030405060708")

‎app/current/src/test/scala/io/scalajs/nodejs/fs/FsAsyncTest.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package io.scalajs.nodejs.fs
22

3-
import org.scalatest.{AsyncFunSpec, BeforeAndAfterEach}
3+
import org.scalatest.BeforeAndAfterEach
44

55
import scala.concurrent.ExecutionContext
6+
import org.scalatest.funspec.AsyncFunSpec
67

78
class FsAsyncTest extends AsyncFunSpec with BeforeAndAfterEach {
89
override implicit val executionContext = ExecutionContext.Implicits.global

‎app/current/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.scalajs.nodejs.fs
22

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

55
/**
66
* File System (Fs) Tests
77
*
88
*/
9-
class FsClassesTest extends FunSpec {
9+
class FsClassesTest extends AnyFunSpec {
1010
describe("ReadStream") {
1111
it("supports pending added in v11.2.0") {
1212
assert(new ReadStream("package.json").pending)

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/AssertTest.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package io.scalajs.nodejs
22

3-
import org.scalatest.FunSpec
4-
53
import scala.scalajs.js
4+
import org.scalatest.funspec.AnyFunSpec
65

76
/**
87
* Assert Test
98
*/
10-
class AssertTest extends FunSpec {
9+
class AssertTest extends AnyFunSpec {
1110
describe("Assert") {
1211
it("should handle deep comparisons") {
1312
Assert.deepStrictEqual(js.Array(1, 2, 3), js.Array(1, 2, 3))

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/StringDecoderTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.scalajs.nodejs
22

33
import io.scalajs.nodejs.buffer.Buffer
4-
import org.scalatest.FunSpec
4+
import org.scalatest.funspec.AnyFunSpec
55

6-
class StringDecoderTest extends FunSpec {
6+
class StringDecoderTest extends AnyFunSpec {
77
describe("StringDecoder") {
88
it("should decode strings or buffer") {
99
val decoder = new StringDecoder("utf8")

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/assertion/AssertTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.scalajs.nodejs.assertion
22

3-
import org.scalatest.FunSpec
43
import io.scalajs.nodejs.{Assert => NodeAssert}
54

65
import scala.scalajs.js
6+
import org.scalatest.funspec.AnyFunSpec
77

8-
class AssertTest extends FunSpec {
8+
class AssertTest extends AnyFunSpec {
99
it("have strict from v9.9.0") {
1010
assert(NodeAssert.strict !== js.undefined)
1111
}

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/buffer/BufferTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.scalajs.nodejs.buffer
22

33
import io.scalajs.nodejs.{TestEnvironment, buffer}
4-
import org.scalatest.FunSpec
54

65
import scala.scalajs.js
76
import scala.scalajs.js.typedarray.{ArrayBuffer, DataView, Uint8Array}
7+
import org.scalatest.funspec.AnyFunSpec
88

9-
class BufferTest extends FunSpec {
9+
class BufferTest extends AnyFunSpec {
1010
describe("Buffer") {
1111
describe("instance members") {
1212
it("should sort buffers") {

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/child_process/ChildProcessTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ package child_process
44
import io.scalajs.nodejs.buffer.Buffer
55
import io.scalajs.util.ScalaJsHelper._
66
import io.scalajs.util.NodeJSConverters._
7-
import org.scalatest.AsyncFunSpec
87

98
import scala.concurrent.{ExecutionContext, Promise}
109
import scala.scalajs.js
1110
import scala.scalajs.js.|
11+
import org.scalatest.funspec.AsyncFunSpec
1212

1313
/**
1414
* ChildProcess Test

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/cluster/ClusterTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.scalajs.nodejs.cluster
22

33
import io.scalajs.nodejs.setTimeout
4-
import org.scalatest.FunSpec
54

65
import scala.concurrent.duration._
76
import scala.scalajs.js
7+
import org.scalatest.funspec.AnyFunSpec
88

9-
class ClusterTest extends FunSpec {
9+
class ClusterTest extends AnyFunSpec {
1010
describe("Cluster") {
1111
it("cluster should be master") {
1212
assert(Cluster.isMaster)

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/console_module/ConsoleTest.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package io.scalajs.nodejs.console_module
22

33
import io.scalajs.nodejs.fs.Fs
4-
import org.scalatest.{BeforeAndAfterEach, FunSpec}
4+
import org.scalatest.BeforeAndAfterEach
55

66
import scala.scalajs.js
7+
import org.scalatest.funspec.AnyFunSpec
78

8-
class ConsoleTest extends FunSpec with BeforeAndAfterEach {
9+
class ConsoleTest extends AnyFunSpec with BeforeAndAfterEach {
910
private val logFileName = "x.nodejs10.ConsoleTest"
1011

1112
override def afterEach(): Unit = {

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/console_module/ConsoleV8Test.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ package io.scalajs.nodejs.console_module
22

33
import io.scalajs.nodejs.TestEnvironment
44
import io.scalajs.nodejs.fs.{Fs, WriteStream}
5-
import org.scalatest.{BeforeAndAfterEach, FunSpec}
5+
import org.scalatest.BeforeAndAfterEach
66

77
import scala.scalajs.js.JavaScriptException
8+
import org.scalatest.funspec.AnyFunSpec
89

9-
class ConsoleV8Test extends FunSpec with BeforeAndAfterEach {
10+
class ConsoleV8Test extends AnyFunSpec with BeforeAndAfterEach {
1011
private val logFileName = "x.nodejs8.ConsoleTest"
1112
private var failingWritable: WriteStream = null
1213

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/crypto/CertificateTest.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package io.scalajs.nodejs.crypto
22

33
import io.scalajs.nodejs.buffer.Buffer
4-
import org.scalatest.{FunSpec, MustMatchers}
4+
import org.scalatest.funspec.AnyFunSpec
5+
import org.scalatest.matchers.must.Matchers
56

6-
class CertificateTest extends FunSpec with MustMatchers {
7+
class CertificateTest extends AnyFunSpec with Matchers {
78
val spkacExample =
89
"MIIBXjCByDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3L0IfUijj7+A8CPC8EmhcdNoe5fUAog7OrBdhn7EkxFButUp40P7+LiYiygYG1TmoI/a5EgsLU3s9twEz3hmgY9mYIqb/rb+SF8qlD/K6KVyUORC7Wlz1Df4L8O3DuRGzx6/+3jIW6cPBpfgH1sVuYS1vDBsP/gMMIxwTsKJ4P0CAwEAARYkYzBkZjFlYjctMTU0NC00MWVkLWFmN2EtZDRkYjBkNDc5ZjZmMA0GCSqGSIb3DQEBBAUAA4GBALEiapUjaIPs5uEdvCP0gFK2qofo+4GpeK1A43mu28lirYPAvCWsmYvKIZIT9TxvzmQIxAfxobf70aSNlSm6MJJKmvurAK+Bpn6ZUKQZ6A1m927LvctVSYJuUi+WVmr0fGE/OfdQ+BqSm/eQ3jnm3fBPVx1uwLPgjC5g4EvGMh8M"
910

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/crypto/CryptoTest.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package io.scalajs.nodejs.crypto
22

33
import io.scalajs.nodejs.buffer.Buffer
4-
import org.scalatest.{FunSpec, MustMatchers}
54

65
import scala.scalajs.js
76
import scala.scalajs.js.typedarray.{DataView, _}
7+
import org.scalatest.funspec.AnyFunSpec
8+
import org.scalatest.matchers.must.Matchers
89

9-
class CryptoTest extends FunSpec with MustMatchers {
10+
class CryptoTest extends AnyFunSpec with Matchers {
1011
val spkacExample =
1112
"MIIBXjCByDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3L0IfUijj7+A8CPC8EmhcdNoe5fUAog7OrBdhn7EkxFButUp40P7+LiYiygYG1TmoI/a5EgsLU3s9twEz3hmgY9mYIqb/rb+SF8qlD/K6KVyUORC7Wlz1Df4L8O3DuRGzx6/+3jIW6cPBpfgH1sVuYS1vDBsP/gMMIxwTsKJ4P0CAwEAARYkYzBkZjFlYjctMTU0NC00MWVkLWFmN2EtZDRkYjBkNDc5ZjZmMA0GCSqGSIb3DQEBBAUAA4GBALEiapUjaIPs5uEdvCP0gFK2qofo+4GpeK1A43mu28lirYPAvCWsmYvKIZIT9TxvzmQIxAfxobf70aSNlSm6MJJKmvurAK+Bpn6ZUKQZ6A1m927LvctVSYJuUi+WVmr0fGE/OfdQ+BqSm/eQ3jnm3fBPVx1uwLPgjC5g4EvGMh8M"
1213

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/dns/DNSAsyncTest.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package io.scalajs.nodejs
22
package dns
33

4-
import org.scalatest.AsyncFunSpec
5-
64
import scala.concurrent.{ExecutionContext, Promise}
75
import scala.scalajs.js
6+
import org.scalatest.funspec.AsyncFunSpec
87

98
/**
109
* DNS Tests

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/events/EventEmitterTest.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package io.scalajs.nodejs.events
22

3-
import org.scalatest.AsyncFunSpec
4-
53
import scala.concurrent.{ExecutionContext, Promise}
64
import scala.scalajs.js
5+
import org.scalatest.funspec.AsyncFunSpec
76

87
class EventEmitterTest extends AsyncFunSpec {
98
override implicit val executionContext = ExecutionContext.Implicits.global

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsAsyncTest.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package io.scalajs.nodejs.fs
22

3-
import org.scalatest.{AsyncFunSpec, BeforeAndAfterEach}
3+
import org.scalatest.BeforeAndAfterEach
44

55
import scala.concurrent.ExecutionContext
6+
import org.scalatest.funspec.AsyncFunSpec
67

78
class FsAsyncTest extends AsyncFunSpec with BeforeAndAfterEach {
89
override implicit val executionContext = ExecutionContext.Implicits.global

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package io.scalajs.nodejs.fs
33
import io.scalajs.nodejs.setImmediate
44
import io.scalajs.util.NodeJSConverters._
55
import io.scalajs.util.ScalaJsHelper._
6-
import org.scalatest.AsyncFunSpec
76

87
import scala.concurrent.{ExecutionContext, Promise}
8+
import org.scalatest.funspec.AsyncFunSpec
99

1010
/**
1111
* File System (Fs) Tests

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsV8AsyncTest.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package io.scalajs.nodejs.fs
22

33
import io.scalajs.nodejs.buffer.Buffer
4-
import org.scalatest.{AsyncFunSpec, BeforeAndAfterEach}
4+
import org.scalatest.BeforeAndAfterEach
55

66
import scala.concurrent.{ExecutionContext, Future}
77
import scala.util.{Failure, Success}
8+
import org.scalatest.funspec.AsyncFunSpec
89

910
class FsV8AsyncTest extends AsyncFunSpec with BeforeAndAfterEach {
1011
private val file = "x.File.txt"

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/ReadStreamTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package fs
33

44
import io.scalajs.nodejs.buffer.Buffer
55
import io.scalajs.nodejs.url.URL
6-
import org.scalatest.FunSpec
6+
import org.scalatest.funspec.AnyFunSpec
77

8-
class FsClassesTest extends FunSpec {
8+
class FsClassesTest extends AnyFunSpec {
99
val dirname = process.Process.cwd()
1010

1111
describe("ReadStream") {

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/http/HttpTest.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package io.scalajs.nodejs
22
package http
33

4-
import org.scalatest.FunSpec
5-
64
import scala.scalajs.js
5+
import org.scalatest.funspec.AnyFunSpec
76

87
/**
98
* Http Tests
109
*/
11-
class HttpTest extends FunSpec {
10+
class HttpTest extends AnyFunSpec {
1211
describe("Http") {
1312
it("should provide an HTTP server") {
1413
val server = Http.createServer((request: ClientRequest, response: ServerResponse) => {

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/http/StatusCodeTest.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package io.scalajs.nodejs.http
22

3-
import org.scalatest.FunSpec
4-
53
import scala.scalajs.js
4+
import org.scalatest.funspec.AnyFunSpec
65

76
/**
87
* Http Tests
98
*/
10-
class StatusCodeTest extends FunSpec {
9+
class StatusCodeTest extends AnyFunSpec {
1110
describe("Http") {
1211
it("should provide an HTTP server") {
1312
val server = Http.createServer((request: ClientRequest, response: ServerResponse) => {

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/http2/Http2HeadersTest.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package io.scalajs.nodejs.http2
22

3-
import org.scalatest.FunSpec
4-
53
import scala.scalajs.js
4+
import org.scalatest.funspec.AnyFunSpec
65

7-
class Http2HeadersTest extends FunSpec {
6+
class Http2HeadersTest extends AnyFunSpec {
87
describe("Http2Headers") {
98
it("should treat JS name") {
109
val headers = Http2Headers.forIncoming(

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/net/NetTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.scalajs.nodejs.net
22

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

55
/**
66
* Network (Net) Tests
77
*/
8-
class NetTest extends FunSpec {
8+
class NetTest extends AnyFunSpec {
99
describe("Net") {
1010
/*
1111
it("provides client-server connectivity") {

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/os/OSTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.scalajs.nodejs.os
22

33
import io.scalajs.util.ScalaJsHelper._
4-
import org.scalatest.FunSpec
4+
import org.scalatest.funspec.AnyFunSpec
55

66
/**
77
* OS Tests
88
*/
9-
class OSTest extends FunSpec {
9+
class OSTest extends AnyFunSpec {
1010
describe("OS") {
1111
it("supports arch()") {
1212
assert(OS.arch().nonEmpty)

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/path/PathTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.scalajs.nodejs
22
package path
33

4-
import org.scalatest.FunSpec
4+
import org.scalatest.funspec.AnyFunSpec
55

6-
class PathTest extends FunSpec {
6+
class PathTest extends AnyFunSpec {
77
describe("Path") {
88
it("supports basename()") {
99
assert(Path.basename("/foo/bar/baz/asdf/quux.html") === "quux.html")

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/process/EnvironmentTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.scalajs.nodejs.process
22

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

5-
class EnvironmentTest extends FunSpec {
5+
class EnvironmentTest extends AnyFunSpec {
66
describe("Environment") {
77
it("have PATH as member") {
88
assert(Process.env.PATH.nonEmpty)

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/process/ProcessTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package io.scalajs.nodejs.process
22

33
import io.scalajs.nodejs.os.OS
44
import io.scalajs.nodejs.TestEnvironment
5-
import org.scalatest.FunSpec
5+
import org.scalatest.funspec.AnyFunSpec
66

7-
class ProcessTest extends FunSpec {
7+
class ProcessTest extends AnyFunSpec {
88
describe("Process") {
99
val versionPrefix =
1010
if (TestEnvironment.isExecutedInExactNode8) "v8."

‎app/nodejs-v10/src/test/scala/io/scalajs/nodejs/querystring/QueryStringTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package io.scalajs.nodejs.querystring
22

33
import io.scalajs.nodejs.querystring.QueryStringTest.MyParams
4-
import org.scalatest.FunSpec
54

65
import scala.scalajs.js
6+
import org.scalatest.funspec.AnyFunSpec
77

88
/**
99
* Query String Test
1010
*/
11-
class QueryStringTest extends FunSpec {
11+
class QueryStringTest extends AnyFunSpec {
1212
describe("QueryString") {
1313
it("should escape(...)") {
1414
val result = QueryString.escape("""https://www.google.com/#q=node?key=1234""")

0 commit comments

Comments
 (0)