[Pywikibot-commits] [Gerrit] pywikibot/core[master]: [cleanup] Simplify TestLink.test_valid()

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/517012 ) Change subject: [cleanup] Simplify TestLink.test_valid() ...................................................................... [cleanup] Simplify TestLink.test_valid() - use a title_tests lists to be tested - calculate site only once Change-Id: I4eb94ac69fdc48912dd7aac86a9670667f161ee4 --- M tests/link_tests.py 1 file changed, 23 insertions(+), 33 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/link_tests.py b/tests/link_tests.py index 0de8f29..180dcf5 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -71,43 +71,33 @@ def test_valid(self): """Test that valid titles are correctly normalized.""" - self.assertEqual(Link('Sandbox', self.get_site()).title, 'Sandbox') - self.assertEqual(Link('A "B"', self.get_site()).title, 'A "B"') - self.assertEqual(Link("A 'B'", self.get_site()).title, "A 'B'") - self.assertEqual(Link('.com', self.get_site()).title, '.com') - self.assertEqual(Link('~', self.get_site()).title, '~') - self.assertEqual(Link('"', self.get_site()).title, '"') - self.assertEqual(Link("'", self.get_site()).title, "'") - self.assertEqual(Link('Talk:Sandbox', self.get_site()).title, - 'Sandbox') - self.assertEqual(Link('Talk:Foo:Sandbox', self.get_site()).title, - 'Foo:Sandbox') - self.assertEqual(Link('File:Example.svg', self.get_site()).title, - 'Example.svg') - self.assertEqual(Link('File_talk:Example.svg', self.get_site()).title, - 'Example.svg') - self.assertEqual(Link('Foo/.../Sandbox', self.get_site()).title, - 'Foo/.../Sandbox') - self.assertEqual(Link('Sandbox/...', self.get_site()).title, - 'Sandbox/...') - self.assertEqual(Link('A~~', self.get_site()).title, 'A~~') - self.assertEqual(Link(':A', self.get_site()).title, 'A') - # Length is 256 total, but only title part matters - self.assertEqual(Link('Category:' + 'X' * 248, self.get_site()).title, - 'X' * 248) - self.assertEqual(Link('X' * 252, self.get_site()).title, 'X' * 252) - self.assertEqual(Link('A%20B', self.get_site()).title, 'A B') - self.assertEqual(Link('A é B', self.get_site()).title, 'A é B') - self.assertEqual(Link('A é B', self.get_site()).title, 'A é B') - self.assertEqual(Link('A é B', self.get_site()).title, 'A é B') - self.assertEqual(Link('A   B', self.get_site()).title, 'A B') - self.assertEqual(Link('A   B', self.get_site()).title, 'A B') + site = self.get_site() + title_tests = ['Sandbox', 'A "B"', "A 'B'", '.com', '~', '"', "'", + 'Foo/.../Sandbox', 'Sandbox/...', 'A~~', 'X' * 252] + for title in title_tests: + with self.subTest(title=title): + self.assertEqual(Link(title, site).title, title) - anchor_link = Link('A | B', self.get_site()) + self.assertEqual(Link('Talk:Sandbox', site).title, 'Sandbox') + self.assertEqual(Link('Talk:Foo:Sandbox', site).title, 'Foo:Sandbox') + self.assertEqual(Link('File:Example.svg', site).title, 'Example.svg') + self.assertEqual(Link('File_talk:Example.svg', site).title, + 'Example.svg') + self.assertEqual(Link(':A', site).title, 'A') + # Length is 256 total, but only title part matters + self.assertEqual(Link('Category:' + 'X' * 248, site).title, 'X' * 248) + self.assertEqual(Link('A%20B', site).title, 'A B') + self.assertEqual(Link('A é B', site).title, 'A é B') + self.assertEqual(Link('A é B', site).title, 'A é B') + self.assertEqual(Link('A é B', site).title, 'A é B') + self.assertEqual(Link('A   B', site).title, 'A B') + self.assertEqual(Link('A   B', site).title, 'A B') + + anchor_link = Link('A | B', site) self.assertEqual(anchor_link.title, 'A') self.assertEqual(anchor_link.anchor, ' B') - section_link = Link('A%23B', self.get_site()) + section_link = Link('A%23B', site) self.assertEqual(section_link.title, 'A') self.assertEqual(section_link.section, 'B') -- To view, visit https://gerrit.wikimedia.org/r/517012 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4eb94ac69fdc48912dd7aac86a9670667f161ee4 Gerrit-Change-Number: 517012 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)