cq: Tests: Code formatting, simplifications

7 files changed, 49 insertions, 46 deletions

diff --git a/test/no_gui/test_contacts.py b/test/no_gui/test_contacts.py
index d9d77c394..56c5d920f 100644
--- a/test/no_gui/test_contacts.py
+++ b/test/no_gui/test_contacts.py
@@ -5,7 +5,6 @@ from unittest.mock import MagicMock
 from nbxmpp.protocol import JID
 
 from gajim.common import app
-from gajim.common.modules.contacts import Contacts
 from gajim.common.modules.contacts import BareContact
 from gajim.common.storage.cache import CacheStorage
 
@@ -14,13 +13,12 @@ class ContactTest(unittest.TestCase):
     def test_contact_object(self):
         account = 'testacc'
         jid = JID.from_string('user@example.org')
-        module = Contacts(MagicMock())
 
         app.storage.cache = CacheStorage(in_memory=True)
         app.storage.cache.init()
 
-        contact = BareContact(module._log, jid, account)
-        contact2 = BareContact(module._log, jid, account)
+        contact = BareContact(MagicMock(), jid, account)
+        contact2 = BareContact(MagicMock(), jid, account)
 
         self.assertEqual(contact, contact2)
         self.assertEqual(hash(contact), hash(contact2))
diff --git a/test/no_gui/test_gtk_menus.py b/test/no_gui/test_gtk_menus.py
index 52c2e8be5..0d38a915f 100644
--- a/test/no_gui/test_gtk_menus.py
+++ b/test/no_gui/test_gtk_menus.py
@@ -1,10 +1,11 @@
 import unittest
 
+from gajim.common.const import URIType
+from gajim.common.const import XmppUriQuery
+
 from gajim import gui
 gui.init('gtk')
 
-from gajim.common.const import URIType
-from gajim.common.const import XmppUriQuery
 from gajim.gtk.menus import _uri_context_menus
 from gajim.gtk.menus import _xmpp_uri_context_menus
 
diff --git a/test/no_gui/test_gtk_util.py b/test/no_gui/test_gtk_util.py
index 3c57d3265..29344eb43 100644
--- a/test/no_gui/test_gtk_util.py
+++ b/test/no_gui/test_gtk_util.py
@@ -3,7 +3,7 @@ import unittest
 from gajim import gui
 gui.init('gtk')
 
-from gajim.gtk.util import get_first_grapheme
+from gajim.gtk.util import get_first_grapheme  # noqa
 
 
 class Test(unittest.TestCase):
@@ -20,8 +20,8 @@ class Test(unittest.TestCase):
             get_first_grapheme(über), 'u\u0308', über + ' -> ü')
 
         woman = '\U0001F469'
-        zwj   = '\u200D'
-        vs16  = '\uFE0F'
+        zwj = '\u200D'
+        vs16 = '\uFE0F'
         fitz4 = '\U0001F3FD'
 
         farmeress = f'{woman}{zwj}\U0001F33E{vs16}'
@@ -44,8 +44,8 @@ class Test(unittest.TestCase):
             get_first_grapheme(tamil_ni), tamil_ni, 'நி')
 
         # Fails 🤷 (returns the first char)
-        #thai_kam = '\u0E01\u0E33'
-        #self.assertEqual(
+        # thai_kam = '\u0E01\u0E33'
+        # self.assertEqual(
         #    get_first_grapheme(thai_kam), thai_kam, 'กำ')
 
         devanagari_ssi = '\u0937\u093F'
@@ -53,7 +53,7 @@ class Test(unittest.TestCase):
             get_first_grapheme(devanagari_ssi), devanagari_ssi, 'षि')
 
         # Only in some locales (e.g., Slovak):
-        #self.assertEqual(
+        # self.assertEqual(
         #    get_first_grapheme('ch'), 'ch', 'ch -> ch')
         # Actually, Gtk.TextIter.forward_cursor_position() doesn't seem to use
         # tailored algorithms anyway, so even with LANG=sk_SK.UTF-8 this
diff --git a/test/no_gui/test_nick_completion.py b/test/no_gui/test_nick_completion.py
index aa2dfa253..9e2a2dae1 100644
--- a/test/no_gui/test_nick_completion.py
+++ b/test/no_gui/test_nick_completion.py
@@ -1,11 +1,12 @@
 import unittest
 from unittest.mock import MagicMock
 
+from gajim.common import app
+
 from gajim import gui
 gui.init('gtk')
 
-from gajim.common import app
-from gajim.gui.groupchat_nick_completion import GroupChatNickCompletion
+from gajim.gui.groupchat_nick_completion import GroupChatNickCompletion  # noqa
 
 
 class Test(unittest.TestCase):
