jenkins-bot merged this change.
[cleanup] Replace deprecated assertPagelistTitles method
assertPagelistTitles was renamed to assertPageTitlesEqual
in f1701432
Change-Id: I896bb756701be37e3bcabf6f82008f92cca2a589
---
M tests/api_tests.py
M tests/aspects.py
M tests/pagegenerators_tests.py
M tests/reflinks_tests.py
M tests/template_bot_tests.py
5 files changed, 71 insertions(+), 77 deletions(-)
diff --git a/tests/api_tests.py b/tests/api_tests.py
index cd68929..0f1ce3c 100644
--- a/tests/api_tests.py
+++ b/tests/api_tests.py
@@ -657,7 +657,7 @@
def test_results(self):
"""Test that PageGenerator yields pages with expected attributes."""
- self.assertPagelistTitles(self.gen, self.titles)
+ self.assertPageTitlesEqual(self.gen, self.titles)
def test_initial_limit(self):
"""Test the default limit."""
@@ -685,22 +685,22 @@
def test_limit_equal_total(self):
"""Test that PageGenerator yields the requested amount of pages."""
self.gen.set_maximum_items(4)
- self.assertPagelistTitles(self.gen, self.titles)
+ self.assertPageTitlesEqual(self.gen, self.titles)
def test_limit_one(self):
"""Test that PageGenerator yields the requested amount of pages."""
self.gen.set_maximum_items(1)
- self.assertPagelistTitles(self.gen, self.titles[0:1])
+ self.assertPageTitlesEqual(self.gen, self.titles[0:1])
def test_limit_zero(self):
"""Test that a limit of zero is the same as limit None."""
self.gen.set_maximum_items(0)
- self.assertPagelistTitles(self.gen, self.titles)
+ self.assertPageTitlesEqual(self.gen, self.titles)
def test_limit_omit(self):
"""Test that limit omitted is the same as limit None."""
self.gen.set_maximum_items(-1)
- self.assertPagelistTitles(self.gen, self.titles)
+ self.assertPageTitlesEqual(self.gen, self.titles)
def test_namespace(self):
"""Test PageGenerator set_namespace."""
diff --git a/tests/aspects.py b/tests/aspects.py
index 231d81e..662c44f 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -7,7 +7,7 @@
mixin to show cache usage is included.
"""
#
-# (C) Pywikibot team, 2014-2018
+# (C) Pywikibot team, 2014-2019
#
# Distributed under the terms of the MIT license.
#
@@ -265,8 +265,6 @@
gen_titles = self._get_gen_titles(gen, len(titles), site)
self.assertCountEqual(gen_titles, titles)
- assertPagelistTitles = assertPageTitlesEqual # noqa: N815
-
def assertAPIError(self, code, info=None, callable_obj=None, *args,
**kwargs):
"""
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index a32debf..e5d56c2 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -86,7 +86,7 @@
"""Test PagesFromTitlesGenerator."""
self.assertFunction('PagesFromTitlesGenerator')
gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site)
- self.assertPagelistTitles(gen, self.titles)
+ self.assertPageTitlesEqual(gen, self.titles)
def test_NamespaceFilterPageGenerator(self):
"""Test NamespaceFilterPageGenerator."""
@@ -114,19 +114,19 @@
self.assertFunction('RegexFilterPageGenerator')
gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site)
gen = pagegenerators.RegexFilterPageGenerator(gen, '/doc')
- self.assertPagelistTitles(gen,
- ('Template:!/Doc', 'Template:Template/Doc'))
+ self.assertPageTitlesEqual(gen,
+ ('Template:!/Doc', 'Template:Template/Doc'))
gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site)
gen = pagegenerators.RegexFilterPageGenerator(gen, '/doc',
quantifier='none')
self.assertEqual(len(tuple(gen)), 11)
gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site)
gen = pagegenerators.RegexFilterPageGenerator(gen, ['/doc', '/meta'])
- self.assertPagelistTitles(gen,
- ('Template:!/Doc',
- 'Template:!/Meta',
- 'Template:Template/Doc',
- 'Template:Template/Meta'))
+ self.assertPageTitlesEqual(gen,
+ ('Template:!/Doc',
+ 'Template:!/Meta',
+ 'Template:Template/Doc',
+ 'Template:Template/Meta'))
gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site)
gen = pagegenerators.RegexFilterPageGenerator(gen, ['/doc', '/meta'],
quantifier='none')
@@ -134,19 +134,19 @@
gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site)
gen = pagegenerators.RegexFilterPageGenerator(gen, ['/doc', '/meta'],
quantifier='all')
- self.assertPagelistTitles(gen, [])
+ self.assertPageTitlesEqual(gen, [])
gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site)
gen = pagegenerators.RegexFilterPageGenerator(
gen, ['Template', '/meta'], quantifier='all')
- self.assertPagelistTitles(gen, ('Template:Template/Meta', ))
+ self.assertPageTitlesEqual(gen, ('Template:Template/Meta', ))
gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site)
gen = pagegenerators.RegexFilterPageGenerator(
gen, ['template', '/meta'], quantifier='any')
- self.assertPagelistTitles(gen,
- ('Template:Template',
- 'Template:!/Meta',
- 'Template:Template/Doc',
- 'Template:Template/Meta'))
+ self.assertPageTitlesEqual(gen,
+ ('Template:Template',
+ 'Template:!/Meta',
+ 'Template:Template/Doc',
+ 'Template:Template/Meta'))
gen = pagegenerators.PagesFromTitlesGenerator(self.titles,
site=self.site)
gen = pagegenerators.RegexFilterPageGenerator(
@@ -158,9 +158,9 @@
gen = pagegenerators.RegexFilterPageGenerator(
gen, ['template', '/meta'], quantifier='all',
ignore_namespace=False)
- self.assertPagelistTitles(gen,
- ('Template:!/Meta',
- 'Template:Template/Meta'))
+ self.assertPageTitlesEqual(gen,
+ ('Template:!/Meta',
+ 'Template:Template/Meta'))
gen = pagegenerators.PagesFromTitlesGenerator(self.titles,
site=self.site)
gen = pagegenerators.RegexFilterPageGenerator(
@@ -178,10 +178,10 @@
p.text = 'This is the content of {} as a sample'.format(p.title())
pages.append(p)
gen = pagegenerators.RegexBodyFilterPageGenerator(iter(pages), '/doc')
- self.assertPagelistTitles(gen,
- ('Template:!/Doc', 'Template:Template/Doc'))
+ self.assertPageTitlesEqual(gen,
+ ('Template:!/Doc', 'Template:Template/Doc'))
gen = pagegenerators.RegexBodyFilterPageGenerator(iter(pages), 'This')
- self.assertPagelistTitles(gen, self.titles)
+ self.assertPageTitlesEqual(gen, self.titles)
gen = pagegenerators.RegexBodyFilterPageGenerator(iter(pages), 'talk',
quantifier='none')
self.assertEqual(len(tuple(gen)), 9)
@@ -212,7 +212,7 @@
pageids.append(page.pageid)
gen = pagegenerators.PagesFromPageidGenerator(pageids, self.site)
- self.assertPagelistTitles(gen, self.titles)
+ self.assertPageTitlesEqual(gen, self.titles)
class TestCategoryFilterPageGenerator(TestCase):
@@ -291,7 +291,7 @@
gen = PagesFromTitlesGenerator(self.titles, self.site)
gen = pagegenerators.EdittimeFilterPageGenerator(
gen, first_edit_end=datetime.datetime(2006, 1, 1))
- self.assertPagelistTitles(gen, titles=expect, site=self.site)
+ self.assertPageTitlesEqual(gen, titles=expect, site=self.site)
gen = PagesFromTitlesGenerator(self.titles, self.site)
gen = pagegenerators.EdittimeFilterPageGenerator(
@@ -342,7 +342,7 @@
gen = CategorizedPageGenerator(test_cat)
gen = pagegenerators.SubpageFilterGenerator(gen, 0)
expect_0 = ('/home/test',)
- self.assertPagelistTitles(gen, titles=expect_0, site=site)
+ self.assertPageTitlesEqual(gen, titles=expect_0, site=site)
gen = CategorizedPageGenerator(test_cat)
gen = pagegenerators.SubpageFilterGenerator(gen, 3)
@@ -351,7 +351,7 @@
'User:Sn1per/ProtectTest1/test',
'User:Sn1per/ProtectTest1/test/test',
)
- self.assertPagelistTitles(gen, titles=expect_3, site=site)
+ self.assertPageTitlesEqual(gen, titles=expect_3, site=site)
class PetScanPageGeneratorTestCase(TestCase):
@@ -367,7 +367,7 @@
gen = pagegenerators.PetScanPageGenerator(['Pywikibot Protect Test'],
True, None, site)
try:
- self.assertPagelistTitles(gen, titles=(
+ self.assertPageTitlesEqual(gen, titles=(
'User:Sn1per/ProtectTest1', 'User:Sn1per/ProtectTest2'),
site=site)
except ServerError as e:
@@ -375,16 +375,16 @@
gen = pagegenerators.PetScanPageGenerator(['Pywikibot Protect Test'],
False, None, site)
- self.assertPagelistTitles(gen, titles=('User:Sn1per/ProtectTest1',
- 'User:Sn1per/ProtectTest2'),
- site=site)
+ self.assertPageTitlesEqual(gen, titles=('User:Sn1per/ProtectTest1',
+ 'User:Sn1per/ProtectTest2'),
+ site=site)
gen = pagegenerators.PetScanPageGenerator(
['Pywikibot PetScan Test',
'Pywikibot Category That Needs&ToBe!Encoded',
'Test'], True, None, site)
- self.assertPagelistTitles(gen, titles=('User:Sn1per/PetScanTest1',),
- site=site)
+ self.assertPageTitlesEqual(gen, titles=('User:Sn1per/PetScanTest1', ),
+ site=site)
class TestRepeatingGenerator(RecentChangesTestCase):
diff --git a/tests/reflinks_tests.py b/tests/reflinks_tests.py
index 57c1b62..709f47a 100644
--- a/tests/reflinks_tests.py
+++ b/tests/reflinks_tests.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Tests for reflinks script."""
#
-# (C) Pywikibot team, 2014-2018
+# (C) Pywikibot team, 2014-2019
#
# Distributed under the terms of the MIT license.
#
@@ -40,8 +40,8 @@
namespaces=[0, 1],
site=self.get_site())
pages = list(gen)
- self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'),
- site=self.get_site())
+ self.assertPageTitlesEqual(pages, ('Fake page', 'Talk:Fake page'),
+ site=self.get_site())
def test_namespace_empty_list(self):
"""Test namespaces=[] processes all namespaces."""
@@ -51,8 +51,8 @@
namespaces=[],
site=self.get_site())
pages = list(gen)
- self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'),
- site=self.get_site())
+ self.assertPageTitlesEqual(pages, ('Fake page', 'Talk:Fake page'),
+ site=self.get_site())
def test_namespace_None(self):
"""Test namespaces=None processes all namespaces."""
@@ -62,8 +62,8 @@
namespaces=None,
site=self.get_site())
pages = list(gen)
- self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'),
- site=self.get_site())
+ self.assertPageTitlesEqual(pages, ('Fake page', 'Talk:Fake page'),
+ site=self.get_site())
def test_namespace_string_ids(self):
"""Test namespaces with ids as string."""
@@ -73,8 +73,8 @@
namespaces=['0', '1'],
site=self.get_site())
pages = list(gen)
- self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'),
- site=self.get_site())
+ self.assertPageTitlesEqual(pages, ('Fake page', 'Talk:Fake page'),
+ site=self.get_site())
def test_namespace_names(self):
"""Test namespaces with namespace names."""
@@ -84,8 +84,8 @@
namespaces=['Talk'],
site=self.get_site())
pages = list(gen)
- self.assertPagelistTitles(pages, ('Talk:Fake page', ),
- site=self.get_site())
+ self.assertPageTitlesEqual(pages, ('Talk:Fake page', ),
+ site=self.get_site())
def test_start_with_underscore(self):
"""Test with underscore in start page title."""
@@ -95,8 +95,8 @@
namespaces=[0, 1],
site=self.get_site())
pages = list(gen)
- self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'),
- site=self.get_site())
+ self.assertPageTitlesEqual(pages, ('Fake page', 'Talk:Fake page'),
+ site=self.get_site())
def test_without_start(self):
"""Test without a start page title."""
@@ -106,8 +106,8 @@
namespaces=[0, 1],
site=self.get_site())
pages = list(gen)
- self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'),
- site=self.get_site())
+ self.assertPageTitlesEqual(pages, ('Fake page', 'Talk:Fake page'),
+ site=self.get_site())
def test_start_prefix(self):
"""Test with a prefix as a start page title."""
@@ -117,8 +117,8 @@
namespaces=[0, 1],
site=self.get_site())
pages = list(gen)
- self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'),
- site=self.get_site())
+ self.assertPageTitlesEqual(pages, ('Fake page', 'Talk:Fake page'),
+ site=self.get_site())
class TestReferencesBotConstructor(ScriptMainTestCase):
@@ -161,8 +161,8 @@
'-namespace:1')
gen = self.constructor_args[0]
pages = list(gen)
- self.assertPagelistTitles(pages, ['Talk:Fake page'],
- site=self.get_site())
+ self.assertPageTitlesEqual(pages, ['Talk:Fake page'],
+ site=self.get_site())
def test_xml_multiple_namespace_ids(self):
"""Test the generator using multiple separate namespaces parameters."""
@@ -186,8 +186,8 @@
'-namespace:1', '-xmlstart:Fake')
gen = self.constructor_args[0]
pages = list(gen)
- self.assertPagelistTitles(pages, ['Talk:Fake page'],
- site=self.get_site())
+ self.assertPageTitlesEqual(pages, ['Talk:Fake page'],
+ site=self.get_site())
def test_xml_start_underscore(self):
"""Test the generator using a start page with an underscore."""
@@ -195,8 +195,8 @@
'-namespace:1', '-xmlstart:Fake_page')
gen = self.constructor_args[0]
pages = list(gen)
- self.assertPagelistTitles(pages, ['Talk:Fake page'],
- site=self.get_site())
+ self.assertPageTitlesEqual(pages, ['Talk:Fake page'],
+ site=self.get_site())
def test_xml_namespace_name(self):
"""Test the generator using a namespace name."""
@@ -204,8 +204,8 @@
'-namespace:Talk', '-xmlstart:Fake page')
gen = self.constructor_args[0]
pages = list(gen)
- self.assertPagelistTitles(pages, ['Talk:Fake page'],
- site=self.get_site())
+ self.assertPageTitlesEqual(pages, ['Talk:Fake page'],
+ site=self.get_site())
def dummy_constructor(self, *args, **kwargs):
diff --git a/tests/template_bot_tests.py b/tests/template_bot_tests.py
index d6d1d5d..658369d 100644
--- a/tests/template_bot_tests.py
+++ b/tests/template_bot_tests.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Test template bot module."""
#
-# (C) Pywikibot team, 2015-2018
+# (C) Pywikibot team, 2015-2019
#
# Distributed under the terms of the MIT license.
#
@@ -48,8 +48,7 @@
text_predicate=predicate)
pages = list(gen)
self.assertEqual(len(pages), 1)
- self.assertPagelistTitles(pages, ['Pear'],
- site=self.site)
+ self.assertPageTitlesEqual(pages, ['Pear'], site=self.site)
def test_match_with_params(self):
"""Test pages with one match with parameters."""
@@ -62,8 +61,7 @@
text_predicate=predicate)
pages = list(gen)
self.assertEqual(len(pages), 1)
- self.assertPagelistTitles(pages, ['Pear'],
- site=self.site)
+ self.assertPageTitlesEqual(pages, ['Pear'], site=self.site)
def test_match_any(self):
"""Test pages with one of many matches."""
@@ -78,8 +76,7 @@
text_predicate=predicate)
pages = list(gen)
self.assertEqual(len(pages), 1)
- self.assertPagelistTitles(pages, ['Pear'],
- site=self.site)
+ self.assertPageTitlesEqual(pages, ['Pear'], site=self.site)
# reorder templates
predicate = builder.search_any_predicate([template2, template1])
@@ -89,8 +86,7 @@
text_predicate=predicate)
pages = list(gen)
self.assertEqual(len(pages), 1)
- self.assertPagelistTitles(pages, ['Pear'],
- site=self.site)
+ self.assertPageTitlesEqual(pages, ['Pear'], site=self.site)
def test_match_msg(self):
"""Test pages with {{msg:..}}."""
@@ -104,8 +100,8 @@
text_predicate=predicate)
pages = list(gen)
self.assertEqual(len(pages), 1)
- self.assertPagelistTitles(pages, ['Fake page with msg'],
- site=self.site)
+ self.assertPageTitlesEqual(pages, ['Fake page with msg'],
+ site=self.site)
def test_match_unnecessary_template_prefix(self):
"""Test pages with {{template:..}}."""
@@ -119,7 +115,7 @@
text_predicate=predicate)
pages = list(gen)
self.assertEqual(len(pages), 1)
- self.assertPagelistTitles(
+ self.assertPageTitlesEqual(
pages, ['Fake page with unnecessary template prefix'],
site=self.site)
@@ -134,7 +130,7 @@
text_predicate=predicate)
pages = list(gen)
self.assertEqual(len(pages), 1)
- self.assertPagelistTitles(
+ self.assertPageTitlesEqual(
pages, ['Fake page with nested template'],
site=self.site)
To view, visit change 491000. To unsubscribe, or for help writing mail filters, visit settings.