Change tests for i20946 to only check the assert message in code

scala · Nov 1, 2024 · 014d0db · 014d0db
1 parent 39d45dc
commit 014d0db
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 45 deletions.
diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -301,7 +301,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object DefDef extends DefDefModule:
       def apply(symbol: Symbol, rhsFn: List[List[Tree]] => Option[Term]): DefDef =
-        xCheckMacroAssert(symbol.isTerm, s"expected a term symbol but received $symbol")
+        xCheckMacroAssert(symbol.isTerm, s"expected a term symbol, but received $symbol")
         xCheckMacroAssert(symbol.flags.is(Flags.Method), "expected a symbol with `Method` flag set")
         withDefaultPos(tpd.DefDef(symbol.asTerm, prefss =>
           xCheckedMacroOwners(xCheckMacroValidExpr(rhsFn(prefss)), symbol).getOrElse(tpd.EmptyTree)
@@ -472,7 +472,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
       def term(tp: TermRef): Ref =
         withDefaultPos(tpd.ref(tp).asInstanceOf[tpd.RefTree])
       def apply(sym: Symbol): Ref =
-        assert(sym.isTerm, s"expected a term symbol but received $sym")
+        assert(sym.isTerm, s"expected a term symbol, but received $sym")
         val refTree = tpd.ref(sym) match
           case t @ tpd.This(ident) => // not a RefTree, so we need to work around this - issue #19732
             // ident in `This` can be a TypeIdent of sym, so we manually prepare the ref here,
@@ -1128,7 +1128,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
       def of[T <: AnyKind](using tp: scala.quoted.Type[T]): TypeTree =
         tp.asInstanceOf[TypeImpl].typeTree
       def ref(sym: Symbol): TypeTree =
-        assert(sym.isType, "Expected a type symbol, but got " + sym)
+        assert(sym.isType, s"Expected a type symbol, but got $sym")
         tpd.ref(sym)
     end TypeTree
 

diff --git a/tests/neg/i20946.check b/tests/neg/i20946.check
diff --git a/tests/neg/i20946/Macro_1.scala b/tests/neg/i20946/Macro_1.scala
@@ -3,8 +3,12 @@ import scala.quoted.*
 def macroWithAssertFailingImpl[T: Type](t: Expr[T])(using Quotes): Expr[Unit] = {
   import quotes.reflect.*
 
-  Ref(TypeRepr.of[T].typeSymbol)
+  try
+    Ref(TypeRepr.of[T].typeSymbol)
+  catch
+    case ex: Throwable =>
+      if ex.getMessage().contains("expected a term symbol, but received ") then
+        throw ex
 
   '{()}
 }
-
diff --git a/tests/neg/i20946/Test_2.scala b/tests/neg/i20946/Test_2.scala
@@ -3,4 +3,3 @@ inline def macroWithAssertFailing[T](t: T): Unit = ${ macroWithAssertFailingImpl
 @main
 def run =
   macroWithAssertFailing[Int](123) // error
-
diff --git a/tests/neg/i20946a.check b/tests/neg/i20946a.check
diff --git a/tests/neg/i20946a/Macro_1.scala b/tests/neg/i20946a/Macro_1.scala
@@ -3,8 +3,12 @@ import scala.quoted.*
 def macroWithAssertFailingImpl[T: Type](t: Expr[T])(using Quotes): Expr[Unit] = {
   import quotes.reflect.*
 
-  TypeIdent(t.asTerm.symbol)
+  try
+    TypeIdent(t.asTerm.symbol)
+  catch
+    case ex: Throwable =>
+      if ex.getMessage().contains("Expected a type symbol, but got ") then
+        throw ex
 
   '{()}
 }
-
diff --git a/tests/neg/i20946a/Test_2.scala b/tests/neg/i20946a/Test_2.scala
@@ -3,4 +3,3 @@ inline def macroWithAssertFailing[T](t: T): Unit = ${ macroWithAssertFailingImpl
 @main
 def run =
   macroWithAssertFailing[Int](123) // error
-