foo
""" @@ -31,8 +30,7 @@ class TestHtmlBranches(unittest.TestCase): self.assertEqual(start_tag_info.text(), 'p.test1.test2#test') self.assertEqual(end_tag_info.text(), 'p') - def test_html_tag_tree(self): - # type: () -> None + def test_html_tag_tree(self) -> None: html = """ @@ -74,8 +72,7 @@ class TestHtmlBranches(unittest.TestCase): self.assertEqual(tree.children[0].children[1].children[1].token.kind, 'html_start') self.assertEqual(tree.children[0].children[1].children[1].token.tag, 'p') - def test_html_branches(self): - # type: () -> None + def test_html_branches(self) -> None: html = """ @@ -104,8 +101,7 @@ class TestHtmlBranches(unittest.TestCase): self.assertEqual(branches[1].staircase_text(), '\n html\n body\n p\n br\n') self.assertEqual(branches[2].staircase_text(), '\n html\n body\n p\n') - def test_build_id_dict(self): - # type: () -> None + def test_build_id_dict(self) -> None: templates = ["test_template1.html", "test_template2.html"] templates = [os.path.join(TEST_TEMPLATES_DIR, fn) for fn in templates] @@ -122,8 +118,7 @@ class TestHtmlBranches(unittest.TestCase): self.assertEqual(template_id_dict['below_navbar'], [ 'Line 10:%s/tools/tests/test_template_data/test_template2.html' % (ZULIP_PATH)]) - def test_split_for_id_and_class(self): - # type: () -> None + def test_split_for_id_and_class(self) -> None: id1 = "{{ red|blue }}" id2 = "search_box_{{ page }}" diff --git a/tools/tests/test_linter_custom_check.py b/tools/tests/test_linter_custom_check.py index 8486a1bf05..b99ade37bb 100644 --- a/tools/tests/test_linter_custom_check.py +++ b/tools/tests/test_linter_custom_check.py @@ -13,8 +13,7 @@ CHECK_MESSAGE = "Fix the corresponding rule in `tools/linter_lib/custom_check.py class TestCustomRules(TestCase): - def setUp(self): - # type: () -> None + def setUp(self) -> None: self.all_rules = [] # type: List[Dict[str, Any]] with patch('tools.linter_lib.custom_check.custom_check_file', return_value=False) as mock_custom_check_file: by_lang = dict.fromkeys(['py', 'js', 'sh', 'css', 'handlebars', 'html', @@ -27,8 +26,7 @@ class TestCustomRules(TestCase): rule_set = call_args[0][2] self.all_rules.extend(rule_set) - def test_paths_in_rules(self): - # type: () -> None + def test_paths_in_rules(self) -> None: """Verifies that the paths mentioned in linter rules actually exist""" for rule in self.all_rules: for path in rule.get('exclude', {}): @@ -47,8 +45,7 @@ class TestCustomRules(TestCase): self.assertTrue(path.endswith('/'), "The path '{}' should end with '/'. {}".format(path, CHECK_MESSAGE)) - def test_rule_patterns(self): - # type: () -> None + def test_rule_patterns(self) -> None: """Verifies that the search regex specified in a custom rule actually matches the expectation and doesn't throw false positives.""" for rule in self.all_rules: diff --git a/tools/tests/test_pretty_print.py b/tools/tests/test_pretty_print.py index e69ef4dac1..08a29ef305 100644 --- a/tools/tests/test_pretty_print.py +++ b/tools/tests/test_pretty_print.py @@ -390,12 +390,10 @@ GOOD_HTML14 = """ """ class TestPrettyPrinter(unittest.TestCase): - def compare(self, a, b): - # type: (str, str) -> None + def compare(self, a: str, b: str) -> None: self.assertEqual(a.split('\n'), b.split('\n')) - def test_pretty_print(self): - # type: () -> None + def test_pretty_print(self) -> None: self.compare(pretty_print_html(GOOD_HTML), GOOD_HTML) self.compare(pretty_print_html(BAD_HTML), GOOD_HTML) self.compare(pretty_print_html(BAD_HTML1), GOOD_HTML1) diff --git a/tools/tests/test_template_parser.py b/tools/tests/test_template_parser.py index 6a20bcd50c..c464fc5071 100644 --- a/tools/tests/test_template_parser.py +++ b/tools/tests/test_template_parser.py @@ -15,18 +15,16 @@ except ImportError: sys.exit(1) class ParserTest(unittest.TestCase): - def _assert_validate_error(self, error, fn=None, text=None, check_indent=True): - # type: (str, Optional[str], Optional[str], bool) -> None + def _assert_validate_error(self, error: str, fn: Optional[str]=None, + text: Optional[str]=None, check_indent: bool=True) -> None: with self.assertRaisesRegex(TemplateParserException, error): validate(fn=fn, text=text, check_indent=check_indent) - def test_is_django_block_tag(self): - # type: () -> None + def test_is_django_block_tag(self) -> None: self.assertTrue(is_django_block_tag('block')) self.assertFalse(is_django_block_tag('not a django tag')) - def test_validate_vanilla_html(self): - # type: () -> None + def test_validate_vanilla_html(self) -> None: ''' Verify that validate() does not raise errors for well-formed HTML. @@ -39,8 +37,7 @@ class ParserTest(unittest.TestCase): ''' validate(text=my_html) - def test_validate_handlebars(self): - # type: () -> None + def test_validate_handlebars(self) -> None: my_html = ''' {{#with stream}}{{stream}}
@@ -48,16 +45,14 @@ class ParserTest(unittest.TestCase): ''' validate(text=my_html) - def test_validate_comment(self): - # type: () -> None + def test_validate_comment(self) -> None: my_html = ''' ''' validate(text=my_html) - def test_validate_django(self): - # type: () -> None + def test_validate_django(self) -> None: my_html = ''' {% include "some_other.html" %} {% if foo %} @@ -75,22 +70,19 @@ class ParserTest(unittest.TestCase): ''' validate(text=my_html) - def test_validate_no_start_tag(self): - # type: () -> None + def test_validate_no_start_tag(self) -> None: my_html = ''' foo ''' self._assert_validate_error('No start tag', text=my_html) - def test_validate_mismatched_tag(self): - # type: () -> None + def test_validate_mismatched_tag(self) -> None: my_html = ''' foo ''' self._assert_validate_error('Mismatched tag.', text=my_html) - def test_validate_bad_indentation(self): - # type: () -> None + def test_validate_bad_indentation(self) -> None: my_html = '''foo @@ -98,53 +90,46 @@ class ParserTest(unittest.TestCase): ''' self._assert_validate_error('Bad indentation.', text=my_html, check_indent=True) - def test_validate_state_depth(self): - # type: () -> None + def test_validate_state_depth(self) -> None: my_html = ''' ''' self._assert_validate_error('Missing end tag', text=my_html) - def test_validate_incomplete_handlebars_tag_1(self): - # type: () -> None + def test_validate_incomplete_handlebars_tag_1(self) -> None: my_html = ''' {{# foo ''' self._assert_validate_error('''Tag missing "}}" at Line 2 Col 13:"{{# foo "''', text=my_html) - def test_validate_incomplete_handlebars_tag_2(self): - # type: () -> None + def test_validate_incomplete_handlebars_tag_2(self) -> None: my_html = ''' {{# foo } ''' self._assert_validate_error('Tag missing "}}" at Line 2 Col 13:"{{# foo }\n"', text=my_html) - def test_validate_incomplete_django_tag_1(self): - # type: () -> None + def test_validate_incomplete_django_tag_1(self) -> None: my_html = ''' {% foo ''' self._assert_validate_error('''Tag missing "%}" at Line 2 Col 13:"{% foo "''', text=my_html) - def test_validate_incomplete_django_tag_2(self): - # type: () -> None + def test_validate_incomplete_django_tag_2(self) -> None: my_html = ''' {% foo % ''' self._assert_validate_error('Tag missing "%}" at Line 2 Col 13:"{% foo %\n"', text=my_html) - def test_validate_incomplete_html_tag_1(self): - # type: () -> None + def test_validate_incomplete_html_tag_1(self) -> None: my_html = ''' " at Line 2 Col 13:" None + def test_validate_incomplete_html_tag_2(self) -> None: my_html = ''' None + def test_validate_empty_html_tag(self) -> None: my_html = ''' < > ''' self._assert_validate_error('Tag name missing', text=my_html) - def test_code_blocks(self): - # type: () -> None + def test_code_blocks(self) -> None: # This is fine. my_html = ''' @@ -185,8 +168,7 @@ class ParserTest(unittest.TestCase): ''' self._assert_validate_error('Code tag is split across two lines.', text=my_html) - def test_anchor_blocks(self): - # type: () -> None + def test_anchor_blocks(self) -> None: # This is allowed, although strange. my_html = ''' @@ -209,8 +191,7 @@ class ParserTest(unittest.TestCase): ''' validate(text=my_html) - def test_tokenize(self): - # type: () -> None + def test_tokenize(self) -> None: tag = 'bla' token = tokenize(tag)[0] self.assertEqual(token.kind, 'html_special')