Apply review

boa_engine/src/builtins/array/tests.rs

@@ -1,8 +1,5 @@
 use super::Array;
-use crate::{
-    builtins::{error::ErrorKind, Number},
-    run_test_actions, Context, JsValue, TestAction,
-};
+use crate::{builtins::Number, run_test_actions, Context, JsNativeErrorKind, JsValue, TestAction};
 use indoc::indoc;
 
 #[test]
@@ -191,7 +188,7 @@ fn flat_map_not_callable() {
             var array = [1,2,3];
             array.flatMap("not a function");
         "#},
-        ErrorKind::Type,
+        JsNativeErrorKind::Type,
         "flatMap mapper function is not callable",
     )]);
 }
@@ -639,7 +636,7 @@ fn reduce() {
         // Empty array
         TestAction::assert_native_error(
             "[].reduce((acc, x) => acc + x);",
-            ErrorKind::Type,
+            JsNativeErrorKind::Type,
             "Array.prototype.reduce: called on an empty array and with no initial value",
         ),
         // Array with no defined elements
@@ -650,7 +647,7 @@ fn reduce() {
                 delete deleteArr[1];
                 deleteArr.reduce((acc, x) => acc + x);
             "#},
-            ErrorKind::Type,
+            JsNativeErrorKind::Type,
             "Array.prototype.reduce: called on an empty array and with no initial value",
         ),
         // No callback
@@ -659,7 +656,7 @@ fn reduce() {
                 var someArr = [0, 1];
                 someArr.reduce('');
             "#},
-            ErrorKind::Type,
+            JsNativeErrorKind::Type,
             "Array.prototype.reduce: callback function is not callable",
         ),
     ]);
@@ -720,7 +717,7 @@ fn reduce_right() {
         // Empty array
         TestAction::assert_native_error(
             "[].reduceRight((acc, x) => acc + x);",
-            ErrorKind::Type,
+            JsNativeErrorKind::Type,
             "Array.prototype.reduceRight: called on an empty array and with no initial value",
         ),
         // Array with no defined elements
@@ -731,7 +728,7 @@ fn reduce_right() {
                 delete deleteArr[1];
                 deleteArr.reduceRight((acc, x) => acc + x);
             "#},
-            ErrorKind::Type,
+            JsNativeErrorKind::Type,
             "Array.prototype.reduceRight: called on an empty array and with no initial value",
         ),
         // No callback
@@ -740,7 +737,7 @@ fn reduce_right() {
                 var otherArr = [0, 1];
                 otherArr.reduceRight("");
             "#},
-            ErrorKind::Type,
+            JsNativeErrorKind::Type,
             "Array.prototype.reduceRight: callback function is not callable",
         ),
     ]);
