X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/6a105e019fcaa10cc0b6fb59edea4a4018eac97e..a18c7bc09942951e93cbd142fb7384aa2af18951:/tests/test_format.py?ds=sidebyside diff --git a/tests/test_format.py b/tests/test_format.py index e0cb0b7..e1335ae 100644 --- a/tests/test_format.py +++ b/tests/test_format.py @@ -16,7 +16,6 @@ from tests.util import ( SIMPLE_CASES = [ "beginning_backslash", "bracketmatch", - "cantfit", "class_blank_parentheses", "class_methods_new_line", "collections", @@ -26,7 +25,7 @@ SIMPLE_CASES = [ "comments4", "comments5", "comments6", - "comments7", + "comments_non_breaking_space", "comment_after_escaped_newline", "composition", "composition_no_trailing_comma", @@ -47,11 +46,7 @@ SIMPLE_CASES = [ "function2", "function_trailing_comma", "import_spacing", - "long_strings", - "long_strings__edge_case", - "long_strings__regression", "numeric_literals_py2", - "percent_precedence", "python2", "python2_unicode_literals", "remove_parens", @@ -61,6 +56,15 @@ SIMPLE_CASES = [ "tupleassign", ] +EXPERIMENTAL_STRING_PROCESSING_CASES = [ + "cantfit", + "comments7", + "long_strings", + "long_strings__edge_case", + "long_strings__regression", + "percent_precedence", +] + SOURCES = [ "tests/test_black.py", @@ -85,19 +89,23 @@ class TestSimpleFormat(BlackBaseTestCase): @parameterized.expand(SIMPLE_CASES) @patch("black.dump_to_file", dump_to_stderr) def test_simple_format(self, filename: str) -> None: - source, expected = read_data(filename) - actual = fs(source) - self.assertFormatEqual(expected, actual) - black.assert_equivalent(source, actual) - black.assert_stable(source, actual, DEFAULT_MODE) + self.check_file(filename, DEFAULT_MODE) + + @parameterized.expand(EXPERIMENTAL_STRING_PROCESSING_CASES) + @patch("black.dump_to_file", dump_to_stderr) + def test_experimental_format(self, filename: str) -> None: + self.check_file(filename, black.Mode(experimental_string_processing=True)) @parameterized.expand(SOURCES) @patch("black.dump_to_file", dump_to_stderr) def test_source_is_formatted(self, filename: str) -> None: path = THIS_DIR.parent / filename - source, expected = read_data(str(path), data=False) - actual = fs(source, mode=DEFAULT_MODE) + self.check_file(str(path), DEFAULT_MODE, data=False) + self.assertFalse(ff(path)) + + def check_file(self, filename: str, mode: black.Mode, *, data: bool = True) -> None: + source, expected = read_data(filename, data=data) + actual = fs(source, mode=mode) self.assertFormatEqual(expected, actual) black.assert_equivalent(source, actual) - black.assert_stable(source, actual, DEFAULT_MODE) - self.assertFalse(ff(path)) + black.assert_stable(source, actual, mode)