diff --git a/build.sbt b/build.sbt index 7e4fec6..35f7415 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ name := "junit-4.13" organization := "org.scalatestplus" -version := "3.2.17.0" +version := "3.3.0.0-alpha.1" homepage := Some(url("https://github.com/scalatest/scalatestplus-junit")) @@ -26,14 +26,13 @@ developers := List( ) ) -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" crossScalaVersions := List( - "2.10.7", "2.11.12", "2.12.17", - "2.13.11", - "3.1.3" + "2.13.12", + "3.3.1" ) /** Add src/main/scala-{2|3} to Compile / unmanagedSourceDirectories */ @@ -46,12 +45,12 @@ Compile / unmanagedSourceDirectories ++= { } libraryDependencies ++= Seq( - "org.scalatest" %% "scalatest-core" % "3.2.17", + "org.scalatest" %% "scalatest-core" % "3.3.0-alpha.1", "junit" % "junit" % "4.13.2", - "org.scalatest" %% "scalatest-wordspec" % "3.2.17" % "test", - "org.scalatest" %% "scalatest-funspec" % "3.2.17" % "test", - "org.scalatest" %% "scalatest-funsuite" % "3.2.17" % "test", - "org.scalatest" %% "scalatest-shouldmatchers" % "3.2.17" % "test" + "org.scalatest" %% "scalatest-wordspec" % "3.3.0-alpha.1" % "test", + "org.scalatest" %% "scalatest-funspec" % "3.3.0-alpha.1" % "test", + "org.scalatest" %% "scalatest-funsuite" % "3.3.0-alpha.1" % "test", + "org.scalatest" %% "scalatest-shouldmatchers" % "3.3.0-alpha.1" % "test" ) import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _} diff --git a/src/main/scala/org/scalatestplus/junit/JUnit3Suite.scala b/src/main/scala/org/scalatestplus/junit/JUnit3Suite.scala index 299fb03..e0a1ecf 100644 --- a/src/main/scala/org/scalatestplus/junit/JUnit3Suite.scala +++ b/src/main/scala/org/scalatestplus/junit/JUnit3Suite.scala @@ -264,13 +264,6 @@ class JUnit3Suite extends TestCase with Suite with AssertionsForJUnit { thisSuit status.setCompleted() status } - - /** - * Suite style name. - * - * @return JUnit3Suite - */ - final override val styleName: String = "JUnit3Suite" final override def testDataFor(testName: String, theConfigMap: ConfigMap = ConfigMap.empty): TestData = new TestData { diff --git a/src/main/scala/org/scalatestplus/junit/JUnitRunner.scala b/src/main/scala/org/scalatestplus/junit/JUnitRunner.scala index 9b7e848..a6cf390 100644 --- a/src/main/scala/org/scalatestplus/junit/JUnitRunner.scala +++ b/src/main/scala/org/scalatestplus/junit/JUnitRunner.scala @@ -98,7 +98,7 @@ final class JUnitRunner(suiteClass: java.lang.Class[_ <: Suite]) extends org.jun // TODO: What should this Tracker be? suiteToRun.run(None, Args(new RunNotifierReporter(notifier), Stopper.default, Filter(), ConfigMap.empty, None, - new Tracker, Set.empty)) + new Tracker)) } catch { case e: Exception => diff --git a/src/main/scala/org/scalatestplus/junit/JUnitSuiteLike.scala b/src/main/scala/org/scalatestplus/junit/JUnitSuiteLike.scala index 91420a9..dfda9b7 100644 --- a/src/main/scala/org/scalatestplus/junit/JUnitSuiteLike.scala +++ b/src/main/scala/org/scalatestplus/junit/JUnitSuiteLike.scala @@ -249,13 +249,6 @@ trait JUnitSuiteLike extends Suite with AssertionsForJUnit { thisSuite => status.setCompleted() status } - - /** - * Suite style name. - * - * @return JUnitSuite - */ - final override val styleName: String = "JUnitSuite" // verifySomething(org.scalatest.junit.helpers.HappySuite) // Description.displayName of a test report has the form () diff --git a/src/test/scala/org/scalatestplus/junit/JUnit3SuiteSpec.scala b/src/test/scala/org/scalatestplus/junit/JUnit3SuiteSpec.scala index 4dc6732..1bb8688 100644 --- a/src/test/scala/org/scalatestplus/junit/JUnit3SuiteSpec.scala +++ b/src/test/scala/org/scalatestplus/junit/JUnit3SuiteSpec.scala @@ -150,7 +150,7 @@ class JUnit3SuiteSpec extends funspec.AnyFunSpec { TestWasCalledSuite.reinitialize() val a = new TestWasCalledSuite - a.run(None, Args(SilentReporter, Stopper.default, Filter(Some(Set("org.scalatest.SlowAsMolasses")), Set()), ConfigMap.empty, None, new Tracker, Set.empty)) + a.run(None, Args(SilentReporter, Stopper.default, Filter(Some(Set("org.scalatest.SlowAsMolasses")), Set()), ConfigMap.empty, None, new Tracker)) assert(!TestWasCalledSuite.theTestThisCalled) assert(!TestWasCalledSuite.theTestThatCalled) } diff --git a/src/test/scala/org/scalatestplus/junit/JUnitSuiteSpec.scala b/src/test/scala/org/scalatestplus/junit/JUnitSuiteSpec.scala index 192c688..684a7d8 100644 --- a/src/test/scala/org/scalatestplus/junit/JUnitSuiteSpec.scala +++ b/src/test/scala/org/scalatestplus/junit/JUnitSuiteSpec.scala @@ -145,7 +145,7 @@ class JUnitSuiteSpec extends funspec.AnyFunSpec { TestWasCalledSuite.reinitialize() val a = new TestWasCalledSuite - a.run(None, Args(SilentReporter, Stopper.default, Filter(Some(Set("org.scalatest.SlowAsMolasses")), Set()), ConfigMap.empty, None, new Tracker, Set.empty)) + a.run(None, Args(SilentReporter, Stopper.default, Filter(Some(Set("org.scalatest.SlowAsMolasses")), Set()), ConfigMap.empty, None, new Tracker)) assert(!TestWasCalledSuite.theDoThisCalled) assert(!TestWasCalledSuite.theDoThatCalled) }