From 8dff096ee90b151c1bd6253264c934245a9abdba Mon Sep 17 00:00:00 2001
From: Jamie Thompson <bishbashboshjt@gmail.com>
Date: Tue, 16 Feb 2021 14:09:40 +0100
Subject: [PATCH] update dotty, re-enable tests

---
 project/DottySupport.scala                                | 2 +-
 test/tasty/run/src-2/tastytest/TestMacroCompat.scala      | 4 ++--
 test/tasty/run/src-3/tastytest/MacroCompat.scala          | 8 ++++----
 .../tasty/test/scala/tools/tastytest/TastyTestJUnit.scala | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/project/DottySupport.scala b/project/DottySupport.scala
index 2669eff76e9f..792b02248725 100644
--- a/project/DottySupport.scala
+++ b/project/DottySupport.scala
@@ -12,7 +12,7 @@ import sbt.librarymanagement.{
   * Settings to support validation of TastyUnpickler against the release of dotty with the matching TASTy version
   */
 object TastySupport {
-  val supportedTASTyRelease = "3.0.0-M4-bin-20210214-80befc3-NIGHTLY" // TASTy version 28.0.1
+  val supportedTASTyRelease = "3.0.0-M4-bin-20210215-53a2dc5-NIGHTLY" // TASTy version 28.0.1
   val scala3Compiler = "org.scala-lang" % "scala3-compiler_3.0.0-M4" % supportedTASTyRelease
 }
 
diff --git a/test/tasty/run/src-2/tastytest/TestMacroCompat.scala b/test/tasty/run/src-2/tastytest/TestMacroCompat.scala
index fcd54bc7b8f9..afb296256af1 100644
--- a/test/tasty/run/src-2/tastytest/TestMacroCompat.scala
+++ b/test/tasty/run/src-2/tastytest/TestMacroCompat.scala
@@ -8,7 +8,7 @@ object TestMacroCompat extends Suite("TestMacroCompat") {
 
   test(assert(testCase(15) === ("15", Position("TestMacroCompat.scala", 9))))
   test(assert(constInt("") === 1))
-  // test(assert(mono === 1))
-  // test(assert(poly[String] === "String"))
+  test(assert(mono === 1))
+  test(assert(poly[String] === "String"))
 
 }
diff --git a/test/tasty/run/src-3/tastytest/MacroCompat.scala b/test/tasty/run/src-3/tastytest/MacroCompat.scala
index 9e292381f9d6..71ba8c03f063 100644
--- a/test/tasty/run/src-3/tastytest/MacroCompat.scala
+++ b/test/tasty/run/src-3/tastytest/MacroCompat.scala
@@ -11,11 +11,11 @@ object MacroCompat {
   inline def constInt[T](x: T): Int = ${ Macros3.constIntImpl[T]('x) }
 
   object Bundles {
-    // def mono: Int = macro MacroImpl.mono
-    // inline def mono: Int = ${ Macros3.monoImpl }
+    def mono: Int = macro MacroImpl.mono
+    inline def mono: Int = ${ Macros3.monoImpl }
 
-    // def poly[T]: String = macro MacroImpl.poly[T]
-    // inline def poly[T]: String = ${ Macros3.polyImpl[T] }
+    def poly[T]: String = macro MacroImpl.poly[T]
+    inline def poly[T]: String = ${ Macros3.polyImpl[T] }
   }
 
   def testCase(test: => Any)(implicit pos: Position): (String, Position) =
diff --git a/test/tasty/test/scala/tools/tastytest/TastyTestJUnit.scala b/test/tasty/test/scala/tools/tastytest/TastyTestJUnit.scala
index 69eb4168280f..a267db9b6cc7 100644
--- a/test/tasty/test/scala/tools/tastytest/TastyTestJUnit.scala
+++ b/test/tasty/test/scala/tools/tastytest/TastyTestJUnit.scala
@@ -76,7 +76,7 @@ import scala.reflect.runtime.ReflectionUtils
 object TastyTestJUnit {
   final implicit class TryOps(val op: Try[Unit]) extends AnyVal {
     def eval: Unit = op match {
-      case Failure(err) => throw ReflectionUtils.unwrapThrowable(err)//fail(ReflectionUtils.unwrapThrowable(err).toString)
+      case Failure(err) => fail(err.toString)
       case _ => ()
     }
   }