Skip to content

Commit 4d7b70e

Browse files
committed
Made the source code to build with scalatest 3.3.0-alpha.1.
1 parent 9586888 commit 4d7b70e

File tree

4 files changed

+9
-17
lines changed

4 files changed

+9
-17
lines changed

build.sbt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name := "junit-5.10"
55

66
organization := "org.scalatestplus"
77

8-
version := "3.2.17.0"
8+
version := "3.3.0.0-alpha.1"
99

1010
homepage := Some(url("https://github.com/scalatest/scalatestplus-junit"))
1111

@@ -26,14 +26,13 @@ developers := List(
2626
)
2727
)
2828

29-
scalaVersion := "2.13.11"
29+
scalaVersion := "2.13.12"
3030

3131
crossScalaVersions := List(
32-
"2.10.7",
3332
"2.11.12",
3433
"2.12.18",
35-
"2.13.11",
36-
"3.1.3"
34+
"2.13.12",
35+
"3.3.1"
3736
)
3837

3938
scalacOptions ++= Seq("-target:jvm-1.8")
@@ -47,9 +46,9 @@ Compile / unmanagedSourceDirectories ++= {
4746
}
4847
}
4948

50-
val scalatestVersion = "3.2.17"
51-
val junitVersion = "5.10.0"
52-
val junitEngineVersion = "1.10.0"
49+
val scalatestVersion = "3.3.0-alpha.1"
50+
val junitVersion = "5.10.1"
51+
val junitEngineVersion = "1.10.1"
5352

5453
libraryDependencies ++= Seq(
5554
"org.scalatest" %% "scalatest-core" % scalatestVersion,

src/main/scala/org/scalatestplus/junit5/JUnitSuiteLike.scala

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,4 @@ trait JUnitSuiteLike extends Suite with AssertionsForJUnit { thisSuite =>
263263
status.setCompleted()
264264
status
265265
}
266-
267-
/**
268-
* Suite style name.
269-
*
270-
* @return <code>JUnitSuite</code>
271-
*/
272-
final override val styleName: String = "JUnitSuite"
273266
}

src/main/scala/org/scalatestplus/junit5/ScalaTestEngine.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ class ScalaTestEngine extends org.junit.platform.engine.TestEngine {
277277

278278
suiteToRun.run(None, Args(reporter,
279279
Stopper.default, filter, ConfigMap.empty, None,
280-
new Tracker, Set.empty))
280+
new Tracker))
281281

282282
listener.executionFinished(clzDesc, TestExecutionResult.successful())
283283

src/test/scala/org/scalatestplus/junit5/helpers/JUnitSuiteSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class JUnitSuiteSpec extends funspec.AnyFunSpec {
145145
TestWasCalledSuite.reinitialize()
146146

147147
val a = new TestWasCalledSuite
148-
a.run(None, Args(SilentReporter, Stopper.default, Filter(Some(Set("org.scalatest.SlowAsMolasses")), Set()), ConfigMap.empty, None, new Tracker, Set.empty))
148+
a.run(None, Args(SilentReporter, Stopper.default, Filter(Some(Set("org.scalatest.SlowAsMolasses")), Set()), ConfigMap.empty, None, new Tracker))
149149
assert(!TestWasCalledSuite.theDoThisCalled)
150150
assert(!TestWasCalledSuite.theDoThatCalled)
151151
}

0 commit comments

Comments
 (0)