further refactors tests

tests/base_wiki_test.py

@@ -8,6 +8,7 @@
 
 from tests.base_test_config import WikiConfig
 from tests.basetest import BaseTest
+from wikibot3rd.wikibot import WikiBot
 from wikibot3rd.wikiuser import WikiUser
 
 
@@ -58,3 +59,10 @@ def getSMW_WikiUser(self, wikiId="or", save=False) -> WikiUser:
         else:
             wikiUser = WikiUser.ofWikiId(wikiId, lenient=True)
         return wikiUser
+
+    def getSMW_Wiki(self, wikiId="smw"):
+        wikiUser = self.getSMW_WikiUser(wikiId)
+        wikibot = None
+        if wikiUser is not None:
+            wikibot = WikiBot.ofWikiUser(wikiUser)
+        return wikibot

tests/test_non_smw.py

@@ -6,12 +6,12 @@
 
 import unittest
 
-from tests.basetest import BaseTest
+from tests.base_wiki_test import BaseWikiTest
 from wikibot3rd.wikiclient import WikiClient
 from wikibot3rd.wikipush import WikiPush
 
 
-class TestNonSMW(BaseTest):
+class TestNonSMW(BaseWikiTest):
     """
     Test functionality for non SemanticMediaWiki sites
     according to https://github.com/WolfgangFahl/py-3rdparty-mediawiki/issues/104
@@ -20,7 +20,7 @@ class TestNonSMW(BaseTest):
     """
 
     def setUp(self, debug=False, profile=True):
-        BaseTest.setUp(self, debug=debug, profile=profile)
+        BaseWikiTest.setUp(self, debug=debug, profile=profile)
         self.wiki_id = "genealogy"
         self.category = "Kategorie:Adressbuch_in_der_Online-Erfassung/fertig"
 

tests/test_wikibot.py

@@ -41,13 +41,6 @@ def testRandomCrypt(self):
         self.assertEqual(32, len(cypher))
         self.assertEqual(8, len(salt))
 
-    def getSMW_Wiki(self, wikiId="smw"):
-        wikiUser = self.getSMW_WikiUser(wikiId)
-        wikibot = None
-        if wikiUser is not None:
-            wikibot = WikiBot.ofWikiUser(wikiUser)
-        return wikibot
-
     def testWikiBotNoLogin(self):
         """
         test a wikibot3rd where no login is needed