black-primer: stop running it (#2809)

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

diff --git a/tests/test_format.py b/tests/test_format.py
index db39678cdfe57e41c5f29641ca18e935b335dc74..88f084ea47815da2cf0951a50634253a9e0e8cb5 100644 (file)
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -1,5 +1,5 @@
 from dataclasses import replace
 from dataclasses import replace

-from typing import Any, Iterator
+from typing import Any, Iterator, List

 from unittest.mock import patch
 
 import pytest
 from unittest.mock import patch
 
 import pytest


@@ -14,7 +14,7 @@ from tests.util import (
     read_data,
 )
 
     read_data,
 )
 

-SIMPLE_CASES = [
+SIMPLE_CASES: List[str] = [

     "beginning_backslash",
     "bracketmatch",
     "class_blank_parentheses",
     "beginning_backslash",
     "bracketmatch",
     "class_blank_parentheses",


@@ -48,23 +48,18 @@ SIMPLE_CASES = [
     "function2",
     "function_trailing_comma",
     "import_spacing",
     "function2",
     "function_trailing_comma",
     "import_spacing",

+    "power_op_spacing",

     "remove_parens",
     "slices",
     "string_prefixes",
     "remove_parens",
     "slices",
     "string_prefixes",

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

     "tricky_unicode_symbols",
     "tupleassign",
 ]
 
     "tricky_unicode_symbols",
     "tupleassign",
 ]
 

-EXPERIMENTAL_STRING_PROCESSING_CASES = [
-    "cantfit",
-    "comments7",
-    "long_strings",
-    "long_strings__edge_case",
-    "long_strings__regression",
-    "percent_precedence",
-]
-
-PY310_CASES = [
+PY310_CASES: List[str] = [

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


@@ -73,7 +68,17 @@ PY310_CASES = [
     "parenthesized_context_managers",
 ]
 
     "parenthesized_context_managers",
 ]
 

-SOURCES = [
+PREVIEW_CASES: List[str] = [
+    # string processing
+    "cantfit",
+    "comments7",
+    "long_strings",
+    "long_strings__edge_case",
+    "long_strings__regression",
+    "percent_precedence",
+]
+
+SOURCES: List[str] = [

     "src/black/__init__.py",
     "src/black/__main__.py",
     "src/black/brackets.py",
     "src/black/__init__.py",
     "src/black/__main__.py",
     "src/black/brackets.py",


@@ -134,9 +139,9 @@ def test_simple_format(filename: str) -> None:
     check_file(filename, DEFAULT_MODE)
 
 
     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)
 
 
 @pytest.mark.parametrize("filename", SOURCES)


@@ -190,6 +195,12 @@ def test_python_310(filename: str) -> None:
     assert_format(source, expected, mode, minimum_version=(3, 10))
 
 
     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})
 def test_patma_invalid() -> None:
     source, expected = read_data("pattern_matching_invalid")
     mode = black.Mode(target_versions={black.TargetVersion.PY310})


@@ -199,15 +210,6 @@ def test_patma_invalid() -> None:
     exc_info.match("Cannot parse: 10:11")
 
 
     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))
-
-    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'")
 def test_python_2_hint() -> None:
     with pytest.raises(black.parsing.InvalidInput) as exc_info:
         assert_format("print 'daylily'", "print 'daylily'")


@@ -254,3 +256,9 @@ def test_python38() -> None:
 def test_python39() -> None:
     source, expected = read_data("python39")
     assert_format(source, expected, minimum_version=(3, 9))
 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))