Merged changes from branch 3.2.x-new.

scalatest · Sep 7, 2023 · ae8216f · ae8216f
1 parent faad04d
commit ae8216f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/jvm/core/src/main/scala/org/scalatest/tools/Framework.scala b/jvm/core/src/main/scala/org/scalatest/tools/Framework.scala
@@ -518,7 +518,7 @@ class Framework extends SbtFramework {
         )
       }
        else
-         throw new IllegalArgumentException("Class " + taskDefinition.fullyQualifiedName + " is neither accessible accesible org.scalatest.Suite nor runnable.")
+         throw new IllegalArgumentException("Class " + taskDefinition.fullyQualifiedName + " is neither accessible org.scalatest.Suite nor runnable.")
     }
 
     def taskDef = taskDefinition

diff --git a/jvm/core/src/main/scala/org/scalatest/tools/StringReporter.scala b/jvm/core/src/main/scala/org/scalatest/tools/StringReporter.scala
@@ -23,6 +23,8 @@ import Suite.indentation
 import org.scalatest.exceptions.PropertyCheckFailedException
 import org.scalatest.exceptions.StackDepth
 
+import org.scalactic.Prettifier
+
 /**
  * A <code>Reporter</code> that prints test status information to
  * a <code>Writer</code>, <code>OutputStream</code>, or file.
@@ -787,7 +789,7 @@ private[scalatest] object StringReporter {
 
       case RunAborted(ordinal, message, throwable, duration, summary, formatter, location, payload, threadName, timeStamp) => 
 
-        fragmentsOnError(Resources.abortedNote, Any => Resources.runAborted, message, throwable, Vector.empty, formatter, None, None, duration,
+        fragmentsOnError(Resources.abortedNote, Any => Resources.runAborted + Option(message).map(msg => Prettifier.lineSeparator + msg.toString).getOrElse(""), message, throwable, Vector.empty, formatter, None, None, duration,
             presentUnformatted, presentAllDurations, presentShortStackTraces, presentFullStackTraces, presentFilePathname, AnsiRed)
 
       case SuiteStarting(ordinal, suiteName, suiteId, suiteClassName, formatter, location, rerunnable, payload, threadName, timeStamp) =>

diff --git a/project/scalatest.scala b/project/scalatest.scala
@@ -429,6 +429,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
       mimaCurrentClassfiles := (Compile / classDirectory).value.getParentFile / (name.value + "_" + scalaBinaryVersion.value + "-" + releaseVersion + ".jar")
     ).settings(osgiSettings: _*).settings(
       OsgiKeys.exportPackage := Seq(
+        "images",
         "org.scalatest",
         "org.scalatest.compatible",
         "org.scalatest.concurrent",