Fix broken tests

boa-dev · Jan 19, 2021 · e698d16 · e698d16
1 parent 1c170a5
commit e698d16
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 40 deletions.
diff --git a/boa/src/builtins/json/tests.rs b/boa/src/builtins/json/tests.rs
@@ -217,10 +217,10 @@ fn json_stringify_pretty_print() {
     );
     let expected = forward(
         &mut context,
-        r#"'{
-    "a": "b",
-    "b": "c"
-}'"#,
+        r#"'{\n'
+            +'    "a": "b",\n'
+            +'    "b": "c"\n'
+            +'}'"#,
     );
     assert_eq!(actual, expected);
 }
@@ -235,10 +235,10 @@ fn json_stringify_pretty_print_four_spaces() {
     );
     let expected = forward(
         &mut context,
-        r#"'{
-    "a": "b",
-    "b": "c"
-}'"#,
+        r#"'{\n'
+            +'    "a": "b",\n'
+            +'    "b": "c"\n'
+            +'}'"#,
     );
     assert_eq!(actual, expected);
 }
@@ -253,10 +253,10 @@ fn json_stringify_pretty_print_twenty_spaces() {
     );
     let expected = forward(
         &mut context,
-        r#"'{
-          "a": "b",
-          "b": "c"
-}'"#,
+        r#"'{\n'
+            +'          "a": "b",\n'
+            +'          "b": "c"\n'
+            +'}'"#,
     );
     assert_eq!(actual, expected);
 }
@@ -271,10 +271,10 @@ fn json_stringify_pretty_print_with_number_object() {
     );
     let expected = forward(
         &mut context,
-        r#"'{
-          "a": "b",
-          "b": "c"
-}'"#,
+        r#"'{\n'
+        +'          "a": "b",\n'
+        +'          "b": "c"\n'
+        +'}'"#,
     );
     assert_eq!(actual, expected);
 }
@@ -301,10 +301,10 @@ fn json_stringify_pretty_print_with_too_long_string() {
     );
     let expected = forward(
         &mut context,
-        r#"'{
-abcdefghij"a": "b",
-abcdefghij"b": "c"
-}'"#,
+        r#"'{\n'
+            +'abcdefghij"a": "b",\n'
+            +'abcdefghij"b": "c"\n'
+            +'}'"#,
     );
     assert_eq!(actual, expected);
 }
@@ -319,10 +319,10 @@ fn json_stringify_pretty_print_with_string_object() {
     );
     let expected = forward(
         &mut context,
-        r#"'{
-abcd"a": "b",
-abcd"b": "c"
-}'"#,
+        r#"'{\n'
+            +'abcd"a": "b",\n'
+            +'abcd"b": "c"\n'
+            +'}'"#,
     );
     assert_eq!(actual, expected);
 }
@@ -404,10 +404,7 @@ fn json_parse_object_with_reviver() {
 fn json_parse_sets_prototypes() {
     let mut context = Context::new();
     let init = r#"
-        const jsonString = "{
-            \"ob\":{\"ject\":1},
-            \"arr\": [0,1]
-        }";
+        const jsonString = "{\"ob\":{\"ject\":1},\"arr\": [0,1]}";
         const jsonObj = JSON.parse(jsonString);
     "#;
     eprintln!("{}", forward(&mut context, init));

diff --git a/boa/src/builtins/string/tests.rs b/boa/src/builtins/string/tests.rs
@@ -533,34 +533,46 @@ fn test_match() {
 #[test]
 fn trim() {
     let mut context = Context::new();
-    assert_eq!(forward(&mut context, "'Hello'.trim()"), "\"Hello\"");
-    assert_eq!(forward(&mut context, "' \nHello'.trim()"), "\"Hello\"");
-    assert_eq!(forward(&mut context, "'Hello \n\r'.trim()"), "\"Hello\"");
-    assert_eq!(forward(&mut context, "' Hello '.trim()"), "\"Hello\"");
+    assert_eq!(forward(&mut context, r#"'Hello'.trim()"#), "\"Hello\"");
+    assert_eq!(forward(&mut context, r#"' \nHello'.trim()"#), "\"Hello\"");
+    assert_eq!(forward(&mut context, r#"'Hello \n\r'.trim()"#), "\"Hello\"");
+    assert_eq!(forward(&mut context, r#"' Hello '.trim()"#), "\"Hello\"");
 }
 
 #[test]
 fn trim_start() {
     let mut context = Context::new();
-    assert_eq!(forward(&mut context, "'Hello'.trimStart()"), "\"Hello\"");
-    assert_eq!(forward(&mut context, "' \nHello'.trimStart()"), "\"Hello\"");
+    assert_eq!(forward(&mut context, r#"'Hello'.trimStart()"#), "\"Hello\"");
     assert_eq!(
-        forward(&mut context, "'Hello \n'.trimStart()"),
+        forward(&mut context, r#"' \nHello'.trimStart()"#),
+        "\"Hello\""
+    );
+    assert_eq!(
+        forward(&mut context, r#"'Hello \n'.trimStart()"#),
         "\"Hello \n\""
     );
-    assert_eq!(forward(&mut context, "' Hello '.trimStart()"), "\"Hello \"");
+    assert_eq!(
+        forward(&mut context, r#"' Hello '.trimStart()"#),
+        "\"Hello \""
+    );
 }
 
 #[test]
 fn trim_end() {
     let mut context = Context::new();
-    assert_eq!(forward(&mut context, "'Hello'.trimEnd()"), "\"Hello\"");
+    assert_eq!(forward(&mut context, r#"'Hello'.trimEnd()"#), "\"Hello\"");
     assert_eq!(
-        forward(&mut context, "' \nHello'.trimEnd()"),
+        forward(&mut context, r#"' \nHello'.trimEnd()"#),
         "\" \nHello\""
     );
-    assert_eq!(forward(&mut context, "'Hello \n'.trimEnd()"), "\"Hello\"");
-    assert_eq!(forward(&mut context, "' Hello '.trimEnd()"), "\" Hello\"");
+    assert_eq!(
+        forward(&mut context, r#"'Hello \n'.trimEnd()"#),
+        "\"Hello\""
+    );
+    assert_eq!(
+        forward(&mut context, r#"' Hello '.trimEnd()"#),
+        "\" Hello\""
+    );
 }
 
 #[test]