From eead12263685debb3518943407552a3773ceaf1e Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Sun, 7 Dec 2014 18:22:11 +0100
Subject: [PATCH] Use grammar in test scripts.

---
 test/test_evaluate/test_absolute_import.py    |  8 ++++----
 test/test_evaluate/test_buildout_detection.py | 17 ++++++++++-------
 test/test_evaluate/test_compiled.py           |  9 +++++----
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/test/test_evaluate/test_absolute_import.py b/test/test_evaluate/test_absolute_import.py
index 932356b2..a453a8aa 100644
--- a/test/test_evaluate/test_absolute_import.py
+++ b/test/test_evaluate/test_absolute_import.py
@@ -4,7 +4,7 @@ Python 2.X)
 """
 import jedi
 from jedi._compatibility import u
-from jedi.parser import Parser
+from jedi.parser import Parser, load_grammar
 from .. import helpers
 
 
@@ -12,7 +12,7 @@ def test_explicit_absolute_imports():
     """
     Detect modules with ``from __future__ import absolute_import``.
     """
-    parser = Parser(u("from __future__ import absolute_import"), "test.py")
+    parser = Parser(load_grammar(), u("from __future__ import absolute_import"), "test.py")
     assert parser.module.has_explicit_absolute_import
 
 
@@ -20,7 +20,7 @@ def test_no_explicit_absolute_imports():
     """
      Detect modules without ``from __future__ import absolute_import``.
     """
-    parser = Parser(u("1"), "test.py")
+    parser = Parser(load_grammar(), u("1"), "test.py")
     assert not parser.module.has_explicit_absolute_import
 
 
@@ -30,7 +30,7 @@ def test_dont_break_imports_without_namespaces():
     assume that all imports have non-``None`` namespaces.
     """
     src = u("from __future__ import absolute_import\nimport xyzzy")
-    parser = Parser(src, "test.py")
+    parser = Parser(load_grammar(), src, "test.py")
     assert parser.module.has_explicit_absolute_import
 
 
diff --git a/test/test_evaluate/test_buildout_detection.py b/test/test_evaluate/test_buildout_detection.py
index 861ce964..45427f21 100644
--- a/test/test_evaluate/test_buildout_detection.py
+++ b/test/test_evaluate/test_buildout_detection.py
@@ -6,7 +6,7 @@ from jedi.evaluate.sys_path import (_get_parent_dir_with_file,
                                     _get_buildout_scripts,
                                     _check_module)
 from jedi.evaluate import Evaluator
-from jedi.parser import Parser
+from jedi.parser import Parser, load_grammar
 
 from ..helpers import cwd_at
 
@@ -35,8 +35,9 @@ def test_append_on_non_sys_path():
 
         d = Dummy()
         d.path.append('foo')"""))
-    p = Parser(SRC)
-    paths = _check_module(Evaluator(), p.module)
+    grammar = load_grammar()
+    p = Parser(grammar, SRC)
+    paths = _check_module(Evaluator(grammar), p.module)
     assert len(paths) > 0
     assert 'foo' not in paths
 
@@ -45,8 +46,9 @@ def test_path_from_invalid_sys_path_assignment():
     SRC = dedent(u("""
         import sys
         sys.path = 'invalid'"""))
-    p = Parser(SRC)
-    paths = _check_module(Evaluator(), p.module)
+    grammar = load_grammar()
+    p = Parser(grammar, SRC)
+    paths = _check_module(Evaluator(grammar), p.module)
     assert len(paths) > 0
     assert 'invalid' not in paths
 
@@ -67,7 +69,8 @@ def test_path_from_sys_path_assignment():
 
         if __name__ == '__main__':
             sys.exit(important_package.main())"""))
-    p = Parser(SRC)
-    paths = _check_module(Evaluator(), p.module)
+    grammar = load_grammar()
+    p = Parser(grammar, SRC)
+    paths = _check_module(Evaluator(grammar), p.module)
     assert 1 not in paths
     assert '/home/test/.buildout/eggs/important_package.egg' in paths
diff --git a/test/test_evaluate/test_compiled.py b/test/test_evaluate/test_compiled.py
index 0852a5e1..2a6b28dc 100644
--- a/test/test_evaluate/test_compiled.py
+++ b/test/test_evaluate/test_compiled.py
@@ -1,12 +1,13 @@
 from jedi._compatibility import builtins, is_py3
-from jedi.parser.representation import Function
+from jedi.parser import load_grammar
+from jedi.parser.tree import Function
 from jedi.evaluate import compiled, representation
 from jedi.evaluate import Evaluator
 from jedi import Script
 
 
 def test_simple():
-    e = Evaluator()
+    e = Evaluator(load_grammar())
     bltn = compiled.CompiledObject(builtins)
     obj = compiled.CompiledObject('_str_', bltn)
     upper = e.find_types(obj, 'upper')
@@ -17,7 +18,7 @@ def test_simple():
 
 
 def test_fake_loading():
-    assert isinstance(compiled.create(Evaluator(), next), Function)
+    assert isinstance(compiled.create(Evaluator(load_grammar()), next), Function)
 
     string = compiled.builtin.get_subscope_by_name('str')
     from_name = compiled._create_from_name(
@@ -29,7 +30,7 @@ def test_fake_loading():
 
 
 def test_fake_docstr():
-    assert compiled.create(Evaluator(), next).raw_doc == next.__doc__
+    assert compiled.create(Evaluator(load_grammar()), next).raw_doc == next.__doc__
 
 
 def test_parse_function_doc_illegal_docstr():