Merge branch 'feature-3.2.0-M1'

Author: bvenners

build.sbt

@@ -2,7 +2,7 @@ name := "junit-4.12"
 
 organization := "org.scalatestplus"
 
-version := "3.1.0.0-RC3"
+version := "3.1.0.0"
 
 homepage := Some(url("https://github.com/scalatest/scalatestplus-junit"))
 
@@ -23,13 +23,29 @@ developers := List(
   )
 )
 
-crossScalaVersions := List("2.10.7", "2.11.12", "2.12.10", "2.13.0")
+crossScalaVersions := List("2.10.7", "2.11.12", "2.12.10", "2.13.1")
 
 libraryDependencies ++= Seq(
-  "org.scalatest" %% "scalatest" % "3.1.0-RC3",
+  "org.scalatest" %% "scalatest" % "3.1.0",
   "junit" % "junit" % "4.12"
 )
 
+import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
+import scala.xml.transform.{RewriteRule, RuleTransformer}
+
+// skip dependency elements with a scope
+pomPostProcess := { (node: XmlNode) =>
+  new RuleTransformer(new RewriteRule {
+    override def transform(node: XmlNode): XmlNodeSeq = node match {
+      case e: Elem if e.label == "dependency"
+          && e.child.exists(child => child.label == "scope") =>
+        def txt(label: String): String = "\"" + e.child.filter(_.label == label).flatMap(_.text).mkString + "\""
+        Comment(s""" scoped dependency ${txt("groupId")} % ${txt("artifactId")} % ${txt("version")} % ${txt("scope")} has been omitted """)
+      case _ => node
+    }
+  }).transform(node).head
+}
+
 testOptions in Test :=
   Seq(
     Tests.Argument(TestFrameworks.ScalaTest,

src/test/scala/org/scalatestplus/junit/AssertionsForJUnitWordSpec.scala

@@ -17,9 +17,8 @@ package org.scalatestplus.junit
 
 import org.scalatest._
 import _root_.junit.framework.AssertionFailedError
-import org.scalatest.WordSpec
 
-trait AssertionsForJUnit3SharedTests { this: WordSpec with AssertionsForJUnit =>
+trait AssertionsForJUnit3SharedTests { this: wordspec.AnyWordSpec with AssertionsForJUnit =>
 
   def fromAssertExpectInterceptAndFail(): Unit = {
 
@@ -100,7 +99,7 @@ trait AssertionsForJUnit3SharedTests { this: WordSpec with AssertionsForJUnit =>
   }
 }
 
-class AssertionsForJUnitWordSpec extends WordSpec with AssertionsForJUnit
+class AssertionsForJUnitWordSpec extends wordspec.AnyWordSpec with AssertionsForJUnit
   with AssertionsForJUnit3SharedTests {
 
   val throwAssertionFailedError = afterWord("throw AssertionFailedError")

src/test/scala/org/scalatestplus/junit/JUnit3SuiteSpec.scala

@@ -20,7 +20,7 @@ import SharedHelpers._
 import collection.immutable.TreeSet
 import helpers._
 
-class JUnit3SuiteSpec extends FunSpec {
+class JUnit3SuiteSpec extends funspec.AnyFunSpec {
 
   describe("A JUnit3Suite") {
     it("should return the test names in alphabetical order from testNames") {

src/test/scala/org/scalatestplus/junit/JUnitRunnerSuite.scala

@@ -25,7 +25,7 @@ package org.scalatestplus.junit {
     import org.junit.runner.RunWith
 
     @RunWith(classOf[JUnitRunner])
-    class EasySuite extends FunSuite {
+    class EasySuite extends funsuite.AnyFunSuite {
 
       val runCount = 3
       val failedCount = 2
@@ -52,7 +52,7 @@ package org.scalatestplus.junit {
     // Blows up in beforeAll before any tests can be run.
     //
     @RunWith(classOf[JUnitRunner])
-    class KerblooeySuite extends FunSuite with BeforeAndAfterAll {
+    class KerblooeySuite extends funsuite.AnyFunSuite with BeforeAndAfterAll {
 
       override def beforeAll(): Unit = {
         throw new RuntimeException("kerblooey")
@@ -83,7 +83,7 @@ package org.scalatestplus.junit {
   import org.scalatestplus.junit.helpers.EasySuite
   import org.scalatestplus.junit.helpers.KerblooeySuite
 
-  class JUnitRunnerSuite extends FunSuite {
+  class JUnitRunnerSuite extends funsuite.AnyFunSuite {
 
     test("That EasySuite gets run by JUnit given its RunWith annotation") {
       val result = JUnitCore.runClasses(classOf[EasySuite])

src/test/scala/org/scalatestplus/junit/JUnitSuiteSpec.scala

@@ -22,7 +22,7 @@ import org.scalatestplus.junit.junit4helpers._
 import org.junit.Test
 import org.junit.Ignore
 
-class JUnitSuiteSpec extends FunSpec {
+class JUnitSuiteSpec extends funspec.AnyFunSpec {
 
   describe("A JUnitSuite") {
     it("should return the test names in alphabetical order from testNames") {

src/test/scala/org/scalatestplus/junit/JUnitSuiteSuite.scala

@@ -54,7 +54,7 @@ import _root_.org.junit.Test
 
   import helpers._
 
-  class JUnitSuiteSuite extends FunSuite {
+  class JUnitSuiteSuite extends funsuite.AnyFunSuite {
 
     class MyReporter extends Reporter {
 

src/test/scala/org/scalatestplus/junit/JUnitTestFailedErrorSpec.scala

@@ -18,7 +18,7 @@ package org.scalatestplus.junit
 import org.scalatest._
 import org.scalactic.source.Position
 
-class JUnitTestFailedErrorSpec extends FunSpec with Matchers with AssertionsForJUnit {
+class JUnitTestFailedErrorSpec extends funspec.AnyFunSpec with matchers.should.Matchers with AssertionsForJUnit {
 
   val baseLineNumber = Position.here.lineNumber
 

src/test/scala/org/scalatestplus/junit/JUnitWrapperSuiteSuite.scala

@@ -18,7 +18,7 @@ package org.scalatestplus.junit {
   import org.scalatest._
   import org.scalatest.events._
 
-  class JUnitWrapperSuiteSuite extends FunSuite {
+  class JUnitWrapperSuiteSuite extends funsuite.AnyFunSuite {
 
     class MyReporter extends Reporter {
 

src/test/scala/org/scalatestplus/junit/RunNotifierSuite.scala

@@ -28,7 +28,7 @@ import org.junit.runner.notification.RunNotifier
 // This means we don't have a way to really forward RunStarting and
 // RunCompleted reports either. But RunAborted and SuiteAborted events should be sent
 // out the door somehow, so we report them with yet another fireTestFailure.
-class RunNotifierSuite extends FunSuite {
+class RunNotifierSuite extends funsuite.AnyFunSuite {
 
   val ordinal = new Ordinal(99)