@@ -865,7 +862,7 @@ fn array_spread_arrays() {
 fn array_spread_non_iterable() {
     run_test_actions([TestAction::assert_native_error(
         "const array2 = [...5];",
-        ErrorKind::Type,
+        JsNativeErrorKind::Type,
         "value with type `number` is not iterable",
     )]);
 }

boa_engine/src/builtins/bigint/tests.rs

@@ -1,4 +1,4 @@
-use crate::{builtins::error::ErrorKind, run_test_actions, JsBigInt, TestAction};
+use crate::{run_test_actions, JsBigInt, JsNativeErrorKind, TestAction};
 
 #[test]
 fn equality() {
@@ -62,17 +62,17 @@ fn bigint_function_throws() {
     run_test_actions([
         TestAction::assert_native_error(
             "BigInt(0.1)",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "cannot convert 0.1 to a BigInt",
         ),
         TestAction::assert_native_error(
             "BigInt(null)",
-            ErrorKind::Type,
+            JsNativeErrorKind::Type,
             "cannot convert null to a BigInt",
         ),
         TestAction::assert_native_error(
             "BigInt(undefined)",
-            ErrorKind::Type,
+            JsNativeErrorKind::Type,
             "cannot convert undefined to a BigInt",
         ),
     ]);
@@ -108,29 +108,37 @@ fn operations() {
         ),
         TestAction::assert_eq("15000n / 50n", JsBigInt::from(300)),
         TestAction::assert_eq("15001n / 50n", JsBigInt::from(300)),
-        TestAction::assert_native_error("1n/0n", ErrorKind::Range, "BigInt division by zero"),
+        TestAction::assert_native_error(
+            "1n/0n",
+            JsNativeErrorKind::Range,
+            "BigInt division by zero",
+        ),
         TestAction::assert_eq("15007n % 10n", JsBigInt::from(7)),
-        TestAction::assert_native_error("1n % 0n", ErrorKind::Range, "BigInt division by zero"),
+        TestAction::assert_native_error(
+            "1n % 0n",
+            JsNativeErrorKind::Range,
+            "BigInt division by zero",
+        ),
         TestAction::assert_eq(
             "100n ** 10n",
             JsBigInt::from_string("100000000000000000000").unwrap(),
         ),
         TestAction::assert_native_error(
             "10n ** (-10n)",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "BigInt negative exponent",
         ),
         TestAction::assert_eq("8n << 2n", JsBigInt::from(32)),
         TestAction::assert_native_error(
             "1000n << 1000000000000000n",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "Maximum BigInt size exceeded",
         ),
         TestAction::assert_eq("8n >> 2n", JsBigInt::from(2)),
         // TODO: this should return 0n instead of throwing
         TestAction::assert_native_error(
             "1000n >> 1000000000000000n",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "Maximum BigInt size exceeded",
         ),
     ]);
@@ -151,17 +159,17 @@ fn to_string_invalid_radix() {
     run_test_actions([
         TestAction::assert_native_error(
             "10n.toString(null)",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "radix must be an integer at least 2 and no greater than 36",
         ),
         TestAction::assert_native_error(
             "10n.toString(-1)",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "radix must be an integer at least 2 and no greater than 36",
         ),
         TestAction::assert_native_error(
             "10n.toString(37)",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "radix must be an integer at least 2 and no greater than 36",
         ),
     ]);
@@ -219,22 +227,22 @@ fn as_int_n_errors() {
     run_test_actions([
         TestAction::assert_native_error(
             "BigInt.asIntN(-1, 0n)",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "Index must be between 0 and  2^53 - 1",
         ),
         TestAction::assert_native_error(
             "BigInt.asIntN(-2.5, 0n)",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "Index must be between 0 and  2^53 - 1",
         ),
         TestAction::assert_native_error(
             "BigInt.asIntN(9007199254740992, 0n)",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "Index must be between 0 and  2^53 - 1",
         ),
         TestAction::assert_native_error(
             "BigInt.asIntN(0n, 0n)",
-            ErrorKind::Type,
+            JsNativeErrorKind::Type,
             "argument must not be a bigint",
         ),
     ]);
@@ -292,22 +300,22 @@ fn as_uint_n_errors() {
     run_test_actions([
         TestAction::assert_native_error(
             "BigInt.asUintN(-1, 0n)",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "Index must be between 0 and  2^53 - 1",
         ),
         TestAction::assert_native_error(
             "BigInt.asUintN(-2.5, 0n)",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "Index must be between 0 and  2^53 - 1",
         ),
         TestAction::assert_native_error(
             "BigInt.asUintN(9007199254740992, 0n)",
-            ErrorKind::Range,
+            JsNativeErrorKind::Range,
             "Index must be between 0 and  2^53 - 1",
         ),
         TestAction::assert_native_error(
             "BigInt.asUintN(0n, 0n)",
-            ErrorKind::Type,
+            JsNativeErrorKind::Type,
             "argument must not be a bigint",
         ),
     ]);

boa_engine/src/builtins/date/tests.rs

@@ -1,4 +1,4 @@
-use crate::{builtins::error::ErrorKind, run_test_actions, TestAction};
+use crate::{run_test_actions, JsNativeErrorKind, TestAction};
 use chrono::{Local, NaiveDate, NaiveDateTime, NaiveTime, TimeZone};
 use indoc::indoc;
 
@@ -47,7 +47,7 @@ fn timestamp_from_utc(
 fn date_this_time_value() {
     run_test_actions([TestAction::assert_native_error(
         "({toString: Date.prototype.toString}).toString()",
-        ErrorKind::Type,
+        JsNativeErrorKind::Type,
         "'this' is not a Date",
     )]);
 }

boa_engine/src/builtins/function/tests.rs

@@ -1,11 +1,10 @@
 use crate::{
-    builtins::error::ErrorKind,
     error::JsNativeError,
     js_string,
     native_function::NativeFunction,
     object::{FunctionObjectBuilder, JsObject},
     property::{Attribute, PropertyDescriptor},
-    run_test_actions, JsValue, TestAction,
+    run_test_actions, JsNativeErrorKind, JsValue, TestAction,
 };
 use indoc::indoc;
 
@@ -60,7 +59,7 @@ fn function_prototype() {
         ),
         TestAction::assert_native_error(
             "new Function.prototype()",
-            ErrorKind::Type,
+            JsNativeErrorKind::Type,
             "not a constructor",
         ),
     ]);
@@ -81,7 +80,7 @@ fn function_prototype_call_throw() {
             let call = Function.prototype.call;
             call(call)
         "#},
-        ErrorKind::Type,
+        JsNativeErrorKind::Type,
         "undefined is not a function",
     )]);
 }
