Skip to content

Commit 41a9b4d

Browse files
committed
TestRegistration: deprecated, AnyFunSuite instead
1 parent 536101a commit 41a9b4d

2 files changed

Lines changed: 7 additions & 11 deletions

File tree

scalafix-testkit/src/main/scala/scalafix/testkit/AbstractSemanticRuleSuite.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ import java.nio.file.Files
66
import scala.meta.internal.io.FileIO
77

88
import org.scalatest.BeforeAndAfterAll
9-
import org.scalatest.Suite
10-
import org.scalatest.TestRegistration
119
import org.scalatest.exceptions.TestFailedException
10+
import org.scalatest.funsuite.AnyFunSuite
1211
import scalafix.internal.config.ScalaVersion
1312
import scalafix.internal.patch.PatchInternals
1413
import scalafix.internal.reflect.ClasspathOps
@@ -24,8 +23,7 @@ import scalafix.internal.v1.Args
2423
abstract class AbstractSemanticRuleSuite(
2524
val props: TestkitProperties,
2625
val isSaveExpect: Boolean
27-
) extends Suite
28-
with TestRegistration
26+
) extends AnyFunSuite
2927
with DiffAssertions
3028
with BeforeAndAfterAll { self =>
3129

@@ -91,7 +89,7 @@ abstract class AbstractSemanticRuleSuite(
9189
}
9290

9391
def runOn(diffTest: RuleTest): Unit = {
94-
registerTest(diffTest.path.testName) {
92+
test(diffTest.path.testName) {
9593
evaluateTestBody(diffTest)
9694
}
9795
}

scalafix-testkit/src/main/scala/scalafix/testkit/AbstractSyntacticRuleSuite.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ package scalafix.testkit
22

33
import scala.meta._
44

5-
import org.scalatest.Suite
65
import org.scalatest.Tag
7-
import org.scalatest.TestRegistration
6+
import org.scalatest.funsuite.AnyFunSuite
87
import scalafix.internal.config.ScalafixConfig
98
import scalafix.internal.patch.PatchInternals
109
import scalafix.internal.v1.Rules
@@ -19,8 +18,7 @@ import scalafix.v1._
1918
* the default rule to use from `check`/`checkDiff`.
2019
*/
2120
abstract class AbstractSyntacticRuleSuite()
22-
extends Suite
23-
with TestRegistration
21+
extends AnyFunSuite
2422
with DiffAssertions {
2523

2624
def checkDiff(
@@ -29,7 +27,7 @@ abstract class AbstractSyntacticRuleSuite()
2927
expected: String,
3028
testTags: Tag*
3129
): Unit = {
32-
registerTest(original.label, testTags: _*) {
30+
test(original.label, testTags: _*) {
3331
val scalaVersion = ScalafixConfig.default.scalaVersion
3432
val doc = SyntacticDocument.fromInput(original, scalaVersion)
3533
val rules = Rules(List(rule))
@@ -50,7 +48,7 @@ abstract class AbstractSyntacticRuleSuite()
5048
expected: String,
5149
testTags: Tag*
5250
): Unit = {
53-
registerTest(name, testTags: _*) {
51+
test(name, testTags: _*) {
5452
val scalaVersion = ScalafixConfig.default.scalaVersion
5553
val doc =
5654
SyntacticDocument.fromInput(Input.String(original), scalaVersion)

0 commit comments

Comments
 (0)