diff --git a/test/no_gui/test_regex.py b/test/no_gui/test_regex.py
index 44ddb4a4c..1a888df79 100644
--- a/test/no_gui/test_regex.py
+++ b/test/no_gui/test_regex.py
@@ -26,7 +26,7 @@ JIDS = [
     'example-node@example.com',
     'me@[::1]',
     'myself@127.13.42.69',
-    #'myself@127.13.42.69/localhost',  TODO
+    # 'myself@127.13.42.69/localhost',  TODO
     '#room%irc.example@biboumi.xmpp.example',
     r'here\27s_a_wild_\26_\2fcr%zy\2f_address_for\3a\3cwv\3e(\22IMPS\22)@example.com',
     r'CN=D\27Artagnan\20Saint-Andr\E9,O=Example\20\26\20Company,\20Inc.,DC=example,DC=com@st.example.com',
diff --git a/test/no_gui/test_styling.py b/test/no_gui/test_styling.py
index 1979e6fb6..eeea4413f 100644
--- a/test/no_gui/test_styling.py
+++ b/test/no_gui/test_styling.py
@@ -19,8 +19,8 @@ from gajim.common.text_helpers import escape_iri_query
 
 
 app.settings = MagicMock()
-app.settings.get.return_value = 'a a- a. scheme'  # additional_uri_schemes
-
+# additional_uri_schemes
+app.settings.get = MagicMock(return_value='a a- a. scheme')
 
 STYLING = {
     'pre cannot have children':  {
@@ -425,7 +425,7 @@ UNACCEPTABLE_URIS = [
 
     'geo:1,',
     'geo:,2',
-    #'geo:1,2,',  FIXME: wrongly parsed as valid
+    # 'geo:1,2,',  FIXME: wrongly parsed as valid
     'geo:1,,3',
     'geo:,2,3',
     'geo:1,,',
@@ -492,7 +492,7 @@ JIDS = [
     '我買@屋企.香港',
     '二ノ宮@黒川.日本',
     'медведь@с-балалайкой.рф',
-    #'संपर्क@डाटामेल.भारत',  fails because of the 2 combining chars in localpart
+    # 'संपर्क@डाटामेल.भारत',  fails because of the 2 combining chars in localpart
 ]
 
 NONJIDS = [
diff --git a/test/no_gui/test_text_helpers.py b/test/no_gui/test_text_helpers.py
index bdff8f317..89b464021 100644
--- a/test/no_gui/test_text_helpers.py
+++ b/test/no_gui/test_text_helpers.py
@@ -20,53 +20,56 @@ class Test(unittest.TestCase):
         self.assertEqual(remove_invalid_xml_chars(''), '')
         self.assertEqual(remove_invalid_xml_chars('ä'), 'ä')
 
-    def test_escape_iri_path_segment(self):
+    def test_escape_iri_path_segment(self) -> None:
         self.assertEqual(escape_iri_path_segment(''), '', '<empty string>')
 
         über = 'u\u0308ber'
         self.assertEqual(escape_iri_path_segment(über), über)
 
+        segment = ''.join(chr(c) for c in range(0x20, 0x7F))
         self.assertEqual(
-            escape_iri_path_segment(''.join(chr(c) for c in range(0x20,0x7F))),
+            escape_iri_path_segment(segment),
             "%20!%22%23$%25&'()*+,-.%2F0123456789:;%3C=%3E%3F@ABCDEFGHIJKLMN"
             'OPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~',
             'ASCII printable')
 
         self.assertEqual(escape_iri_path_segment(
-            ''.join(chr(c) for c in range(0x01,0x20)) + chr(0x7F)),
-            ''.join('%%%02X'%c for c in range(0x01,0x20)) + '%7F',
+            ''.join(chr(c) for c in range(0x01, 0x20)) + chr(0x7F)),
+            ''.join('%%%02X' % c for c in range(0x01, 0x20)) + '%7F',
             'ASCII control (no null)')
 
-
-    def test_jid_to_iri(self):
+    def test_jid_to_iri(self) -> None:
         jid = r'foo@bar'
         self.assertEqual(jid_to_iri(jid), fr'xmpp:{jid}', jid)
         jid = r'my\20self@[::1]/home'
-        self.assertEqual(jid_to_iri(jid),
+        self.assertEqual(
+            jid_to_iri(jid),
             r'xmpp:my%5C20self@%5B::1%5D/home', jid)
 
-    def test_format_duration_width(self):
-        def do(total_seconds, expected):
+    def test_format_duration_width(self) -> None:
+        def do(total_seconds: float, expected: str) -> None:
             self.assertEqual(format_duration(0.0, total_seconds*1e9), expected)
 
-        do(        0,      '0:00')
-        do(       60,      '0:00')
-        do(    10*60,     '00:00')
-        do(    60*60,   '0:00:00')
-        do( 10*60*60,  '00:00:00')
-        do(100*60*60, '000:00:00')
-
-    def test_format_duration(self):
-        def do(duration, expected):
-            self.assertEqual(format_duration(duration, 100*60*60*1e9), expected)
-
-        do(               1.0, '000:00:00')
-        do(       999999999.0, '000:00:00')
-        do(      1000000000.0, '000:00:01')
-        do(     59999999999.0, '000:00:59')
-        do(     60000000000.0, '000:01:00')
-        do(   3599999999999.0, '000:59:59')
-        do(   3600000000000.0, '001:00:00')
+        do(0, '0:00')
+        do(60, '0:00')
+        do(10 * 60, '00:00')
+        do(60 * 60, '0:00:00')
+        do(10 * 60 * 60, '00:00:00')
+        do(100 * 60 * 60, '000:00:00')
+
+    def test_format_duration(self) -> None:
+        def do(duration: float, expected: str) -> None:
+            self.assertEqual(
+                format_duration(duration, 100 * 60 * 60 * 1e9),
+                expected)
+
+        do(1.0, '000:00:00')
+        do(999999999.0, '000:00:00')
+        do(1000000000.0, '000:00:01')
+        do(59999999999.0, '000:00:59')
+        do(60000000000.0, '000:01:00')
+        do(3599999999999.0, '000:59:59')
+        do(3600000000000.0, '001:00:00')
         do(3599999999999999.0, '999:59:59')