Merge branch 'feature-style-traits-dsl-infix' of https://github.com/c…

…heeseng/scalatest into 3.2.x-new
scalatest · Nov 30, 2022 · 3b2dc4e · 3b2dc4e
2 parents 4ce7f38 + 3148641
commit 3b2dc4e
Show file tree

Hide file tree

Showing 20 changed files with 803 additions and 656 deletions.
diff --git a/dotty/matchers-core/src/main/scala/org/scalatest/matchers/Matcher.scala b/dotty/matchers-core/src/main/scala/org/scalatest/matchers/Matcher.scala
diff --git a/jvm/flatspec/src/main/scala/org/scalatest/flatspec/AnyFlatSpecLike.scala b/jvm/flatspec/src/main/scala/org/scalatest/flatspec/AnyFlatSpecLike.scala
diff --git a/jvm/flatspec/src/main/scala/org/scalatest/flatspec/AsyncFlatSpecLike.scala b/jvm/flatspec/src/main/scala/org/scalatest/flatspec/AsyncFlatSpecLike.scala
diff --git a/jvm/flatspec/src/main/scala/org/scalatest/flatspec/FixtureAnyFlatSpecLike.scala b/jvm/flatspec/src/main/scala/org/scalatest/flatspec/FixtureAnyFlatSpecLike.scala
diff --git a/jvm/flatspec/src/main/scala/org/scalatest/flatspec/FixtureAsyncFlatSpecLike.scala b/jvm/flatspec/src/main/scala/org/scalatest/flatspec/FixtureAsyncFlatSpecLike.scala
diff --git a/jvm/freespec/src/main/scala/org/scalatest/freespec/AnyFreeSpecLike.scala b/jvm/freespec/src/main/scala/org/scalatest/freespec/AnyFreeSpecLike.scala
@@ -213,6 +213,7 @@ trait AnyFreeSpecLike extends TestSuite with TestRegistration with Informing wit
      * For more information and examples of this method's use, see the <a href="AnyFreeSpec.html">main documentation</a> for trait <code>AnyFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def in(testFun: => Any /* Assertion */): Unit = {
       registerTestToRun(specText, tags, "in", () => testFun, pos)
     }
@@ -233,6 +234,7 @@ trait AnyFreeSpecLike extends TestSuite with TestRegistration with Informing wit
      * For more information and examples of this method's use, see the <a href="AnyFreeSpec.html">main documentation</a> for trait <code>AnyFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def is(testFun: => PendingStatement): Unit = {
       registerTestToRun(specText, tags, "is", () => { testFun; succeed }, pos)
     }
@@ -253,6 +255,7 @@ trait AnyFreeSpecLike extends TestSuite with TestRegistration with Informing wit
      * For more information and examples of this method's use, see the <a href="AnyFreeSpec.html">main documentation</a> for trait <code>AnyFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def ignore(testFun: => Any /* Assertion */): Unit = {
       registerTestToIgnore(specText, tags, "ignore", () => testFun, pos)
     }
@@ -309,6 +312,7 @@ trait AnyFreeSpecLike extends TestSuite with TestRegistration with Informing wit
      * For more information and examples of this method's use, see the <a href="AnyFreeSpec.html">main documentation</a> for trait <code>AnyFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def in(f: => Any /* Assertion */): Unit = {
       registerTestToRun(string, List(), "in", () => f, pos)
     }
@@ -329,6 +333,7 @@ trait AnyFreeSpecLike extends TestSuite with TestRegistration with Informing wit
      * For more information and examples of this method's use, see the <a href="AnyFreeSpec.html">main documentation</a> for trait <code>AnyFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def ignore(f: => Any /* Assertion */): Unit = {
       registerTestToIgnore(string, List(), "ignore", () => f, pos)
     }
@@ -349,6 +354,7 @@ trait AnyFreeSpecLike extends TestSuite with TestRegistration with Informing wit
      * For more information and examples of this method's use, see the <a href="AnyFreeSpec.html">main documentation</a> for trait <code>AnyFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def is(f: => PendingStatement): Unit = {
       registerTestToRun(string, List(), "is", () => { f; succeed }, pos)
     }
