Added some tester implementations needed for async/await testing

boa-dev · Jun 9, 2022 · 681e6f6 · 681e6f6
1 parent ee6b955
commit 681e6f6
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/boa_engine/Cargo.toml b/boa_engine/Cargo.toml
@@ -51,11 +51,11 @@ dyn-clone = "1.0.5"
 once_cell = "1.12.0"
 tap = "1.0.1"
 icu_locale_canonicalizer = { version = "0.6.0", features = ["serde"], optional = true }
-icu_locid = { version = "0.6.0", features = ["serde"],  optional = true }
+icu_locid = { version = "0.6.0", features = ["serde"], optional = true }
 icu_datetime = { version = "0.6.0", features = ["serde"], optional = true }
 icu_plurals = { version = "0.6.0", features = ["serde"], optional = true }
 icu_provider = { version = "0.6.0", optional = true }
-icu_testdata = {version = "0.6.0", optional = true}
+icu_testdata = { version = "0.6.0", optional = true }
 sys-locale = { version = "0.2.0", optional = true }
 
 [dev-dependencies]

diff --git a/boa_tester/Cargo.toml b/boa_tester/Cargo.toml
@@ -14,6 +14,7 @@ publish = false
 [dependencies]
 boa_engine = { path = "../boa_engine", features = ["intl"], version = "0.14.0" }
 boa_interner = { path = "../boa_interner", version = "0.14.0" }
+boa_gc = { path = "../boa_gc", version = "0.14.0" }
 structopt = "0.3.26"
 serde = { version = "1.0.137", features = ["derive"] }
 serde_yaml = "0.8.24"

diff --git a/boa_tester/src/exec/js262.rs b/boa_tester/src/exec/js262.rs
@@ -13,6 +13,7 @@ pub(super) fn init(context: &mut Context) -> JsObject {
         .function(create_realm, "createRealm", 0)
         .function(detach_array_buffer, "detachArrayBuffer", 2)
         .function(eval_script, "evalScript", 1)
+        .function(gc, "gc", 0)
         .property("global", global_obj, Attribute::default())
         // .property("agent", agent, Attribute::default())
         .build();
@@ -99,7 +100,8 @@ fn eval_script(_this: &JsValue, args: &[JsValue], context: &mut Context) -> JsRe
 /// Wraps the host's garbage collection invocation mechanism, if such a capability exists.
 /// Must throw an exception if no capability exists. This is necessary for testing the
 /// semantics of any feature that relies on garbage collection, e.g. the `WeakRef` API.
-#[allow(dead_code)]
+#[allow(clippy::unnecessary_wraps)]
 fn gc(_this: &JsValue, _: &[JsValue], _context: &mut Context) -> JsResult<JsValue> {
-    todo!()
+    boa_gc::force_collect();
+    Ok(JsValue::undefined())
 }
diff --git a/boa_tester/src/exec/mod.rs b/boa_tester/src/exec/mod.rs
@@ -318,12 +318,18 @@ impl Test {
         }
 
         context
-            .eval(&harness.assert.as_ref())
+            .eval(harness.assert.as_ref())
             .map_err(|e| format!("could not run assert.js:\n{}", e.display()))?;
         context
-            .eval(&harness.sta.as_ref())
+            .eval(harness.sta.as_ref())
             .map_err(|e| format!("could not run sta.js:\n{}", e.display()))?;
 
+        if self.flags.contains(TestFlags::ASYNC) {
+            context
+                .eval(harness.doneprint_handle.as_ref())
+                .map_err(|e| format!("could not run doneprintHandle.js:\n{}", e.display()))?;
+        }
+
         for include in self.includes.iter() {
             context
                 .eval(

diff --git a/boa_tester/src/main.rs b/boa_tester/src/main.rs
@@ -342,6 +342,7 @@ fn run_test_suite(
 struct Harness {
     assert: Box<str>,
     sta: Box<str>,
+    doneprint_handle: Box<str>,
     includes: FxHashMap<Box<str>, Box<str>>,
 }
 

diff --git a/boa_tester/src/read.rs b/boa_tester/src/read.rs
@@ -84,7 +84,7 @@ pub(super) fn read_harness(test262_path: &Path) -> anyhow::Result<Harness> {
         let file_name = entry.file_name();
         let file_name = file_name.to_string_lossy();
 
-        if file_name == "assert.js" || file_name == "sta.js" {
+        if file_name == "assert.js" || file_name == "sta.js" || file_name == "doneprintHandle.js" {
             continue;
         }
 
@@ -102,10 +102,14 @@ pub(super) fn read_harness(test262_path: &Path) -> anyhow::Result<Harness> {
     let sta = fs::read_to_string(test262_path.join("harness/sta.js"))
         .context("error reading harnes/sta.js")?
         .into_boxed_str();
+    let doneprint_handle = fs::read_to_string(test262_path.join("harness/doneprintHandle.js"))
+        .context("error reading harnes/doneprintHandle.js")?
+        .into_boxed_str();
 
     Ok(Harness {
         assert,
         sta,
+        doneprint_handle,
         includes,
     })
 }