More test_evaluate Script fixtures

test/test_evaluate/test_literals.py

@@ -1,41 +1,40 @@
 import pytest
 
-import jedi
-from jedi._compatibility import py_version, unicode
 
-
-def _eval_literal(code):
-    def_, = jedi.Script(code).goto_definitions()
+def _eval_literal(Script, code):
+    def_, = Script(code).goto_definitions()
     return def_._name._context.get_safe_value()
 
 
-@pytest.mark.skipif('sys.version_info[:2] < (3, 6)')
-def test_f_strings():
+def test_f_strings(Script, environment):
     """
     f literals are not really supported in Jedi. They just get ignored and an
     empty string is returned.
     """
-    assert _eval_literal('f"asdf"') == ''
-    assert _eval_literal('f"{asdf}"') == ''
-    assert _eval_literal('F"{asdf}"') == ''
-    assert _eval_literal('rF"{asdf}"') == ''
+    if environment.version_info < (3, 6):
+        pytest.skip()
+
+    assert _eval_literal(Script, 'f"asdf"') == ''
+    assert _eval_literal(Script, 'f"{asdf}"') == ''
+    assert _eval_literal(Script, 'F"{asdf}"') == ''
+    assert _eval_literal(Script, 'rF"{asdf}"') == ''
 
 
-def test_rb_strings():
-    assert _eval_literal('br"asdf"') == b'asdf'
-    obj = _eval_literal('rb"asdf"')
-    if py_version < 33:
-        # rb is not valid in Python 2. Due to error recovery we just get a
-        # string.
-        assert obj == 'asdf'
-    else:
-        assert obj == b'asdf'
+def test_rb_strings(Script, environment):
+    assert _eval_literal(Script, 'br"asdf"') == b'asdf'
+    obj = _eval_literal(Script, 'rb"asdf"')
+
+    # rb is not valid in Python 2. Due to error recovery we just get a
+    # string.
+    assert obj == b'asdf'
 
 
-@pytest.mark.skipif('sys.version_info[:2] < (3, 6)')
-def test_thousand_separators():
-    assert _eval_literal('1_2_3') == 123
-    assert _eval_literal('123_456_789') == 123456789
-    assert _eval_literal('0x3_4') == 52
-    assert _eval_literal('0b1_0') == 2
-    assert _eval_literal('0o1_0') == 8
+def test_thousand_separators(Script, environment):
+    if environment.version_info < (3, 6):
+        pytest.skip()
+
+    assert _eval_literal(Script, '1_2_3') == 123
+    assert _eval_literal(Script, '123_456_789') == 123456789
+    assert _eval_literal(Script, '0x3_4') == 52
+    assert _eval_literal(Script, '0b1_0') == 2
+    assert _eval_literal(Script, '0o1_0') == 8