@@ -369,6 +375,7 @@ trait AnyFreeSpecLike extends TestSuite with TestRegistration with Informing wit
      * For more information and examples of this method's use, see the <a href="AnyFreeSpec.html">main documentation</a> for trait <code>AnyFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def taggedAs(firstTestTag: Tag, otherTestTags: Tag*): ResultOfTaggedAsInvocationOnString = {
       val tagList = firstTestTag :: otherTestTags.toList
       new ResultOfTaggedAsInvocationOnString(string, tagList, pos)

diff --git a/jvm/freespec/src/main/scala/org/scalatest/freespec/AsyncFreeSpecLike.scala b/jvm/freespec/src/main/scala/org/scalatest/freespec/AsyncFreeSpecLike.scala
@@ -219,6 +219,7 @@ trait AsyncFreeSpecLike extends AsyncTestSuite with AsyncTestRegistration with I
      * For more information and examples of this method's use, see the <a href="AsyncFreeSpec.html">main documentation</a> for trait <code>AsyncFreeSpec</code>.
      * </p>
      */
+     //DOTTY-ONLY     infix 
     def in(testFun: => Future[compatible.Assertion]): Unit = {
       registerTestToRun(specText, tags, () => testFun, pos)
     }
@@ -239,6 +240,7 @@ trait AsyncFreeSpecLike extends AsyncTestSuite with AsyncTestRegistration with I
      * For more information and examples of this method's use, see the <a href="AsyncFreeSpec.html">main documentation</a> for trait <code>AsyncFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def is(testFun: => PendingStatement): Unit = {
       registerPendingTestToRun(specText, tags, () => testFun, pos)
     }
@@ -259,6 +261,7 @@ trait AsyncFreeSpecLike extends AsyncTestSuite with AsyncTestRegistration with I
      * For more information and examples of this method's use, see the <a href="AsyncFreeSpec.html">main documentation</a> for trait <code>AsyncFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def ignore(testFun: => Future[compatible.Assertion]): Unit = {
       registerTestToIgnore(specText, tags, "ignore", () => testFun, pos)
     }
@@ -310,6 +313,7 @@ trait AsyncFreeSpecLike extends AsyncTestSuite with AsyncTestRegistration with I
      * For more information and examples of this method's use, see the <a href="AsyncFreeSpec.html">main documentation</a> for trait <code>AsyncFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def in(f: => Future[compatible.Assertion]): Unit = {
       registerTestToRun(string, List(), () => f, pos)
     }
@@ -330,6 +334,7 @@ trait AsyncFreeSpecLike extends AsyncTestSuite with AsyncTestRegistration with I
      * For more information and examples of this method's use, see the <a href="AsyncFreeSpec.html">main documentation</a> for trait <code>AsyncFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def ignore(f: => Future[compatible.Assertion]): Unit = {
       registerTestToIgnore(string, List(), "ignore", () => f, pos)
     }
@@ -350,6 +355,7 @@ trait AsyncFreeSpecLike extends AsyncTestSuite with AsyncTestRegistration with I
      * For more information and examples of this method's use, see the <a href="AsyncFreeSpec.html">main documentation</a> for trait <code>AsyncFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def is(f: => PendingStatement): Unit = {
       registerPendingTestToRun(string, List(), () => f, pos)
     }
@@ -370,6 +376,7 @@ trait AsyncFreeSpecLike extends AsyncTestSuite with AsyncTestRegistration with I
      * For more information and examples of this method's use, see the <a href="AsyncFreeSpec.html">main documentation</a> for trait <code>AsyncFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def taggedAs(firstTestTag: Tag, otherTestTags: Tag*): ResultOfTaggedAsInvocationOnString = {
       val tagList = firstTestTag :: otherTestTags.toList
       new ResultOfTaggedAsInvocationOnString(string, tagList, pos)

