Bump docker/setup-buildx-action from 1 to 2 (#3058)

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

diff --git a/tests/test_format.py b/tests/test_format.py
index 30099aaf1bc2f175acea55842d10f1768d94cc67..003f5bbe18863513bf6b9328526e9ffceab32d87 100644 (file)
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -1,5 +1,5 @@
 from dataclasses import replace
-from typing import Any, Iterator
+from typing import Any, Iterator, List
 from unittest.mock import patch
 
 import pytest
@@ -12,73 +12,42 @@ from tests.util import (
     assert_format,
     dump_to_stderr,
     read_data,
+    all_data_cases,
 )
 
-SIMPLE_CASES = [
-    "beginning_backslash",
-    "bracketmatch",
-    "class_blank_parentheses",
-    "class_methods_new_line",
-    "collections",
-    "comments",
-    "comments2",
-    "comments3",
-    "comments4",
-    "comments5",
-    "comments6",
-    "comments_non_breaking_space",
-    "comment_after_escaped_newline",
-    "composition",
-    "composition_no_trailing_comma",
-    "docstring",
-    "empty_lines",
-    "expression",
-    "fmtonoff",
-    "fmtonoff2",
-    "fmtonoff3",
-    "fmtonoff4",
-    "fmtskip",
-    "fmtskip2",
-    "fmtskip3",
-    "fmtskip4",
-    "fmtskip5",
-    "fmtskip6",
-    "fstring",
-    "function",
-    "function2",
-    "function_trailing_comma",
-    "import_spacing",
-    "remove_parens",
-    "slices",
-    "string_prefixes",
-    "tricky_unicode_symbols",
-    "tupleassign",
+PY310_CASES: List[str] = [
+    "starred_for_target",
+    "pattern_matching_simple",
+    "pattern_matching_complex",
+    "pattern_matching_extras",
+    "pattern_matching_style",
+    "pattern_matching_generic",
+    "parenthesized_context_managers",
 ]
 
-SIMPLE_CASES_PY2 = [
-    "numeric_literals_py2",
-    "python2",
-    "python2_unicode_literals",
+PY311_CASES: List[str] = [
+    "pep_654",
+    "pep_654_style",
 ]
 
-EXPERIMENTAL_STRING_PROCESSING_CASES = [
+PREVIEW_CASES: List[str] = [
+    # string processing
     "cantfit",
     "comments7",
+    "comments8",
     "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",
+    "docstring_preview",
 ]
 
-PY310_CASES = [
-    "pattern_matching_simple",
-    "pattern_matching_complex",
-    "pattern_matching_extras",
-    "pattern_matching_style",
-    "parenthesized_context_managers",
-]
-
-SOURCES = [
+SOURCES: List[str] = [
     "src/black/__init__.py",
     "src/black/__main__.py",
     "src/black/brackets.py",
@@ -100,8 +69,6 @@ SOURCES = [
     "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",
@@ -116,7 +83,6 @@ SOURCES = [
     "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",
@@ -134,20 +100,14 @@ def check_file(filename: str, mode: black.Mode, *, data: bool = True) -> None:
     assert_format(source, expected, mode, fast=False)
 
 
-@pytest.mark.parametrize("filename", SIMPLE_CASES_PY2)
-@pytest.mark.python2
-def test_simple_format_py2(filename: str) -> None:
-    check_file(filename, DEFAULT_MODE)
-
-
-@pytest.mark.parametrize("filename", SIMPLE_CASES)
+@pytest.mark.parametrize("filename", all_data_cases("simple_cases"))
 def test_simple_format(filename: str) -> None:
     check_file(filename, DEFAULT_MODE)
 
 
-@pytest.mark.parametrize("filename", EXPERIMENTAL_STRING_PROCESSING_CASES)
-def test_experimental_format(filename: str) -> None:
-    check_file(filename, black.Mode(experimental_string_processing=True))
+@pytest.mark.parametrize("filename", PREVIEW_CASES)
+def test_preview_format(filename: str) -> None:
+    check_file(filename, black.Mode(preview=True))
 
 
 @pytest.mark.parametrize("filename", SOURCES)
@@ -194,6 +154,16 @@ def test_pep_570() -> None:
     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)
@@ -201,6 +171,12 @@ def test_python_310(filename: str) -> None:
     assert_format(source, expected, mode, minimum_version=(3, 10))
 
 
+def test_python_310_without_target_version() -> None:
+    source, expected = read_data("pattern_matching_simple")
+    mode = black.Mode()
+    assert_format(source, expected, mode, minimum_version=(3, 10))
+
+
 def test_patma_invalid() -> None:
     source, expected = read_data("pattern_matching_invalid")
     mode = black.Mode(target_versions={black.TargetVersion.PY310})
@@ -210,13 +186,17 @@ def test_patma_invalid() -> None:
     exc_info.match("Cannot parse: 10:11")
 
 
-def test_patma_hint() -> None:
-    source, expected = read_data("pattern_matching_simple")
-    mode = black.Mode(target_versions={black.TargetVersion.PY39})
-    with pytest.raises(black.parsing.InvalidInput) as exc_info:
-        assert_format(source, expected, mode, minimum_version=(3, 10))
+@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))
+
 
-    exc_info.match(black.parsing.PY310_HINT)
+def test_python_2_hint() -> None:
+    with pytest.raises(black.parsing.InvalidInput) as exc_info:
+        assert_format("print 'daylily'", "print 'daylily'")
+    exc_info.match(black.parsing.PY2_HINT)
 
 
 def test_docstring_no_string_normalization() -> None:
@@ -245,13 +225,6 @@ def test_numeric_literals_ignoring_underscores() -> None:
     assert_format(source, expected, mode)
 
 
-@pytest.mark.python2
-def test_python2_print_function() -> None:
-    source, expected = read_data("python2_print_function")
-    mode = replace(DEFAULT_MODE, target_versions={black.TargetVersion.PY27})
-    assert_format(source, expected, mode)
-
-
 def test_stub() -> None:
     mode = replace(DEFAULT_MODE, is_pyi=True)
     source, expected = read_data("stub.pyi")
@@ -266,3 +239,9 @@ def test_python38() -> None:
 def test_python39() -> None:
     source, expected = read_data("python39")
     assert_format(source, expected, minimum_version=(3, 9))
+
+
+def test_power_op_newline() -> None:
+    # requires line_length=0
+    source, expected = read_data("power_op_newline")
+    assert_format(source, expected, mode=black.Mode(line_length=0))