Support 3.11 / PEP 654 syntax (#3016)

[etc/vim.git] / tests / test_format.py

diff --git a/tests/test_format.py b/tests/test_format.py
index aef22545f5b4bd128469ed4ddbb51d47832036c3..1916146e84dc570a36a38a0e940e0c207c5b6ce2 100644 (file)
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -44,6 +44,7 @@ SIMPLE_CASES: List[str] = [
     "fmtskip4",
     "fmtskip5",
     "fmtskip6",
     "fmtskip4",
     "fmtskip5",
     "fmtskip6",

+    "fmtskip7",

     "fstring",
     "function",
     "function2",
     "fstring",
     "function",
     "function2",


@@ -53,6 +54,7 @@ SIMPLE_CASES: List[str] = [
     "remove_parens",
     "slices",
     "string_prefixes",
     "remove_parens",
     "slices",
     "string_prefixes",

+    "torture",

     "trailing_comma_optional_parens1",
     "trailing_comma_optional_parens2",
     "trailing_comma_optional_parens3",
     "trailing_comma_optional_parens1",
     "trailing_comma_optional_parens2",
     "trailing_comma_optional_parens3",


@@ -61,6 +63,7 @@ SIMPLE_CASES: List[str] = [
 ]
 
 PY310_CASES: List[str] = [
 ]
 
 PY310_CASES: List[str] = [

+    "starred_for_target",

     "pattern_matching_simple",
     "pattern_matching_complex",
     "pattern_matching_extras",
     "pattern_matching_simple",
     "pattern_matching_complex",
     "pattern_matching_extras",


@@ -69,14 +72,25 @@ PY310_CASES: List[str] = [
     "parenthesized_context_managers",
 ]
 
     "parenthesized_context_managers",
 ]
 

+PY311_CASES: List[str] = [
+    "pep_654",
+    "pep_654_style",
+]
+

 PREVIEW_CASES: List[str] = [
     # string processing
     "cantfit",
     "comments7",
 PREVIEW_CASES: List[str] = [
     # string processing
     "cantfit",
     "comments7",

+    "comments8",

     "long_strings",
     "long_strings__edge_case",
     "long_strings__regression",
     "percent_precedence",
     "long_strings",
     "long_strings__edge_case",
     "long_strings__regression",
     "percent_precedence",

+    "remove_except_parens",
+    "remove_for_brackets",
+    "one_element_subscript",
+    "remove_await_parens",
+    "return_annotation_brackets",

 ]
 
 SOURCES: List[str] = [
 ]
 
 SOURCES: List[str] = [


@@ -101,8 +115,6 @@ SOURCES: List[str] = [
     "src/black/strings.py",
     "src/black/trans.py",
     "src/blackd/__init__.py",
     "src/black/strings.py",
     "src/black/trans.py",
     "src/blackd/__init__.py",

-    "src/black_primer/cli.py",
-    "src/black_primer/lib.py",

     "src/blib2to3/pygram.py",
     "src/blib2to3/pytree.py",
     "src/blib2to3/pgen2/conv.py",
     "src/blib2to3/pygram.py",
     "src/blib2to3/pytree.py",
     "src/blib2to3/pgen2/conv.py",


@@ -117,7 +129,6 @@ SOURCES: List[str] = [
     "tests/test_black.py",
     "tests/test_blackd.py",
     "tests/test_format.py",
     "tests/test_black.py",
     "tests/test_blackd.py",
     "tests/test_format.py",

-    "tests/test_primer.py",

     "tests/optional.py",
     "tests/util.py",
     "tests/conftest.py",
     "tests/optional.py",
     "tests/util.py",
     "tests/conftest.py",


@@ -189,6 +200,16 @@ def test_pep_570() -> None:
     assert_format(source, expected, minimum_version=(3, 8))
 
 
     assert_format(source, expected, minimum_version=(3, 8))
 
 

+def test_remove_with_brackets() -> None:
+    source, expected = read_data("remove_with_brackets")
+    assert_format(
+        source,
+        expected,
+        black.Mode(preview=True),
+        minimum_version=(3, 9),
+    )
+
+

 @pytest.mark.parametrize("filename", PY310_CASES)
 def test_python_310(filename: str) -> None:
     source, expected = read_data(filename)
 @pytest.mark.parametrize("filename", PY310_CASES)
 def test_python_310(filename: str) -> None:
     source, expected = read_data(filename)


@@ -211,6 +232,13 @@ def test_patma_invalid() -> None:
     exc_info.match("Cannot parse: 10:11")
 
 
     exc_info.match("Cannot parse: 10:11")
 
 

+@pytest.mark.parametrize("filename", PY311_CASES)
+def test_python_311(filename: str) -> None:
+    source, expected = read_data(filename)
+    mode = black.Mode(target_versions={black.TargetVersion.PY311})
+    assert_format(source, expected, mode, minimum_version=(3, 11))
+
+

 def test_python_2_hint() -> None:
     with pytest.raises(black.parsing.InvalidInput) as exc_info:
         assert_format("print 'daylily'", "print 'daylily'")
 def test_python_2_hint() -> None:
     with pytest.raises(black.parsing.InvalidInput) as exc_info:
         assert_format("print 'daylily'", "print 'daylily'")