Merge branch 'feature-scala-3-open-class' of https://github.com/chees…

…eng/scalatest into 3.2.x-new
scalatest · Jul 20, 2022 · bfb8b9e · bfb8b9e
2 parents 9a63522 + 88c9a29
commit bfb8b9e
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 4 deletions.
diff --git a/jvm/featurespec/src/main/scala/org/scalatest/featurespec/AnyFeatureSpec.scala b/jvm/featurespec/src/main/scala/org/scalatest/featurespec/AnyFeatureSpec.scala
@@ -1823,7 +1823,10 @@ import org.scalatest._
  * @author Bill Venners
  */
 @Finders(Array("org.scalatest.finders.FeatureSpecFinder"))
+// SKIP-DOTTY-START
 class AnyFeatureSpec extends AnyFeatureSpecLike {
+// SKIP-DOTTY-END
+//DOTTY-ONLY open class AnyFeatureSpec extends AnyFeatureSpecLike {
 
   /**
    * Returns a user friendly string for this suite, composed of the

diff --git a/jvm/flatspec/src/main/scala/org/scalatest/flatspec/AnyFlatSpec.scala b/jvm/flatspec/src/main/scala/org/scalatest/flatspec/AnyFlatSpec.scala
@@ -1682,7 +1682,10 @@ import org.scalatest.{Finders, Suite}
  * @author Bill Venners
  */
 @Finders(Array("org.scalatest.finders.FlatSpecFinder"))
+// SKIP-DOTTY-START
 class AnyFlatSpec extends AnyFlatSpecLike {
+// SKIP-DOTTY-END
+//DOTTY-ONLY open class AnyFlatSpec extends AnyFlatSpecLike {
 
   /**
    * Returns a user friendly string for this suite, composed of the

diff --git a/jvm/freespec/src/main/scala/org/scalatest/freespec/AnyFreeSpec.scala b/jvm/freespec/src/main/scala/org/scalatest/freespec/AnyFreeSpec.scala
@@ -1736,8 +1736,10 @@ import org.scalatest.{Suite, Finders}
  * @author Bill Venners
  */
 @Finders(Array("org.scalatest.finders.FreeSpecFinder"))
+// SKIP-DOTTY-START
 class AnyFreeSpec extends AnyFreeSpecLike {
-
+// SKIP-DOTTY-END
+//DOTTY-ONLY open class AnyFreeSpec extends AnyFreeSpecLike {
   /**
    * Returns a user friendly string for this suite, composed of the
    * simple name of the class (possibly simplified further by removing dollar signs if added by the Scala interpeter) and, if this suite

diff --git a/jvm/freespec/src/main/scala/org/scalatest/freespec/PathAnyFreeSpec.scala b/jvm/freespec/src/main/scala/org/scalatest/freespec/PathAnyFreeSpec.scala
@@ -692,7 +692,10 @@ import org.scalatest._
  */
 @Finders(Array("org.scalatest.finders.FreeSpecFinder"))
 // SKIP-SCALATESTJS,NATIVE-START
+// SKIP-DOTTY-START
 class PathAnyFreeSpec extends org.scalatest.freespec.PathAnyFreeSpecLike {
+// SKIP-DOTTY-END
+//DOTTY-ONLY open class PathAnyFreeSpec extends org.scalatest.freespec.PathAnyFreeSpecLike {
 // SKIP-SCALATESTJS,NATIVE-END
 //SCALATESTJS,NATIVE-ONLY abstract class PathAnyFreeSpec extends org.scalatest.freespec.PathAnyFreeSpecLike {
 

diff --git a/jvm/funspec/src/main/scala/org/scalatest/funspec/AnyFunSpec.scala b/jvm/funspec/src/main/scala/org/scalatest/funspec/AnyFunSpec.scala
@@ -1628,8 +1628,10 @@ import org.scalatest.{Suite, Finders}
  * @author Bill Venners
  */
 @Finders(Array("org.scalatest.finders.FunSpecFinder"))
+// SKIP-DOTTY-START
 class AnyFunSpec extends AnyFunSpecLike {
-
+// SKIP-DOTTY-END
+//DOTTY-ONLY open class AnyFunSpec extends AnyFunSpecLike {
   /**
    * Returns a user friendly string for this suite, composed of the
    * simple name of the class (possibly simplified further by removing dollar signs if added by the Scala interpeter) and, if this suite

diff --git a/jvm/funspec/src/main/scala/org/scalatest/funspec/PathAnyFunSpec.scala b/jvm/funspec/src/main/scala/org/scalatest/funspec/PathAnyFunSpec.scala
@@ -694,7 +694,10 @@ import org.scalatest._
  */
 @Finders(Array("org.scalatest.finders.FunSpecFinder"))
 // SKIP-SCALATESTJS,NATIVE-START
+// SKIP-DOTTY-START
 class PathAnyFunSpec extends org.scalatest.funspec.PathAnyFunSpecLike {
+// SKIP-DOTTY-END
+//DOTTY-ONLY open class PathAnyFunSpec extends org.scalatest.funspec.PathAnyFunSpecLike {
 // SKIP-SCALATESTJS,NATIVE-END
 //SCALATESTJS,NATIVE-ONLY abstract class PathAnyFunSpec extends org.scalatest.funspec.PathAnyFunSpecLike {
 

diff --git a/jvm/funsuite/src/main/scala/org/scalatest/funsuite/AnyFunSuite.scala b/jvm/funsuite/src/main/scala/org/scalatest/funsuite/AnyFunSuite.scala
@@ -1560,7 +1560,10 @@ import org.scalatest.{Suite, Finders}
 @Finders(Array("org.scalatest.finders.FunSuiteFinder"))
 //SCALATESTJS-ONLY @scala.scalajs.reflect.annotation.EnableReflectiveInstantiation
 //SCALATESTNATIVE-ONLY @scala.scalanative.reflect.annotation.EnableReflectiveInstantiation
+// SKIP-DOTTY-START
 class AnyFunSuite extends AnyFunSuiteLike {
+// SKIP-DOTTY-END
+//DOTTY-ONLY open class AnyFunSuite extends AnyFunSuiteLike {
 
   /**
     * Returns a user friendly string for this suite, composed of the

diff --git a/jvm/propspec/src/main/scala/org/scalatest/propspec/AnyPropSpec.scala b/jvm/propspec/src/main/scala/org/scalatest/propspec/AnyPropSpec.scala
@@ -872,8 +872,10 @@ import org.scalatest.{Finders, Suite}
  * @author Bill Venners
  */
 @Finders(Array("org.scalatest.finders.PropSpecFinder"))
+// SKIP-DOTTY-START
 class AnyPropSpec extends AnyPropSpecLike {
-
+// SKIP-DOTTY-END
+//DOTTY-ONLY open class AnyPropSpec extends AnyPropSpecLike {
   /**
    * Returns a user friendly string for this suite, composed of the
    * simple name of the class (possibly simplified further by removing dollar signs if added by the Scala interpeter) and, if this suite

diff --git a/jvm/refspec/src/main/scala/org/scalatest/refspec/RefSpec.scala b/jvm/refspec/src/main/scala/org/scalatest/refspec/RefSpec.scala
@@ -1328,7 +1328,10 @@ import RefSpec.isTestMethod
  * @author Bill Venners
  */
 @Finders(Array("org.scalatest.finders.SpecFinder"))
+// SKIP-DOTTY-START
 class RefSpec extends RefSpecLike {
+// SKIP-DOTTY-END
+//DOTTY-ONLY open class RefSpec extends RefSpecLike {
 
   /**
    * Returns a user friendly string for this suite, composed of the

diff --git a/jvm/wordspec/src/main/scala/org/scalatest/wordspec/AnyWordSpec.scala b/jvm/wordspec/src/main/scala/org/scalatest/wordspec/AnyWordSpec.scala
@@ -1876,8 +1876,10 @@ import org.scalatest.{ Suite, Finders }
  * @author Bill Venners
  */
 @Finders(Array("org.scalatest.finders.WordSpecFinder"))
+// SKIP-DOTTY-START
 class AnyWordSpec extends AnyWordSpecLike {
-
+// SKIP-DOTTY-END
+//DOTTY-ONLY open class AnyWordSpec extends AnyWordSpecLike {
   /**
    * Returns a user friendly string for this suite, composed of the
    * simple name of the class (possibly simplified further by removing dollar signs if added by the Scala interpeter) and, if this suite