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

Change subject: port interwikiFormat test and categoryFormat tests from compat
......................................................................


port interwikiFormat test and categoryFormat tests from compat

Change-Id: I63836e908e0b2bc6f0d7478a756cf6e9744a70a4
---
M tests/textlib_tests.py
1 file changed, 48 insertions(+), 1 deletion(-)

Approvals:
  John Vandenberg: Looks good to me, but someone else must approve
  Xqt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py
index 1040552..3297c7d 100644
--- a/tests/textlib_tests.py
+++ b/tests/textlib_tests.py
@@ -15,6 +15,7 @@
 
 import pywikibot
 import pywikibot.textlib as textlib
+from pywikibot import config
 
 from tests.utils import unittest
 
@@ -22,10 +23,16 @@
 dirname = os.path.join(os.path.dirname(__file__), "pages")
 
 for f in ["enwiki_help_editing"]:
-    files[f] = codecs.open(os.path.join(dirname, f + ".page"), 'r', 
'utf-8').read()
+    files[f] = codecs.open(os.path.join(dirname, f + ".page"),
+                           'r', 'utf-8').read()
 
 
 class TestSectionFunctions(unittest.TestCase):
+    def setUp(self):
+        self.site = pywikibot.Site('en', 'wikipedia')
+        self.catresult1 = ('[[Category:Cat1]]%(LS)s[[Category:Cat2]]%(LS)s'
+                           % {'LS': config.LS})
+
     def contains(self, fn, sn):
         return textlib.does_text_contain_section(
             files[fn], sn)
@@ -82,6 +89,46 @@
         self.assertNotContains("enwiki_help_editing", u"Helpful tips", 
"section header must contain a link")
 
 
+class TestFormatFunctions(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.site = pywikibot.Site('en', 'wikipedia')
+        cls.catresult = ('[[Category:Cat1]]%(LS)s[[Category:Cat2]]%(LS)s'
+                          % {'LS': config.LS})
+
+    def test_interwiki_format(self):
+        interwikis = {
+            'de': pywikibot.Page(pywikibot.Link('de:German')),
+            'fr': pywikibot.Page(pywikibot.Link('fr:French'))
+        }
+        self.assertEqual('[[de:German]]%(LS)s[[fr:French]]%(LS)s'
+                         % {'LS': config.LS},
+                         textlib.interwikiFormat(interwikis, self.site))
+
+    def test_category_format_raw(self):
+        self.assertEqual(self.catresult,
+                         textlib.categoryFormat(['[[Category:Cat1]]',
+                                                 '[[Category:Cat2]]'],
+                                                self.site))
+
+    def test_category_format_bare(self):
+        self.assertEqual(self.catresult,
+                         textlib.categoryFormat(['Cat1', 'Cat2'], self.site))
+
+    def test_category_format_Category(self):
+        data = [pywikibot.Category(self.site, 'Cat1'),
+                pywikibot.Category(self.site, 'Cat2')]
+        self.assertEqual(self.catresult,
+                         textlib.categoryFormat(data, self.site))
+
+    def test_category_format_Page(self):
+        data = [pywikibot.Page(self.site, 'Category:Cat1'),
+                pywikibot.Page(self.site, 'Category:Cat2')]
+        self.assertEqual(self.catresult,
+                         textlib.categoryFormat(data, self.site))
+
+
 if __name__ == '__main__':
     try:
         unittest.main()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I63836e908e0b2bc6f0d7478a756cf6e9744a70a4
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to