Merge branch 'cheeseng-feature-pull-3.2-changes-230907'

scalatest · Sep 20, 2023 · 56358e5 · 56358e5
2 parents faad04d + d2b95d7
commit 56358e5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 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/jvm/scalactic/src/main/scala/org/scalactic/Bool.scala b/jvm/scalactic/src/main/scala/org/scalactic/Bool.scala
@@ -996,6 +996,7 @@ private[scalactic] class BinaryMacroBool(left: Any, operator: String, right: Any
         }
 
       case "|" =>
+
         (left, right) match {
           case (leftBool: Bool, rightBool: Bool) =>
             Vector(

diff --git a/project/BuildCommons.scala b/project/BuildCommons.scala
@@ -22,7 +22,7 @@ trait BuildCommons {
     )
 
   val releaseVersion = "3.3.0-SNAP3"
-  val previousReleaseVersion = "3.2.14"
+  val previousReleaseVersion = "3.2.17"
 
   val plusJUnitVersion = "3.2.14.0"
   val plusTestNGVersion = "3.2.14.0"

diff --git a/project/JsBuild.scala b/project/JsBuild.scala
@@ -82,9 +82,7 @@ trait JsBuild { this: BuildCommons =>
       Compile / packageSrc / mappings ++= (scalacticMacroJS / Compile / packageSrc / mappings).value,
       mimaPreviousArtifacts := Set(organization.value %%% moduleName.value % previousReleaseVersion),
       mimaCurrentClassfiles := (Compile / classDirectory).value.getParentFile / (moduleName.value + sjsPrefix + scalaBinaryVersion.value + "-" + releaseVersion + ".jar"), 
-      mimaBinaryIssueFilters ++= {
-        Seq()
-      }
+      mimaBinaryIssueFilters ++= Seq()
     ).settings(osgiSettings: _*).settings(
       OsgiKeys.exportPackage := Seq(
         "org.scalactic",

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",