@@ -181,12 +180,12 @@ fn function_constructor_early_errors_super() {
     run_test_actions([
         TestAction::assert_native_error(
             "Function('super()')()",
-            ErrorKind::Syntax,
+            JsNativeErrorKind::Syntax,
             "invalid `super` call",
         ),
         TestAction::assert_native_error(
             "Function('super.a')()",
-            ErrorKind::Syntax,
+            JsNativeErrorKind::Syntax,
             "invalid `super` reference",
         ),
     ]);

boa_engine/src/builtins/json/tests.rs

@@ -1,6 +1,6 @@
 use indoc::indoc;
 
-use crate::{builtins::error::ErrorKind, run_test_actions, JsValue, TestAction};
+use crate::{run_test_actions, JsNativeErrorKind, JsValue, TestAction};
 
 #[test]
 fn json_sanity() {
@@ -307,7 +307,7 @@ fn json_fields_should_be_enumerable() {
 fn json_parse_with_no_args_throws_syntax_error() {
     run_test_actions([TestAction::assert_native_error(
         "JSON.parse();",
-        ErrorKind::Syntax,
+        JsNativeErrorKind::Syntax,
         "expected value at line 1 column 1",
     )]);
 }

boa_engine/src/builtins/map/tests.rs

@@ -1,4 +1,4 @@
-use crate::{builtins::error::ErrorKind, run_test_actions, JsValue, TestAction};
+use crate::{run_test_actions, JsNativeErrorKind, JsValue, TestAction};
 use indoc::indoc;
 
 #[test]
@@ -242,7 +242,7 @@ fn recursive_display() {
 fn not_a_function() {
     run_test_actions([TestAction::assert_native_error(
         "let map = Map()",
-        ErrorKind::Type,
+        JsNativeErrorKind::Type,
         "calling a builtin Map constructor without new is forbidden",
     )]);
 }

boa_engine/src/builtins/number/tests.rs

@@ -1,10 +1,7 @@
 #![allow(clippy::float_cmp)]
 
 use crate::{
-    builtins::{error::ErrorKind, Number},
-    run_test_actions,
-    value::AbstractRelation,
-    TestAction,
+    builtins::Number, run_test_actions, value::AbstractRelation, JsNativeErrorKind, TestAction,
 };
 
 #[test]
@@ -81,10 +78,10 @@ fn to_precision() {
             "(1/3).toPrecision(60)",
             "0.333333333333333314829616256247390992939472198486328125000000",
         ),
-        TestAction::assert_native_error("(1).toPrecision(101)", ErrorKind::Range, ERROR),
-        TestAction::assert_native_error("(1).toPrecision(0)", ErrorKind::Range, ERROR),
-        TestAction::assert_native_error("(1).toPrecision(-2000)", ErrorKind::Range, ERROR),
-        TestAction::assert_native_error("(1).toPrecision('%')", ErrorKind::Range, ERROR),
+        TestAction::assert_native_error("(1).toPrecision(101)", JsNativeErrorKind::Range, ERROR),
+        TestAction::assert_native_error("(1).toPrecision(0)", JsNativeErrorKind::Range, ERROR),
+        TestAction::assert_native_error("(1).toPrecision(-2000)", JsNativeErrorKind::Range, ERROR),
+        TestAction::assert_native_error("(1).toPrecision('%')", JsNativeErrorKind::Range, ERROR),
     ]);
 }