Merge pull request #13 from scalatest/feature-3.2.0.0

Release 3.2.0.0

Author: bvenners

.gitignore

@@ -3,3 +3,4 @@
 target/
 .idea/
 test-output/
+_site/

build.sbt

@@ -23,7 +23,7 @@ developers := List(
   )
 )
 
-crossScalaVersions := List("2.10.7", "2.11.12", "2.12.11", "2.13.2")
+crossScalaVersions := List("2.10.7", "2.11.12", "2.12.11", "2.13.2", "0.24.0")
 
 libraryDependencies ++= Seq(
   "org.scalatest" %% "scalatest-core" % "3.2.0",
@@ -90,6 +90,12 @@ pomIncludeRepository := { _ => false }
 
 credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
 
-pgpSecretRing := file((Path.userHome / ".gnupg" / "secring.gpg").getAbsolutePath)
-
-pgpPassphrase := None
+pomExtra := (
+  <scm>
+    <url>https://github.com/scalatest/scalatestplus-selenium</url>
+    <connection>scm:git:git@github.com:scalatest/scalatestplus-selenium.git</connection>
+    <developerConnection>
+      scm:git:git@github.com:scalatest/scalatestplus-selenium.git
+    </developerConnection>
+  </scm>
+)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.12

project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
-
-addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.2")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
+
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.1")

src/main/scala/org/scalatestplus/testng/Resources.scala

@@ -38,14 +38,14 @@ private[testng] object Resources {
 
   def iconPlusShortName(param0: Any, param1: Any): String = makeString("iconPlusShortName", Array(param0, param1))
 
-  def rawIconPlusShortName: String = resourceBundle.getString("iconPlusShortName")
+  def rawIconPlusShortName(): String = resourceBundle.getString("iconPlusShortName")
 
   def testNotFound(param0: Any): String = makeString("testNotFound", Array(param0))
 
-  def rawTestNotFound: String = resourceBundle.getString("testNotFound")
+  def rawTestNotFound(): String = resourceBundle.getString("testNotFound")
 
   def testNGConfigFailed(): String = resourceBundle.getString("testNGConfigFailed")
 
-  def rawTestNGConfigFailed: String = resourceBundle.getString("testNGConfigFailed")
+  def rawTestNGConfigFailed(): String = resourceBundle.getString("testNGConfigFailed")
 
 }

src/main/scala/org/scalatestplus/testng/TestNGHelper.scala

@@ -39,7 +39,7 @@ private[testng] object TestNGHelper {
     val decodedTestText = scala.reflect.NameTransformer.decode(testText)
     val formattedText =
       if (includeIcon) {
-        val testSucceededIcon = Resources.testSucceededIconChar
+        val testSucceededIcon = Resources.testSucceededIconChar()
         ("  " * (if (level == 0) 0 else (level - 1))) + Resources.iconPlusShortName(testSucceededIcon, decodedTestText)
       }
       else {

src/main/scala/org/scalatestplus/testng/TestNGSuiteLike.scala

@@ -356,7 +356,7 @@ trait TestNGSuiteLike extends Suite { thisSuite =>
     override def onTestFailure(result: ITestResult): Unit = {
       val throwableOrNull = result.getThrowable
       val throwable = if (throwableOrNull != null) Some(throwableOrNull) else None
-      val message = if (throwableOrNull != null && throwableOrNull.getMessage != null) throwableOrNull.getMessage else Resources.testNGConfigFailed
+      val message = if (throwableOrNull != null && throwableOrNull.getMessage != null) throwableOrNull.getMessage else Resources.testNGConfigFailed()
       val testName = result.getName + params(result)
       val formatter = getIndentedTextForTest(testName, 1, true)
       val payload = 
@@ -379,7 +379,7 @@ trait TestNGSuiteLike extends Suite { thisSuite =>
     override def onConfigurationFailure(result: ITestResult): Unit = {
       val throwableOrNull = result.getThrowable
       val throwable = if (throwableOrNull != null) Some(throwableOrNull) else None
-      val message = if (throwableOrNull != null && throwableOrNull.getMessage != null) throwableOrNull.getMessage else Resources.testNGConfigFailed
+      val message = if (throwableOrNull != null && throwableOrNull.getMessage != null) throwableOrNull.getMessage else Resources.testNGConfigFailed()
       val formatter = formatterForSuiteAborted(thisSuite, message)
       report(SuiteAborted(tracker.nextOrdinal(), message, thisSuite.suiteName, thisSuite.getClass.getName, Some(thisSuite.getClass.getName), throwable, None, formatter, Some(SeeStackDepthException)))
       status.setFailed()

src/test/scala/org/scalatestplus/testng/TestNGSuiteSuite.scala

@@ -53,7 +53,7 @@ import org.scalatestplus.testng.SharedHelpers.EventRecordingReporter
       // when
       val status = new StatefulStatus
       (new FailureTestNGSuite()).runTestNG(testReporter, new Tracker, status)
-      status.setCompleted
+      status.setCompleted()
 
       // then
       testReporter.eventsReceived.lastOption match {