Actual tests for js.import.

sjrd · sjrd · commit d8ca77033f44 · 2019-06-07T13:49:36.000+02:00
This is a followup to 17407e7 with actual tests for the asynchronous result of `js.import`, now that we can use async tests.
diff --git a/project/Build.scala b/project/Build.scala
@@ -1624,7 +1624,7 @@ object Build {
 
       inConfig(Bootstrap)(testSuiteBootstrapSetting)
   ).withScalaJSCompiler.withScalaJSJUnitPlugin.dependsOn(
-      library, jUnitRuntime, testBridge % "test"
+      library, jUnitRuntime, testBridge % "test", jUnitAsyncJS % "test"
   )
 
   lazy val testSuiteJVM: Project = (project in file("test-suite/jvm")).settings(
diff --git a/test-suite/js/src/test/require-dynamic-import/org/scalajs/testsuite/jsinterop/DynamicImportTest.scala b/test-suite/js/src/test/require-dynamic-import/org/scalajs/testsuite/jsinterop/DynamicImportTest.scala
@@ -16,32 +16,35 @@ import scala.concurrent.ExecutionContext.Implicits.global
 import org.junit.Assert._
 import org.junit.Test
 
+import org.scalajs.junit.async._
+
 /* This is currently hard-coded for Node.js modules in particular.
  * We are importing built-in Node.js modules, because we do not have any
  * infrastructure to load non-built-in modules. In the future, we should use
  * our own user-defined ES6 modules written in JavaScript.
  */
 class DynamicImportTest {
+  import DynamicImportTest._
+
+  @Test def testSuccessfulImport(): AsyncResult = {
+    await(js.`import`[QueryStringAPI]("querystring").toFuture.map { qs =>
+      assertEquals("object", js.typeOf(qs))
+
+      val dict = js.Dictionary("foo" -> "bar", "baz" -> "qux")
 
-  @Test def testDynImportParsesAndExecutes(): Unit = {
-    /* Since we do not have support for asynchronous tests, all we can do here
-     * is test that `js.import` parses, links, and executes without error,
-     * returning a `Promise`. We can't actually wait for the promise to
-     * resolve and hence cannot test its result.
-     *
-     * We will be able to revisit this in Scala.js 1.x.
-     */
-
-    def isPromise(x: Any): Boolean = x.isInstanceOf[js.Promise[_]]
-
-    assertTrue(isPromise(js.`import`[js.Any]("fs")))
-
-    val failedPromise = js.`import`[js.Any]("non-existent-module")
-    assertTrue(isPromise(failedPromise))
-    // Recover to avoid the unhandled rejected Promise warning of Node.js
-    failedPromise.toFuture.recover {
-      case th: Throwable => ()
-    }
+      assertEquals("foo=bar&baz=qux", qs.stringify(dict))
+      assertEquals("foo:bar;baz:qux", qs.stringify(dict, ";", ":"))
+    })
   }
 
+  @Test(expected = classOf[js.JavaScriptException])
+  def testFailedImport(): AsyncResult =
+    await(js.`import`[js.Any]("non-existent-module").toFuture)
+}
+
+object DynamicImportTest {
+  trait QueryStringAPI extends js.Any {
+    def stringify(obj: js.Dictionary[String]): String
+    def stringify(obj: js.Dictionary[String], sep: String, eq: String): String
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -1624,7 +1624,7 @@ object Build {`
`1624`	`1624`
`1625`	`1625`	`inConfig(Bootstrap)(testSuiteBootstrapSetting)`
`1626`	`1626`	`).withScalaJSCompiler.withScalaJSJUnitPlugin.dependsOn(`
`1627`		`- library, jUnitRuntime, testBridge % "test"`
	`1627`	`+ library, jUnitRuntime, testBridge % "test", jUnitAsyncJS % "test"`
`1628`	`1628`	`)`
`1629`	`1629`
`1630`	`1630`	`lazy val testSuiteJVM: Project = (project in file("test-suite/jvm")).settings(`