jenkins-bot has submitted this change and it was merged.
Change subject: [IMPROV] Remove usage of 'case' method
......................................................................
[IMPROV] Remove usage of 'case' method
In acf2280a the 'case' method of APISite has been deprecated in favor of
the namespace's case value or using the siteinfo directly. This is
removing the usage from pagegenerators_tests and only validating the
case method returns the siteinfo value in site_tests.
It modifies the pagegenerator test testing the TextfilePageGenerator so
that the data is now first orderd by how they appear in the file and
then by the case sensitivity.
Change-Id: I3ebdfa6ffdbfae8e0fdaa533f7283e8a2acab707
---
M tests/pagegenerators_tests.py
M tests/site_tests.py
2 files changed, 21 insertions(+), 8 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index 7269493..f88ba64 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -264,24 +264,36 @@
dry = True
- expected_titles = {
- 'case-sensitive': ('file', 'bracket',
'MediaWiki:Test',
- 'under score', 'Upper case'),
- 'first-letter': ('File', 'Bracket',
'MediaWiki:Test', 'Under score',
- 'Upper case'),
+ title_columns = {
+ 'case-sensitive': 0,
+ 'first-letter': 1,
}
+
+ expected_titles = (
+ ('file', 'File'),
+ ('bracket', 'Bracket'),
+ ('MediaWiki:Test', 'MediaWiki:Test'),
+ ('under score', 'Under score'),
+ ('Upper case', 'Upper case'),
+ )
def test_brackets(self):
filename = os.path.join(_data_dir, 'pagelist-brackets.txt')
site = self.get_site()
titles = list(pagegenerators.TextfilePageGenerator(filename, site))
- self.assertPagelistTitles(titles, self.expected_titles[site.case()])
+ self.assertEqual(len(titles), len(self.expected_titles))
+ expected_titles =
[expected_title[self.title_columns[site.namespaces[page.namespace()].case]]
+ for expected_title, page in zip(self.expected_titles,
titles)]
+ self.assertPageTitlesEqual(titles, expected_titles)
def test_lines(self):
filename = os.path.join(_data_dir, 'pagelist-lines.txt')
site = self.get_site()
titles = list(pagegenerators.TextfilePageGenerator(filename, site))
- self.assertPagelistTitles(titles, self.expected_titles[site.case()])
+ self.assertEqual(len(titles), len(self.expected_titles))
+ expected_titles =
[expected_title[self.title_columns[site.namespaces[page.namespace()].case]]
+ for expected_title, page in zip(self.expected_titles,
titles)]
+ self.assertPageTitlesEqual(titles, expected_titles)
class TestYearPageGenerator(DefaultSiteTestCase):
diff --git a/tests/site_tests.py b/tests/site_tests.py
index d8d305e..1fe5e1a 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -1593,7 +1593,8 @@
self.assertRegex(mysite.siteinfo['timezone'],
"([A-Z]{3,4}|[A-Z][a-z]+/[A-Z][a-z]+)")
self.assertIsInstance(datetime.strptime(mysite.siteinfo['time'],
"%Y-%m-%dT%H:%M:%SZ"), datetime)
self.assertGreater(mysite.siteinfo['maxuploadsize'], 0)
- self.assertIn(mysite.case(), ["first-letter",
"case-sensitive"])
+ self.assertIn(mysite.siteinfo['case'], ["first-letter",
"case-sensitive"])
+ self.assertEqual(mysite.case(), mysite.siteinfo['case'])
self.assertEqual(re.findall("\$1",
mysite.siteinfo['articlepath']), ["$1"])
def entered_loop(iterable):
--
To view, visit
https://gerrit.wikimedia.org/r/203641
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ebdfa6ffdbfae8e0fdaa533f7283e8a2acab707
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>