Dotty - pass expectation specs

only 6 tests skipped, which is not supported in Dotty

- 3 about checking parsing errors
- 3 about checking type error messages

Author: liufengyun

project/GenScalaTestDotty.scala

@@ -179,6 +179,7 @@ object GenScalaTestDotty {
     copyFiles("scalatest-test/src/test/scala/org/scalatest", "org/scalatest", targetDir,
       List(
         "AssertionsSpec.scala", 
+        "ExpectationsSpec.scala",
         "ShouldCompileSpec.scala", 
         "ShouldNotCompileSpec.scala", 
         "ShouldNotTypeCheckSpec.scala"

scalatest-test/src/test/scala/org/scalatest/ExpectationsSpec.scala

@@ -25,7 +25,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
 
   describe("The expectResult method") {
     it("should give a correct Fact result when the expectation fails") {
-      val fact = expectResult(3) { 2 } 
+      val fact = expectResult(3) { 2 }
       assert(fact.isNo)
       assert(fact.factMessage  == "Expected 3, but got 2")
       assert(fact.simplifiedFactMessage == "3 did not equal 2")
@@ -43,7 +43,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
       assert(!fact.isVacuousYes)
     }
     it("should give a correct Fact result when the expectation succeeds") {
-      val fact = expectResult(3) { 3 } 
+      val fact = expectResult(3) { 3 }
       assert(fact.isYes)
       assert(fact.factMessage  == "Expected 3, and got 3")
       assert(fact.simplifiedFactMessage == "3 equaled 3")
@@ -118,11 +118,11 @@ class ExpectationsSpec extends FunSpec with Expectations {
       assert(fact2.isNo)
       assert(fact2.factMessage  == "3 equaled 3, but 4 equaled 4")
       assert(fact2.toString ==
-        "No(" + NEWLINE + 
-        "  Yes(expected 3, and got 3) &&" + NEWLINE + 
-        "  No(" + NEWLINE + 
-        "    !Yes(expected 4, and got 4)" + NEWLINE + 
-        "  )" + NEWLINE + 
+        "No(" + NEWLINE +
+        "  Yes(expected 3, and got 3) &&" + NEWLINE +
+        "  No(" + NEWLINE +
+        "    !Yes(expected 4, and got 4)" + NEWLINE +
+        "  )" + NEWLINE +
         ")"
       )
       assert(!fact2.isVacuousYes)
@@ -206,7 +206,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
         "      !Yes(expected 4, and got 4)" + NEWLINE +
         "    )" + NEWLINE +
         "  ) ||" + NEWLINE +
-        "  No(expected 5, but got 6)" + NEWLINE + 
+        "  No(expected 5, but got 6)" + NEWLINE +
         ")"
       )
       assert(fact.toString ==
@@ -324,6 +324,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
     }
   }
 
+  // SKIP-DOTTY-START
   describe("The expectThrows method") {
     it("should catch subtypes") {
       class MyException extends RuntimeException
@@ -368,6 +369,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
       }
     }
   }
+  // SKIP-DOTTY-END
 
   describe("The expect method") {
 
@@ -525,6 +527,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
         assert(!fact.isVacuousYes)
       }
 
+      // SKIP-DOTTY-START
       it("should return No with correct fact message when type check failed") {
         val fact = expectCompiles("val a: String = 2")
         assert(fact.isInstanceOf[Fact.Leaf])
@@ -545,6 +548,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
 
         assert(!fact.isVacuousYes)
       }
+      // SKIP-DOTTY-END
 
       it("should return Yes with correct fact message when the code compiles with implicit view in scope") {
         import scala.collection.JavaConverters._
@@ -581,6 +585,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
         assert(!fact.isVacuousYes)
       }
 
+      // SKIP-DOTTY-START
       it("should return No with correct fact message when type check failed") {
         val fact =
           expectCompiles(
@@ -620,6 +625,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
           ))
         assert(!fact.isVacuousYes)
       }
+      // SKIP-DOTTY-END
 
       it("should return Yes with correct fact message when the code compiles with implicit view in scope") {
         import scala.collection.JavaConverters._
@@ -663,6 +669,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
         assert(!fact.isVacuousYes)
       }
 
+      // SKIP-DOTTY-START
       it("should return No with correct fact message when parse failed ") {
         val fact = expectTypeError("println(\"test)")
         assert(fact.isInstanceOf[Fact.Leaf])
@@ -673,6 +680,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
           assert(fact.factMessage == Resources.expectedTypeErrorButGotParseError("unclosed string literal", "println(\"test)"))
         assert(!fact.isVacuousYes)
       }
+      // SKIP-DOTTY-END
 
       it("should return Yes with correct fact message when used with 'val i: Int = null'") {
         val fact = expectTypeError("val i: Int = null")
@@ -735,6 +743,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
         assert(!fact.isVacuousYes)
       }
 
+      // SKIP-DOTTY-START
       it("should return No with correct fact message when parse failed ") {
         val fact =
           expectTypeError(
@@ -756,6 +765,7 @@ class ExpectationsSpec extends FunSpec with Expectations {
           ))
         assert(!fact.isVacuousYes)
       }
+      // SKIP-DOTTY-END
 
       it("should return Yes with correct fact message when used with 'val i: Int = null'") {
         val fact =

scalatest.dotty/src/main/scala/org/scalatest/CompileMacro.scala

@@ -27,7 +27,7 @@ object CompileMacro {
   // parse and type check a code snippet, generate code to throw TestFailedException when type check passes or parse error
   def assertTypeErrorImpl(code: String, pos: Expr[source.Position])(implicit refl: Reflection): Expr[Assertion] = {
     import refl._
-    
+
     if (!typing.typeChecks(code)) '{ Succeeded }
     else '{
       val messageExpr = Resources.expectedCompileErrorButGotNone(${ code.toExpr })
@@ -54,7 +54,7 @@ object CompileMacro {
        }
     else
       '{
-          val messageExpr = Resources.expectedTypeErrorButGotNone(${ code.toExpr })
+          val messageExpr = Resources.gotTypeErrorAsExpected(${ code.toExpr })
 
           Fact.Yes(
             messageExpr,
@@ -86,7 +86,7 @@ object CompileMacro {
 
     if (typing.typeChecks(code))
       '{
-          val messageExpr = Resources.expectedTypeErrorButGotNone(${ code.toExpr })
+          val messageExpr = Resources.expectedCompileErrorButGotNone(${ code.toExpr })
           Fact.No(
             messageExpr,
             messageExpr,
@@ -100,7 +100,7 @@ object CompileMacro {
        }
     else
       '{
-          val messageExpr = Resources.expectedTypeErrorButGotNone(${ code.toExpr })
+          val messageExpr = Resources.didNotCompile(${ code.toExpr })
 
           Fact.Yes(
             messageExpr,
@@ -131,7 +131,7 @@ object CompileMacro {
 
     if (typing.typeChecks(code))
       '{
-          val messageExpr = Resources.expectedTypeErrorButGotNone(${ code.toExpr })
+          val messageExpr = Resources.compiledSuccessfully(${ code.toExpr })
           Fact.Yes(
             messageExpr,
             messageExpr,
@@ -145,7 +145,7 @@ object CompileMacro {
        }
     else
       '{
-          val messageExpr = Resources.expectedTypeErrorButGotNone(${ code.toExpr })
+          val messageExpr = Resources.expectedNoErrorButGotTypeError("", ${ code.toExpr })
 
           Fact.No(
             messageExpr,
@@ -174,7 +174,7 @@ object CompileMacro {
       }
 
     self.unseal.underlyingArgument match {
-      
+
       case Apply(
              Apply(
                Select(_, shouldOrMustTerconvertToStringShouldOrMustWrapperTermName),
@@ -196,7 +196,7 @@ object CompileMacro {
              ),
              _
            ) if shouldOrMustTerconvertToStringShouldOrMustWrapperTermName ==  "convertToString" + shouldOrMust.capitalize + "Wrapper" =>
-        checkNotCompile(code.toString)     
+        checkNotCompile(code.toString)
 
       case other =>
         throw QuoteError("The '" + shouldOrMust + " compile' syntax only works with String literals.")
@@ -209,7 +209,7 @@ object CompileMacro {
 
   // used by mustNot compile syntax, delegate to assertNotCompileImpl to generate code
   def mustNotCompileImpl(self: Expr[MustMatchers#AnyMustWrapper[_]], compileWord: Expr[CompileWord])(pos: Expr[source.Position])(implicit refl: Reflection): Expr[Assertion] =
-    assertNotCompileImpl(self, compileWord, pos)("must")  
+    assertNotCompileImpl(self, compileWord, pos)("must")
 
   // check that a code snippet does not compile
   def assertNotTypeCheckImpl(self: Expr[Matchers#AnyShouldWrapper[_]], typeCheckWord: Expr[TypeCheckWord], pos: Expr[source.Position])(shouldOrMust: String)(implicit refl: Reflection): Expr[Assertion] = {
@@ -249,7 +249,7 @@ object CompileMacro {
              _
            ) if shouldOrMustTerconvertToStringShouldOrMustWrapperTermName ==  "convertToString" + shouldOrMust.capitalize + "Wrapper" =>
         // LHS is a normal string literal, call checkNotTypeCheck with the extracted code string to generate code
-        checkNotTypeCheck(code.toString)   
+        checkNotTypeCheck(code.toString)
 
       case _ =>
         throw QuoteError("The '" + shouldOrMust + "Not typeCheck' syntax only works with String literals.")
@@ -301,7 +301,7 @@ object CompileMacro {
              _
            ) if shouldOrMustTerconvertToStringShouldOrMustWrapperTermName ==  "convertToString" + shouldOrMust.capitalize + "Wrapper" =>
         // LHS is a normal string literal, call checkCompile with the extracted code string to generate code
-        checkCompile(code.toString)    
+        checkCompile(code.toString)
 
       case other =>
         println("###other: " + other)

scalatest.dotty/src/main/scala/org/scalatest/Expectations.scala

@@ -21,8 +21,14 @@ import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 import scala.reflect.ClassTag
 
+import scala.tasty._
+import scala.quoted._
+
 private[scalatest] trait Expectations {
 
+  inline def (inline x: String) stripMargin <: String =
+    ${ Expectations.stripMarginImpl(x) }
+
   // TODO: Need to make this and assertResult use custom equality I think.
   def expectResult(expected: Any)(actual: Any)(implicit prettifier: Prettifier, pos: source.Position): Fact = {
     if (!DefaultEquality.areEqualComparingArraysStructurally(actual, expected)) {
@@ -130,6 +136,8 @@ private[scalatest] trait Expectations {
 }
 
 object Expectations extends Expectations {
+  def stripMarginImpl(x: String)(implicit refl: Reflection): Expr[String] =
+    new scala.collection.immutable.StringOps(x).stripMargin.toExpr
 
   class ExpectationsHelper {
 

scalatest.dotty/src/main/scala/org/scalatest/ExpectationsMacro.scala

@@ -22,7 +22,7 @@ import scala.tasty._
 /**
  * Macro implementation that provides rich error message for boolean expression assertion.
  */
-private[scalatest] object ExpectationsMacro {
+object ExpectationsMacro {
 
   def expect(condition: Expr[Boolean])(prettifier: Expr[Prettifier], pos: Expr[source.Position])(implicit refl: Reflection): Expr[Fact] = {
     import refl._