diff --git a/jvm/freespec/src/main/scala/org/scalatest/freespec/FixtureAnyFreeSpecLike.scala b/jvm/freespec/src/main/scala/org/scalatest/freespec/FixtureAnyFreeSpecLike.scala
@@ -237,6 +237,7 @@ trait FixtureAnyFreeSpecLike extends org.scalatest.FixtureTestSuite with org.sca
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def in(testFun: FixtureParam => Any /* Assertion */): Unit = {
       registerTestToRun(specText, tags, "in", testFun, pos)
     }
@@ -259,6 +260,7 @@ trait FixtureAnyFreeSpecLike extends org.scalatest.FixtureTestSuite with org.sca
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def in(testFun: () => Any /* Assertion */): Unit = {
       registerTestToRun(specText, tags, "in", new NoArgTestWrapper(testFun), pos)
     }
@@ -281,6 +283,7 @@ trait FixtureAnyFreeSpecLike extends org.scalatest.FixtureTestSuite with org.sca
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def is(testFun: => PendingStatement): Unit = {
       registerPendingTestToRun(specText, tags, "is", unusedFixtureParam => testFun, pos)
     }
@@ -303,6 +306,7 @@ trait FixtureAnyFreeSpecLike extends org.scalatest.FixtureTestSuite with org.sca
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def ignore(testFun: FixtureParam => Any /* Assertion */): Unit = {
       registerTestToIgnore(specText, tags, "ignore", testFun, pos)
     }
@@ -325,6 +329,7 @@ trait FixtureAnyFreeSpecLike extends org.scalatest.FixtureTestSuite with org.sca
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def ignore(testFun: () => Any /* Assertion */): Unit = {
       registerTestToIgnore(specText, tags, "ignore", new NoArgTestWrapper(testFun), pos)
     }
@@ -393,6 +398,7 @@ trait FixtureAnyFreeSpecLike extends org.scalatest.FixtureTestSuite with org.sca
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def in(testFun: FixtureParam => Any /* Assertion */): Unit = {
       registerTestToRun(string, List(), "in", testFun, pos)
     }
@@ -415,6 +421,7 @@ trait FixtureAnyFreeSpecLike extends org.scalatest.FixtureTestSuite with org.sca
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def in(testFun: () => Any /* Assertion */): Unit = {
       registerTestToRun(string, List(), "in", new NoArgTestWrapper(testFun), pos)
     }
@@ -437,6 +444,7 @@ trait FixtureAnyFreeSpecLike extends org.scalatest.FixtureTestSuite with org.sca
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def is(testFun: => PendingStatement): Unit = {
       registerPendingTestToRun(string, List(), "is", unusedFixtureParam => testFun, pos)
     }
@@ -459,6 +467,7 @@ trait FixtureAnyFreeSpecLike extends org.scalatest.FixtureTestSuite with org.sca
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def ignore(testFun: FixtureParam => Any /* Assertion */): Unit = {
       registerTestToIgnore(string, List(), "ignore", testFun, pos)
     }
@@ -481,6 +490,7 @@ trait FixtureAnyFreeSpecLike extends org.scalatest.FixtureTestSuite with org.sca
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def ignore(testFun: () => Any /* Assertion */): Unit = {
       registerTestToIgnore(string, List(), "ignore", new NoArgTestWrapper(testFun), pos)
     }
@@ -504,6 +514,7 @@ trait FixtureAnyFreeSpecLike extends org.scalatest.FixtureTestSuite with org.sca
      * @param firstTestTag the first mandatory test tag
      * @param otherTestTags the others additional test tags
      */
