jenkins-bot has submitted this change and it was merged.

Change subject: [FIX] proofreadpage_tests: Prepare redlink tests
......................................................................


[FIX] proofreadpage_tests: Prepare redlink tests

The test for redlinks in an index page have been added in f77fb56f but they
were using `dict.values` which is not stable and thus might change the order.
Additionally this is preparing the test class by creating the page instances
once.

Change-Id: I55084049460f39a27e36ff9b0f6a3e544db68d04
---
M tests/proofreadpage_tests.py
1 file changed, 22 insertions(+), 24 deletions(-)

Approvals:
  Mpaa: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py
index 67927fd..b1c5b4c 100644
--- a/tests/proofreadpage_tests.py
+++ b/tests/proofreadpage_tests.py
@@ -541,41 +541,39 @@
 
     cached = True
 
-    with_redlink = {
-        'title': {'blue': 'Page:Pywikibot test page 1/1',
-                  'red': 'Page:Pywikibot test page 2/2',
-                  },
-        'index': 'Index:Pywikibot test page 1'
-    }
+    index_name = 'Index:Pywikibot test page 1'
+    page_names = ['Page:Pywikibot test page 1/1',
+                  'Page:Pywikibot test page 2/2',
+                  ]
+    missing_name = 'Page:Pywikibot test page 2/2'
+
+    @classmethod
+    def setUpClass(cls):
+        """Prepare tests by creating page instances."""
+        super(TestIndexPageMappingsRedlinks, cls).setUpClass()
+        cls.index = IndexPage(cls.site, cls.index_name)
+        cls.pages = [ProofreadPage(cls.site, page) for page in cls.page_names]
+        cls.missing = ProofreadPage(cls.site, cls.missing_name)
 
     def test_index_redlink(self):
         """Test index property with redlink."""
-        page = ProofreadPage(self.site, self.with_redlink['title']['red'])
-        index_page = IndexPage(self.site, self.with_redlink['index'])
-        self.assertEqual(page.index, index_page)
+        self.assertEqual(self.missing.index, self.index)
 
     def test_get_page_and_number_redlink(self):
         """Test IndexPage page get_page_number functions with redlinks."""
-        index_page = IndexPage(self.site, self.with_redlink['index'])
-
-        for title in self.with_redlink['title'].values():
-            p = ProofreadPage(self.site, title)
-            n = index_page.get_number(p)
-            self.assertEqual(index_page.get_page(n), p)
+        for page in self.pages:
+            n = self.index.get_number(page)
+            self.assertEqual(self.index.get_page(n), page)
 
     def test_page_gen_redlink(self):
         """Test Index page generator with redlinks."""
-        index_page = IndexPage(self.site, self.with_redlink['index'])
-        proofread_pages = [ProofreadPage(self.site, page_title) for
-                           page_title in self.with_redlink['title'].values()]
-
         # Check start/end limits.
-        self.assertRaises(ValueError, index_page.page_gen, -1, 2)
-        self.assertRaises(ValueError, index_page.page_gen, 1, -1)
-        self.assertRaises(ValueError, index_page.page_gen, 2, 1)
+        self.assertRaises(ValueError, self.index.page_gen, -1, 2)
+        self.assertRaises(ValueError, self.index.page_gen, 1, -1)
+        self.assertRaises(ValueError, self.index.page_gen, 2, 1)
 
-        gen = index_page.page_gen(1, None, filter_ql=range(5))
-        self.assertEqual(list(gen), proofread_pages)
+        gen = self.index.page_gen(1, None, filter_ql=range(5))
+        self.assertEqual(list(gen), self.pages)
 
 
 if __name__ == '__main__':

-- 
To view, visit https://gerrit.wikimedia.org/r/245142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I55084049460f39a27e36ff9b0f6a3e544db68d04
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Mpaa <[email protected]>
Gerrit-Reviewer: XZise <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to