From fe76a022e1ffd3c1da864f9633eccfa05b818ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= <sjrdoeraene@gmail.com>
Date: Thu, 13 Sep 2018 16:49:09 +0200
Subject: [PATCH] Use portable-scala-reflect instead of the deprecated
 TestUtils.

`TestUtils` is deprecated in Scala.js 0.6.25. It has been replaced
by the more general portable-scala-reflect library. This commit
migrates to using the latter.

Since portable-scala-reflect does not support Scala Native yet, we
need a bit more stuff in `PlatformShims`. These won't be necessary
when Scala Native implements
https://github.com/scala-native/scala-native/issues/1279 and
portable-scala-reflect starts supporting Scala Native.
---
 build.sbt                                           |  7 +++++--
 utest/js/src/main/scala/utest/PlatformShims.scala   | 11 +++++++++++
 utest/jvm/src/main/scala/utest/PlatformShims.scala  | 13 +++++++++++--
 .../native/src/main/scala/utest/PlatformShims.scala |  7 +++++++
 utest/shared/src/main/scala/utest/TestSuite.scala   |  3 ++-
 .../src/main/scala/utest/runner/BaseRunner.scala    |  3 +--
 6 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/build.sbt b/build.sbt
index 025ba05a..20824eda 100644
--- a/build.sbt
+++ b/build.sbt
@@ -59,12 +59,15 @@ lazy val utest = crossProject(JSPlatform, JVMPlatform, NativePlatform)
 
 )
   .jsSettings(
-    libraryDependencies += "org.scala-js" %% "scalajs-test-interface" % scalaJSVersion
+    libraryDependencies ++= Seq(
+      "org.scala-js" %% "scalajs-test-interface" % scalaJSVersion,
+      "org.portable-scala" %%% "portable-scala-reflect" % "0.1.0"
+    )
   )
   .jvmSettings(
     libraryDependencies ++= Seq(
       "org.scala-sbt" % "test-interface" % "1.0",
-      "org.scala-js" %% "scalajs-stubs" % scalaJSVersion % "provided"
+      "org.portable-scala" %%% "portable-scala-reflect" % "0.1.0"
     ),
     resolvers += Resolver.sonatypeRepo("snapshots")
   )
diff --git a/utest/js/src/main/scala/utest/PlatformShims.scala b/utest/js/src/main/scala/utest/PlatformShims.scala
index 84b6c990..9196f804 100644
--- a/utest/js/src/main/scala/utest/PlatformShims.scala
+++ b/utest/js/src/main/scala/utest/PlatformShims.scala
@@ -1,6 +1,7 @@
 package utest
 
 import scala.concurrent.Future
+import org.portablescala.reflect.Reflect
 
 /**
  * Platform specific stuff that differs between JVM and JS
@@ -14,4 +15,14 @@ object PlatformShims {
       )
     }
   }
+
+  type EnableReflectiveInstantiation =
+    org.portablescala.reflect.annotation.EnableReflectiveInstantiation
+
+  def loadModule(name: String, loader: ClassLoader): Any = {
+    Reflect
+      .lookupLoadableModuleClass(name + "$", loader)
+      .getOrElse(throw new ClassNotFoundException(name))
+      .loadModule()
+  }
 }
diff --git a/utest/jvm/src/main/scala/utest/PlatformShims.scala b/utest/jvm/src/main/scala/utest/PlatformShims.scala
index 661751f8..addcb5a2 100644
--- a/utest/jvm/src/main/scala/utest/PlatformShims.scala
+++ b/utest/jvm/src/main/scala/utest/PlatformShims.scala
@@ -1,13 +1,22 @@
 package utest
 
 import scala.concurrent.{Await, Future}
-import scala.util.{Failure, Success}
 import concurrent.duration._
-import java.io.{PrintWriter, StringWriter}
+import org.portablescala.reflect.Reflect
 
 /**
  * Platform specific stuff that differs between JVM and JS
  */
 object PlatformShims {
   def await[T](f: Future[T]): T = Await.result(f, 10.hours)
+
+  type EnableReflectiveInstantiation =
+    org.portablescala.reflect.annotation.EnableReflectiveInstantiation
+
+  def loadModule(name: String, loader: ClassLoader): Any = {
+    Reflect
+      .lookupLoadableModuleClass(name + "$", loader)
+      .getOrElse(throw new ClassNotFoundException(name))
+      .loadModule()
+  }
 }
diff --git a/utest/native/src/main/scala/utest/PlatformShims.scala b/utest/native/src/main/scala/utest/PlatformShims.scala
index 097a6202..9e481d52 100644
--- a/utest/native/src/main/scala/utest/PlatformShims.scala
+++ b/utest/native/src/main/scala/utest/PlatformShims.scala
@@ -3,6 +3,7 @@ package utest
 // Taken from the implementation for JS
 
 import scala.concurrent.Future
+import org.scalajs.testinterface.TestUtils
 
 /**
  * Platform specific stuff that differs between JVM and Native
@@ -16,4 +17,10 @@ object PlatformShims {
       )
     }
   }
+
+  type EnableReflectiveInstantiation =
+    scala.scalajs.reflect.annotation.EnableReflectiveInstantiation
+
+  def loadModule(name: String, loader: ClassLoader): Any =
+    TestUtils.loadModule(name, loader)
 }
diff --git a/utest/shared/src/main/scala/utest/TestSuite.scala b/utest/shared/src/main/scala/utest/TestSuite.scala
index c44a7632..ab2d74d9 100644
--- a/utest/shared/src/main/scala/utest/TestSuite.scala
+++ b/utest/shared/src/main/scala/utest/TestSuite.scala
@@ -8,7 +8,8 @@ import utest.framework.Formatter
 import scala.concurrent.{ExecutionContext, Future}
 import scala.reflect.macros.Context
 import scala.language.experimental.macros
-import scala.scalajs.reflect.annotation.EnableReflectiveInstantiation
+
+import PlatformShims.EnableReflectiveInstantiation
 
 /**
  * Marker class used to mark an `object` as something containing tests. Used
diff --git a/utest/shared/src/main/scala/utest/runner/BaseRunner.scala b/utest/shared/src/main/scala/utest/runner/BaseRunner.scala
index 08a22cd1..e5969dd0 100644
--- a/utest/shared/src/main/scala/utest/runner/BaseRunner.scala
+++ b/utest/shared/src/main/scala/utest/runner/BaseRunner.scala
@@ -4,7 +4,6 @@ package runner
 import sbt.testing._
 
 import scala.util.Failure
-import org.scalajs.testinterface.TestUtils
 import utest.framework.{StackMarker, Tree}
 object BaseRunner{
   /**
@@ -106,7 +105,7 @@ abstract class BaseRunner(val args: Array[String],
       try {
         Right(
           StackMarker.dropOutside(
-            TestUtils.loadModule(suiteName, testClassLoader).asInstanceOf[TestSuite]
+            PlatformShims.loadModule(suiteName, testClassLoader).asInstanceOf[TestSuite]
           )
         )
       } catch{case e: Throwable => Left(e)}