+    //DOTTY-ONLY     infix  
     def taggedAs(firstTestTag: Tag, otherTestTags: Tag*): ResultOfTaggedAsInvocationOnString = {
       val tagList = firstTestTag :: otherTestTags.toList
       new ResultOfTaggedAsInvocationOnString(string, tagList, pos)

diff --git a/jvm/freespec/src/main/scala/org/scalatest/freespec/FixtureAsyncFreeSpecLike.scala b/jvm/freespec/src/main/scala/org/scalatest/freespec/FixtureAsyncFreeSpecLike.scala
@@ -216,6 +216,7 @@ trait FixtureAsyncFreeSpecLike extends org.scalatest.FixtureAsyncTestSuite with
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def in(testFun: FixtureParam => Future[compatible.Assertion]): Unit = {
       registerAsyncTestToRun(specText, tags, "in", testFun, pos)
     }
@@ -238,6 +239,7 @@ trait FixtureAsyncFreeSpecLike extends org.scalatest.FixtureAsyncTestSuite with
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def in(testFun: () => Future[compatible.Assertion]): Unit = {
       registerAsyncTestToRun(specText, tags, "in", new NoArgTestWrapper(testFun), pos)
     }
@@ -260,6 +262,7 @@ trait FixtureAsyncFreeSpecLike extends org.scalatest.FixtureAsyncTestSuite with
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def is(testFun: => PendingStatement): Unit = {
       registerPendingTestToRun(specText, tags, "is", unusedFixtureParam => testFun, pos)
     }
@@ -282,6 +285,7 @@ trait FixtureAsyncFreeSpecLike extends org.scalatest.FixtureAsyncTestSuite with
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def ignore(testFun: FixtureParam => Future[compatible.Assertion]): Unit = {
       registerAsyncTestToIgnore(specText, tags, "ignore", testFun, pos)
     }
@@ -304,6 +308,7 @@ trait FixtureAsyncFreeSpecLike extends org.scalatest.FixtureAsyncTestSuite with
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def ignore(testFun: () => Future[compatible.Assertion]): Unit = {
       registerAsyncTestToIgnore(specText, tags, "ignore", new NoArgTestWrapper(testFun), pos)
     }
@@ -366,6 +371,7 @@ trait FixtureAsyncFreeSpecLike extends org.scalatest.FixtureAsyncTestSuite with
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def in(testFun: FixtureParam => Future[compatible.Assertion]): Unit = {
       registerAsyncTestToRun(string, List(), "in", testFun, pos)
     }
@@ -388,6 +394,7 @@ trait FixtureAsyncFreeSpecLike extends org.scalatest.FixtureAsyncTestSuite with
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def in(testFun: () => Future[compatible.Assertion]): Unit = {
       registerAsyncTestToRun(string, List(), "in", new NoArgTestWrapper(testFun), pos)
     }
@@ -410,6 +417,7 @@ trait FixtureAsyncFreeSpecLike extends org.scalatest.FixtureAsyncTestSuite with
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def is(testFun: => PendingStatement): Unit = {
       registerPendingTestToRun(string, List(), "is", unusedFixtureParam => testFun, pos)
     }
@@ -432,6 +440,7 @@ trait FixtureAsyncFreeSpecLike extends org.scalatest.FixtureAsyncTestSuite with
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def ignore(testFun: FixtureParam => Future[compatible.Assertion]): Unit = {
       registerAsyncTestToIgnore(string, List(), "ignore", testFun, pos)
     }
@@ -454,6 +463,7 @@ trait FixtureAsyncFreeSpecLike extends org.scalatest.FixtureAsyncTestSuite with
      *
      * @param testFun the test function
      */
+    //DOTTY-ONLY     infix  
     def ignore(testFun: () => Future[compatible.Assertion]): Unit = {
       registerAsyncTestToIgnore(string, List(), "ignore", new NoArgTestWrapper(testFun), pos)
     }
@@ -477,6 +487,7 @@ trait FixtureAsyncFreeSpecLike extends org.scalatest.FixtureAsyncTestSuite with
      * @param firstTestTag the first mandatory test tag
      * @param otherTestTags the others additional test tags
      */
+    //DOTTY-ONLY     infix  
     def taggedAs(firstTestTag: Tag, otherTestTags: Tag*): ResultOfTaggedAsInvocationOnString = {
       val tagList = firstTestTag :: otherTestTags.toList
       new ResultOfTaggedAsInvocationOnString(string, tagList, pos)

diff --git a/jvm/freespec/src/main/scala/org/scalatest/freespec/PathAnyFreeSpecLike.scala b/jvm/freespec/src/main/scala/org/scalatest/freespec/PathAnyFreeSpecLike.scala
@@ -189,6 +189,7 @@ trait PathAnyFreeSpecLike extends org.scalatest.Suite with OneInstancePerTest wi
      * trait <code>org.scalatest.path.FreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix 
     def in(testFun: => Unit /* Assertion */): Unit = {
       registerTestToRun(specText, tags, "in", () => testFun, pos)
     }
@@ -216,6 +217,7 @@ trait PathAnyFreeSpecLike extends org.scalatest.Suite with OneInstancePerTest wi
      * trait <code>org.scalatest.freespec.PathAnyFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def is(testFun: => PendingStatement): Unit = {
       registerTestToRun(specText, tags, "is", () => testFun, pos)
     }
@@ -240,6 +242,7 @@ trait PathAnyFreeSpecLike extends org.scalatest.Suite with OneInstancePerTest wi
      * be executed. Instead, a <code>TestIgnored</code> event will be fired.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def ignore(testFun: => Unit /* Assertion */): Unit = {
       registerTestToIgnore(specText, tags, "ignore", () => testFun, pos)
     }
@@ -303,6 +306,7 @@ trait PathAnyFreeSpecLike extends org.scalatest.Suite with OneInstancePerTest wi
      * trait <code>org.scalatest.freespec.PathAnyFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def in(f: => Unit /* Assertion */): Unit = {
       registerTestToRun(string, List(), "in", () => f, pos)
     }
@@ -327,6 +331,7 @@ trait PathAnyFreeSpecLike extends org.scalatest.Suite with OneInstancePerTest wi
      * be executed. Instead, a <code>TestIgnored</code> event will be fired.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def ignore(f: => Unit /* Assertion */): Unit = {
       registerTestToIgnore(string, List(), "ignore", () => f, pos)
     }
@@ -354,6 +359,7 @@ trait PathAnyFreeSpecLike extends org.scalatest.Suite with OneInstancePerTest wi
      * trait <code>org.scalatest.freespec.PathAnyFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def is(f: => PendingStatement): Unit = {
       registerTestToRun(string, List(), "is", () => f, pos)
     }
@@ -376,6 +382,7 @@ trait PathAnyFreeSpecLike extends org.scalatest.Suite with OneInstancePerTest wi
      * trait <code>org.scalatest.freespec.AnyFreeSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix  
     def taggedAs(firstTestTag: Tag, otherTestTags: Tag*): ResultOfTaggedAsInvocationOnString = {
       val tagList = firstTestTag :: otherTestTags.toList
       new ResultOfTaggedAsInvocationOnString(string, tagList, pos)

diff --git a/jvm/funspec/src/main/scala/org/scalatest/funspec/AnyFunSpecLike.scala b/jvm/funspec/src/main/scala/org/scalatest/funspec/AnyFunSpecLike.scala
@@ -218,6 +218,7 @@ trait AnyFunSpecLike extends TestSuite with TestRegistration with Informing with
      * in the main documentation for trait <code>AnyFunSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix 
     def should(behaveWord: BehaveWord) = behaveWord
 
     /**
@@ -237,6 +238,7 @@ trait AnyFunSpecLike extends TestSuite with TestRegistration with Informing with
      * in the main documentation for trait <code>AnyFunSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix 
     def must(behaveWord: BehaveWord) = behaveWord
   }
 
@@ -339,6 +341,7 @@ trait AnyFunSpecLike extends TestSuite with TestRegistration with Informing with
      * in the main documentation for trait <code>AnyFunSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix 
     def should(behaveWord: BehaveWord) = behaveWord
 
     /**
@@ -358,6 +361,7 @@ trait AnyFunSpecLike extends TestSuite with TestRegistration with Informing with
      * in the main documentation for trait <code>AnyFunSpec</code>.
      * </p>
      */
+    //DOTTY-ONLY     infix 
     def must(behaveWord: BehaveWord) = behaveWord
   }