From c90a532d8f2dffa3ab0a1795e83b4a8a081a6587 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Fri, 8 Feb 2019 17:53:21 -0800 Subject: [PATCH] Update tests to reflect javascript grammar changes --- cli/src/tests/parser_test.rs | 43 +++++++++++-------- cli/src/tests/tree_test.rs | 4 +- lib/binding_web/test/node-test.js | 4 +- lib/binding_web/test/parser-test.js | 2 +- lib/binding_web/test/tree-test.js | 12 +++--- .../error_corpus/javascript_errors.txt | 23 +++++----- 6 files changed, 48 insertions(+), 40 deletions(-) diff --git a/cli/src/tests/parser_test.rs b/cli/src/tests/parser_test.rs index fddd9252..2fd8615f 100644 --- a/cli/src/tests/parser_test.rs +++ b/cli/src/tests/parser_test.rs @@ -173,8 +173,9 @@ fn test_parsing_after_editing_beginning_of_code() { tree.root_node().to_sexp(), concat!( "(program (expression_statement (binary_expression ", - "(number) ", - "(binary_expression (number) (parenthesized_expression (binary_expression (number) (identifier)))))))", + "left: (number) ", + "right: (binary_expression left: (number) right: (parenthesized_expression ", + "(binary_expression left: (number) right: (identifier)))))))", ) ); @@ -196,10 +197,12 @@ fn test_parsing_after_editing_beginning_of_code() { tree.root_node().to_sexp(), concat!( "(program (expression_statement (binary_expression ", - "(number) ", - "(binary_expression ", - "(number) ", - "(binary_expression (number) (parenthesized_expression (binary_expression (number) (identifier))))))))", + "left: (number) ", + "right: (binary_expression ", + "left: (number) ", + "right: (binary_expression ", + "left: (number) ", + "right: (parenthesized_expression (binary_expression left: (number) right: (identifier))))))))", ) ); @@ -217,8 +220,8 @@ fn test_parsing_after_editing_end_of_code() { tree.root_node().to_sexp(), concat!( "(program (expression_statement (binary_expression ", - "(identifier) ", - "(parenthesized_expression (binary_expression (number) (identifier))))))", + "left: (identifier) ", + "right: (parenthesized_expression (binary_expression left: (number) right: (identifier))))))", ) ); @@ -241,8 +244,12 @@ fn test_parsing_after_editing_end_of_code() { tree.root_node().to_sexp(), concat!( "(program (expression_statement (binary_expression ", - "(identifier) ", - "(parenthesized_expression (binary_expression (number) (member_expression (identifier) (property_identifier)))))))" + "left: (identifier) ", + "right: (parenthesized_expression (binary_expression ", + "left: (number) ", + "right: (member_expression ", + "object: (identifier) ", + "property: (property_identifier)))))))" ) ); @@ -482,9 +489,9 @@ fn test_parsing_with_one_included_range() { assert_eq!( js_tree.root_node().to_sexp(), concat!( - "(program (expression_statement (call_expression", - " (member_expression (identifier) (property_identifier))", - " (arguments (string)))))", + "(program (expression_statement (call_expression ", + "function: (member_expression object: (identifier) property: (property_identifier)) ", + "arguments: (arguments (string)))))", ) ); assert_eq!( @@ -637,8 +644,8 @@ fn test_parsing_with_external_scanner_that_uses_included_range_boundaries() { root.to_sexp(), concat!( "(program", - " (expression_statement (call_expression (identifier) (arguments)))", - " (expression_statement (call_expression (identifier) (arguments))))" + " (expression_statement (call_expression function: (identifier) arguments: (arguments)))", + " (expression_statement (call_expression function: (identifier) arguments: (arguments))))" ) ); @@ -754,7 +761,7 @@ fn test_parsing_with_a_newly_included_range() { first_tree.root_node().to_sexp(), concat!( "(program", - " (expression_statement (call_expression (identifier) (arguments))))", + " (expression_statement (call_expression function: (identifier) arguments: (arguments))))", ) ); @@ -765,8 +772,8 @@ fn test_parsing_with_a_newly_included_range() { tree.root_node().to_sexp(), concat!( "(program", - " (expression_statement (call_expression (identifier) (arguments)))", - " (expression_statement (call_expression (identifier) (arguments))))", + " (expression_statement (call_expression function: (identifier) arguments: (arguments)))", + " (expression_statement (call_expression function: (identifier) arguments: (arguments))))", ) ); diff --git a/cli/src/tests/tree_test.rs b/cli/src/tests/tree_test.rs index 4c03daa6..e22ce18e 100644 --- a/cli/src/tests/tree_test.rs +++ b/cli/src/tests/tree_test.rs @@ -12,7 +12,7 @@ fn test_tree_edit() { assert_eq!( tree.root_node().to_sexp(), - "(program (expression_statement (binary_expression (identifier) (identifier))))" + "(program (expression_statement (binary_expression left: (identifier) right: (identifier))))" ); // edit entirely within the tree's padding: @@ -247,7 +247,7 @@ fn test_get_changed_ranges() { assert_eq!( tree.root_node().to_sexp(), - "(program (expression_statement (object (pair (property_identifier) (null)))))" + "(program (expression_statement (object (pair key: (property_identifier) value: (null)))))" ); // Updating one token diff --git a/lib/binding_web/test/node-test.js b/lib/binding_web/test/node-test.js index 5d5716f9..1f326793 100644 --- a/lib/binding_web/test/node-test.js +++ b/lib/binding_web/test/node-test.js @@ -228,7 +228,7 @@ describe("Node", () => { const node = tree.rootNode; assert.equal( node.toString(), - '(program (expression_statement (binary_expression (number) (binary_expression (number) (ERROR) (number)))))' + '(program (expression_statement (binary_expression left: (number) right: (binary_expression left: (number) (ERROR) right: (number)))))' ); const sum = node.firstChild.firstChild; @@ -245,7 +245,7 @@ describe("Node", () => { const node = tree.rootNode; assert.equal( node.toString(), - "(program (expression_statement (parenthesized_expression (binary_expression (number) (MISSING identifier)))))" + "(program (expression_statement (parenthesized_expression (binary_expression left: (number) right: (MISSING identifier)))))" ); const sum = node.firstChild.firstChild.firstNamedChild; diff --git a/lib/binding_web/test/parser-test.js b/lib/binding_web/test/parser-test.js index 8bab61e5..6d525545 100644 --- a/lib/binding_web/test/parser-test.js +++ b/lib/binding_web/test/parser-test.js @@ -226,7 +226,7 @@ describe("Parser", () => { assert.equal( tree.rootNode.toString(), - '(program (expression_statement (call_expression (identifier) (arguments))) (expression_statement (identifier)))' + '(program (expression_statement (call_expression function: (identifier) arguments: (arguments))) (expression_statement (identifier)))' ); }) });}); diff --git a/lib/binding_web/test/tree-test.js b/lib/binding_web/test/tree-test.js index bcdbf5b5..3eaf36f9 100644 --- a/lib/binding_web/test/tree-test.js +++ b/lib/binding_web/test/tree-test.js @@ -25,7 +25,7 @@ describe("Tree", () => { tree = parser.parse(input); assert.equal( tree.rootNode.toString(), - "(program (expression_statement (binary_expression (identifier) (identifier))))" + "(program (expression_statement (binary_expression left: (identifier) right: (identifier))))" ); let sumNode = tree.rootNode.firstChild.firstChild; @@ -51,7 +51,7 @@ describe("Tree", () => { tree = parser.parse(input, tree); assert.equal( tree.rootNode.toString(), - "(program (expression_statement (binary_expression (binary_expression (identifier) (identifier)) (identifier))))" + "(program (expression_statement (binary_expression left: (binary_expression left: (identifier) right: (identifier)) right: (identifier))))" ); }); @@ -61,7 +61,7 @@ describe("Tree", () => { tree = parser.parse(input); assert.equal( tree.rootNode.toString(), - "(program (expression_statement (binary_expression (identifier) (identifier))))" + "(program (expression_statement (binary_expression left: (identifier) right: (identifier))))" ); let variableNode = tree.rootNode.firstChild.firstChild.lastChild; @@ -76,7 +76,7 @@ describe("Tree", () => { tree = parser.parse(input, tree); assert.equal( tree.rootNode.toString(), - "(program (expression_statement (binary_expression (binary_expression (identifier) (identifier)) (identifier))))" + "(program (expression_statement (binary_expression left: (binary_expression left: (identifier) right: (identifier)) right: (identifier))))" ); }); }); @@ -88,7 +88,7 @@ describe("Tree", () => { assert.equal( tree.rootNode.toString(), - "(program (expression_statement (binary_expression (identifier) (identifier))))" + "(program (expression_statement (binary_expression left: (identifier) right: (identifier))))" ); sourceCode = "abc + defg + hij"; @@ -104,7 +104,7 @@ describe("Tree", () => { const tree2 = parser.parse(sourceCode, tree); assert.equal( tree2.rootNode.toString(), - "(program (expression_statement (binary_expression (binary_expression (identifier) (identifier)) (identifier))))" + "(program (expression_statement (binary_expression left: (binary_expression left: (identifier) right: (identifier)) right: (identifier))))" ); const ranges = tree.getChangedRanges(tree2); diff --git a/test/fixtures/error_corpus/javascript_errors.txt b/test/fixtures/error_corpus/javascript_errors.txt index 4aac3e37..ddaea919 100644 --- a/test/fixtures/error_corpus/javascript_errors.txt +++ b/test/fixtures/error_corpus/javascript_errors.txt @@ -13,7 +13,7 @@ class A { --- (program - (class (identifier) (class_body + (class_declaration (identifier) (class_body (method_definition (property_identifier) (formal_parameters (identifier) (identifier) (ERROR)) @@ -82,7 +82,8 @@ if ({a: 'b'} {c: 'd'}) { (identifier) (function (formal_parameters (identifier)) (statement_block (expression_statement (identifier))))) (MISSING ";")) - (function (formal_parameters (identifier)) (statement_block (expression_statement (identifier))))))) + (expression_statement + (function (formal_parameters (identifier)) (statement_block (expression_statement (identifier)))))))) =================================================== Extra tokens at the end of the file @@ -124,14 +125,14 @@ var x = !!! (program (comment) - (function (identifier) (formal_parameters) (statement_block)) - (function (identifier) (formal_parameters) (statement_block)) - (function (identifier) (formal_parameters) (statement_block)) - (function (identifier) (formal_parameters) (statement_block)) - (function (identifier) (formal_parameters) (statement_block)) - (function (identifier) (formal_parameters) (statement_block)) - (function (identifier) (formal_parameters) (statement_block)) - (function (identifier) (formal_parameters) (statement_block)) + (function_declaration (identifier) (formal_parameters) (statement_block)) + (function_declaration (identifier) (formal_parameters) (statement_block)) + (function_declaration (identifier) (formal_parameters) (statement_block)) + (function_declaration (identifier) (formal_parameters) (statement_block)) + (function_declaration (identifier) (formal_parameters) (statement_block)) + (function_declaration (identifier) (formal_parameters) (statement_block)) + (function_declaration (identifier) (formal_parameters) (statement_block)) + (function_declaration (identifier) (formal_parameters) (statement_block)) (ERROR (identifier))) ========================================================= @@ -169,7 +170,7 @@ function main(x) { --- (program - (function + (function_declaration (identifier) (formal_parameters (identifier)) (statement_block