diff --git a/test/jstests/__init__.py b/test/js2tests/__init__.py similarity index 100% rename from test/jstests/__init__.py rename to test/js2tests/__init__.py diff --git a/test/jstests/array_access.py b/test/js2tests/array_access.py similarity index 96% rename from test/jstests/array_access.py rename to test/js2tests/array_access.py index 12eae6fed..72d089c15 100644 --- a/test/jstests/array_access.py +++ b/test/js2tests/array_access.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS tests = [ {'code': 'var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2] = 7; return x;', diff --git a/test/jstests/assignments.py b/test/js2tests/assignments.py similarity index 91% rename from test/jstests/assignments.py rename to test/js2tests/assignments.py index 3565b315f..1705f9e02 100644 --- a/test/jstests/assignments.py +++ b/test/js2tests/assignments.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _OPERATORS, _ASSIGN_OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _OPERATORS, _ASSIGN_OPERATORS tests = [ { diff --git a/test/jstests/basic.py b/test/js2tests/basic.py similarity index 91% rename from test/jstests/basic.py rename to test/js2tests/basic.py index 3f99528c4..c6790109b 100644 --- a/test/jstests/basic.py +++ b/test/js2tests/basic.py @@ -1,4 +1,4 @@ -from youtube_dl.jsinterp.jsgrammar import Token +from youtube_dl.jsinterp2.jsgrammar import Token tests = [ { diff --git a/test/jstests/branch.py b/test/js2tests/branch.py similarity index 91% rename from test/jstests/branch.py rename to test/js2tests/branch.py index bd1d38da6..6398f7d89 100644 --- a/test/jstests/branch.py +++ b/test/js2tests/branch.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _RELATIONS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _RELATIONS skip = {'interpret': 'Interpreting if statement not yet implemented'} diff --git a/test/jstests/calc.py b/test/js2tests/calc.py similarity index 87% rename from test/jstests/calc.py rename to test/js2tests/calc.py index 6e9fd8774..f987973eb 100644 --- a/test/jstests/calc.py +++ b/test/js2tests/calc.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _OPERATORS tests = [ {'code': 'return 2*a+1;', diff --git a/test/jstests/call.py b/test/js2tests/call.py similarity index 97% rename from test/jstests/call.py rename to test/js2tests/call.py index e8ff330c6..181c46fca 100644 --- a/test/jstests/call.py +++ b/test/js2tests/call.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _OPERATORS tests = [ { diff --git a/test/jstests/comments.py b/test/js2tests/comments.py similarity index 95% rename from test/jstests/comments.py rename to test/js2tests/comments.py index 0f297bcde..729e769ac 100644 --- a/test/jstests/comments.py +++ b/test/js2tests/comments.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _OPERATORS tests = [ { diff --git a/test/jstests/debug.py b/test/js2tests/debug.py similarity index 83% rename from test/jstests/debug.py rename to test/js2tests/debug.py index a998cb68e..aa81f8fd9 100644 --- a/test/jstests/debug.py +++ b/test/js2tests/debug.py @@ -1,4 +1,4 @@ -from youtube_dl.jsinterp.jsgrammar import Token +from youtube_dl.jsinterp2.jsgrammar import Token skip = {'interpret': 'Interpreting debugger statement not yet implemented', 'parse': 'Test not yet implemented: missing code and ast'} diff --git a/test/jstests/do_loop.py b/test/js2tests/do_loop.py similarity index 92% rename from test/jstests/do_loop.py rename to test/js2tests/do_loop.py index 6d419b0ca..04d7e0d01 100644 --- a/test/jstests/do_loop.py +++ b/test/js2tests/do_loop.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS skip = {'interpret': 'Interpreting do loop not yet implemented'} diff --git a/test/jstests/empty_return.py b/test/js2tests/empty_return.py similarity index 89% rename from test/jstests/empty_return.py rename to test/js2tests/empty_return.py index 283073fbe..643c38e66 100644 --- a/test/jstests/empty_return.py +++ b/test/js2tests/empty_return.py @@ -1,4 +1,4 @@ -from youtube_dl.jsinterp.jsgrammar import Token +from youtube_dl.jsinterp2.jsgrammar import Token tests = [ {'code': 'return; y()', diff --git a/test/jstests/for_empty.py b/test/js2tests/for_empty.py similarity index 92% rename from test/jstests/for_empty.py rename to test/js2tests/for_empty.py index 6a99e5b3f..ba90184fa 100644 --- a/test/jstests/for_empty.py +++ b/test/js2tests/for_empty.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS skip = {'interpret': 'Interpreting for empty loop not yet implemented'} diff --git a/test/jstests/for_in.py b/test/js2tests/for_in.py similarity index 92% rename from test/jstests/for_in.py rename to test/js2tests/for_in.py index af385f007..b5c111a0e 100644 --- a/test/jstests/for_in.py +++ b/test/js2tests/for_in.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS skip = {'interpret': 'Interpreting for in loop not yet implemented'} diff --git a/test/jstests/for_loop.py b/test/js2tests/for_loop.py similarity index 92% rename from test/jstests/for_loop.py rename to test/js2tests/for_loop.py index f45958fe5..60cb03600 100644 --- a/test/jstests/for_loop.py +++ b/test/js2tests/for_loop.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS skip = {'interpret': 'Interpreting for loop not yet implemented'} diff --git a/test/jstests/func_expr.py b/test/js2tests/func_expr.py similarity index 95% rename from test/jstests/func_expr.py rename to test/js2tests/func_expr.py index da43137b7..68e6fa6eb 100644 --- a/test/jstests/func_expr.py +++ b/test/js2tests/func_expr.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS skip = {'interpret': 'Interpreting function expression not yet implemented'} diff --git a/test/jstests/getfield.py b/test/js2tests/getfield.py similarity index 91% rename from test/jstests/getfield.py rename to test/js2tests/getfield.py index 39dc1d5b5..3b63ce415 100644 --- a/test/jstests/getfield.py +++ b/test/js2tests/getfield.py @@ -1,4 +1,4 @@ -from youtube_dl.jsinterp.jsgrammar import Token +from youtube_dl.jsinterp2.jsgrammar import Token tests = [ { diff --git a/test/jstests/label.py b/test/js2tests/label.py similarity index 82% rename from test/jstests/label.py rename to test/js2tests/label.py index 91170bdb9..441abbba1 100644 --- a/test/jstests/label.py +++ b/test/js2tests/label.py @@ -1,4 +1,4 @@ -from youtube_dl.jsinterp.jsgrammar import Token +from youtube_dl.jsinterp2.jsgrammar import Token skip = {'interpret': 'Interpreting label not yet implemented', 'parse': 'Test not yet implemented: missing code and ast'} diff --git a/test/jstests/morespace.py b/test/js2tests/morespace.py similarity index 88% rename from test/jstests/morespace.py rename to test/js2tests/morespace.py index 327e46192..2a18235b8 100644 --- a/test/jstests/morespace.py +++ b/test/js2tests/morespace.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS tests = [ { diff --git a/test/jstests/object_literal.py b/test/js2tests/object_literal.py similarity index 95% rename from test/jstests/object_literal.py rename to test/js2tests/object_literal.py index 683128352..ce651eb32 100644 --- a/test/jstests/object_literal.py +++ b/test/js2tests/object_literal.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _OPERATORS skip = {'interpret': 'Interpreting object literals not yet implemented'} diff --git a/test/jstests/operators.py b/test/js2tests/operators.py similarity index 92% rename from test/jstests/operators.py rename to test/js2tests/operators.py index c95a8baca..757cef523 100644 --- a/test/jstests/operators.py +++ b/test/js2tests/operators.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _OPERATORS tests = [ { diff --git a/test/jstests/parens.py b/test/js2tests/parens.py similarity index 97% rename from test/jstests/parens.py rename to test/js2tests/parens.py index 52eef903f..fe433a09b 100644 --- a/test/jstests/parens.py +++ b/test/js2tests/parens.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _OPERATORS tests = [ { diff --git a/test/jstests/precedence.py b/test/js2tests/precedence.py similarity index 96% rename from test/jstests/precedence.py rename to test/js2tests/precedence.py index e8b042e70..47a80fd28 100644 --- a/test/jstests/precedence.py +++ b/test/js2tests/precedence.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _OPERATORS skip = {'interpret': 'Interpreting built-in fields not yet implemented'} diff --git a/test/jstests/strange_chars.py b/test/js2tests/strange_chars.py similarity index 89% rename from test/jstests/strange_chars.py rename to test/js2tests/strange_chars.py index 96355eaed..3d3c9b1ad 100644 --- a/test/jstests/strange_chars.py +++ b/test/js2tests/strange_chars.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _OPERATORS tests = [ { diff --git a/test/jstests/switch.py b/test/js2tests/switch.py similarity index 95% rename from test/jstests/switch.py rename to test/js2tests/switch.py index 22ac2f590..66fed25a9 100644 --- a/test/jstests/switch.py +++ b/test/js2tests/switch.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS skip = {'interpret': 'Interpreting switch statement not yet implemented'} diff --git a/test/jstests/try_statement.py b/test/js2tests/try_statement.py similarity index 82% rename from test/jstests/try_statement.py rename to test/js2tests/try_statement.py index 961ab9ff3..8e93ee398 100644 --- a/test/jstests/try_statement.py +++ b/test/js2tests/try_statement.py @@ -1,4 +1,4 @@ -from youtube_dl.jsinterp.jsgrammar import Token +from youtube_dl.jsinterp2.jsgrammar import Token skip = {'interpret': 'Interpreting try statement not yet implemented', 'parse': 'Test not yet implemented: missing code and ast'} diff --git a/test/jstests/unary.py b/test/js2tests/unary.py similarity index 100% rename from test/jstests/unary.py rename to test/js2tests/unary.py diff --git a/test/jstests/unshift.py b/test/js2tests/unshift.py similarity index 100% rename from test/jstests/unshift.py rename to test/js2tests/unshift.py diff --git a/test/jstests/while_loop.py b/test/js2tests/while_loop.py similarity index 92% rename from test/jstests/while_loop.py rename to test/js2tests/while_loop.py index 5a4bc39ee..39078a11b 100644 --- a/test/jstests/while_loop.py +++ b/test/js2tests/while_loop.py @@ -1,5 +1,5 @@ -from youtube_dl.jsinterp.jsgrammar import Token -from youtube_dl.jsinterp.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS +from youtube_dl.jsinterp2.jsgrammar import Token +from youtube_dl.jsinterp2.tstream import _ASSIGN_OPERATORS, _UNARY_OPERATORS, _RELATIONS skip = {'interpret': 'Interpreting while loop not yet implemented'} diff --git a/test/jstests/with_statement.py b/test/js2tests/with_statement.py similarity index 82% rename from test/jstests/with_statement.py rename to test/js2tests/with_statement.py index c84aec1c5..84ed25069 100644 --- a/test/jstests/with_statement.py +++ b/test/js2tests/with_statement.py @@ -1,4 +1,4 @@ -from youtube_dl.jsinterp.jsgrammar import Token +from youtube_dl.jsinterp2.jsgrammar import Token skip = {'interpret': 'Interpreting with statement not yet implemented', 'parse': 'Test not yet implemented: missing code and ast'} diff --git a/test/test_jsinterp.py b/test/test_jsinterp.py index 495f017ac..81a401c53 100644 --- a/test/test_jsinterp.py +++ b/test/test_jsinterp.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """ -see: `jstests` +see: `js2tests` """ from __future__ import unicode_literals @@ -17,8 +17,8 @@ else: import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.jsinterp import JSInterpreter -from .jstests import gettestcases +from youtube_dl.jsinterp2 import JSInterpreter +from .js2tests import gettestcases defs = gettestcases() # set level to logging.DEBUG to see messages about missing assertions diff --git a/test/test_jsinterp_parse.py b/test/test_jsinterp_parse.py index 53c53e347..d87537b2c 100644 --- a/test/test_jsinterp_parse.py +++ b/test/test_jsinterp_parse.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """ -see: `jstests` +see: `js2tests` """ from __future__ import unicode_literals @@ -18,8 +18,8 @@ else: import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.jsinterp.jsparser import Parser -from .jstests import gettestcases +from youtube_dl.jsinterp2.jsparser import Parser +from .js2tests import gettestcases def traverse(node, tree_types=(list, tuple)): @@ -62,15 +62,15 @@ def generator(test_case, name): # And add them to TestJSInterpreterParse -for n, tc in enumerate(defs): - reason = tc['skip'].get('parse', False) - tname = 'test_' + str(tc['name']) +for testcase in defs: + reason = testcase['skip'].get('parse', False) + tname = 'test_' + str(testcase['name']) i = 1 while hasattr(TestJSInterpreterParse, tname): - tname = 'test_%s_%d' % (tc['name'], i) + tname = 'test_%s_%d' % (testcase['name'], i) i += 1 if reason is not True: - test_method = generator(tc, tname) + test_method = generator(testcase, tname) if reason is not False: test_method.__unittest_skip__ = True test_method.__unittest_skip_why__ = reason diff --git a/youtube_dl/jsinterp/__init__.py b/youtube_dl/jsinterp2/__init__.py similarity index 100% rename from youtube_dl/jsinterp/__init__.py rename to youtube_dl/jsinterp2/__init__.py diff --git a/youtube_dl/jsinterp/jsgrammar.py b/youtube_dl/jsinterp2/jsgrammar.py similarity index 100% rename from youtube_dl/jsinterp/jsgrammar.py rename to youtube_dl/jsinterp2/jsgrammar.py diff --git a/youtube_dl/jsinterp/jsinterp.py b/youtube_dl/jsinterp2/jsinterp.py similarity index 100% rename from youtube_dl/jsinterp/jsinterp.py rename to youtube_dl/jsinterp2/jsinterp.py diff --git a/youtube_dl/jsinterp/jsparser.py b/youtube_dl/jsinterp2/jsparser.py similarity index 100% rename from youtube_dl/jsinterp/jsparser.py rename to youtube_dl/jsinterp2/jsparser.py diff --git a/youtube_dl/jsinterp/tstream.py b/youtube_dl/jsinterp2/tstream.py similarity index 100% rename from youtube_dl/jsinterp/tstream.py rename to youtube_dl/jsinterp2/tstream.py