From 89ba1b515e91af1efc8111f09b1789fcee80f84c Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <zalim.bashorov@jetbrains.com>
Date: Thu, 10 Nov 2022 21:53:14 +0100
Subject: [PATCH] [Wasm, test] Use "dynamic import" to catch exception thrown
 during JS & Wasm modules initialization

---
 .../kotlin/js/testOld/BasicWasmBoxTest.kt        | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt
index 87d79475b0b..0e7ef05ede7 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.js.config.JSConfigurationKeys
 import org.jetbrains.kotlin.js.config.JsConfig
 import org.jetbrains.kotlin.js.facade.TranslationUnit
 import org.jetbrains.kotlin.js.testOld.engines.ExternalTool
-import org.jetbrains.kotlin.js.testOld.engines.SpiderMonkeyEngine
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtNamedFunction
@@ -44,8 +43,6 @@ abstract class BasicWasmBoxTest(
 ) : KotlinTestWithEnvironment() {
     private val testGroupOutputDirForCompilation = File(pathToRootOutputDir + "out/" + testGroupOutputDirPrefix)
 
-    private val spiderMonkey by lazy { SpiderMonkeyEngine() }
-
     private val COMMON_FILES_NAME = "_common"
 
     fun doTest(filePath: String) = doTestWithTransformer(filePath) { it }
@@ -148,14 +145,14 @@ abstract class BasicWasmBoxTest(
                 generateWat = generateWat,
             )
 
-            val startUnitTests = if (startUnitTests) "exports.startUnitTests?.();\n" else ""
-
             val testJsQuiet = """
-                import exports from './index.mjs';
-        
-                let actualResult
+                let actualResult;
                 try {
-                    ${startUnitTests}actualResult = exports.box();
+                    // Use "dynamic import" to catch exception happened during JS & Wasm modules initialization
+                    let jsModule = await import('./index.mjs');
+                    let wasmExports = jsModule.default;
+                    ${if (startUnitTests) "wasmExports.startUnitTests();" else ""}
+                    actualResult = wasmExports.box();
                 } catch(e) {
                     console.log('Failed with exception!')
                     console.log('Message: ' + e.message)
@@ -163,6 +160,7 @@ abstract class BasicWasmBoxTest(
                     console.log('Stack:')
                     console.log(e.stack)
                 }
+
                 if (actualResult !== "OK")
                     throw `Wrong box result '${'$'}{actualResult}'; Expected "OK"`;
             """.trimIndent()