cq: GUI tests: Code formatting and simplifications

9 files changed, 62 insertions, 44 deletions

diff --git a/test/gtk/__init__.py b/test/gtk/__init__.py
new file mode 100644
index 000000000..39a978f19
--- /dev/null
+++ b/test/gtk/__init__.py
@@ -0,0 +1,14 @@
+import gi
+
+
+def require_versions():
+    gi.require_versions({'Gdk': '3.0',
+                         'GLib': '2.0',
+                         'Gio': '2.0',
+                         'Gtk': '3.0',
+                         'GtkSource': '4',
+                         'GObject': '2.0',
+                         'Pango': '1.0'})
+
+
+require_versions()
diff --git a/test/gtk/assistant.py b/test/gtk/assistant.py
index b2ccdf801..9f3c2af0a 100644
--- a/test/gtk/assistant.py
+++ b/test/gtk/assistant.py
@@ -1,5 +1,3 @@
-import gi
-gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
 from gajim.common.const import CSSPriority
@@ -10,7 +8,8 @@ gui.init('gtk')
 from gajim.gui.assistant import Assistant
 from gajim.gui.assistant import Page
 
-from test.gtk import util
+from . import util
+
 util.load_style('gajim.css', CSSPriority.APPLICATION)
 
 
@@ -46,7 +45,7 @@ class TestAssistant(Assistant):
         self.show_all()
 
     @staticmethod
-    def _visible_func(_assistant, page_name):
+    def _visible_func(_assistant: Assistant, page_name: str) -> list[str]:
         if page_name == 'start':
             return ['forward']
 
@@ -60,7 +59,11 @@ class TestAssistant(Assistant):
             return ['back', 'close']
         raise ValueError('page %s unknown' % page_name)
 
-    def _on_button_clicked(self, _assistant, button_name):
+    def _on_button_clicked(self,
+                           _assistant: Assistant,
+                           button_name: str
+                           ) -> None:
+
         page = self.get_current_page()
         if button_name == 'forward':
             if page == 'start':
@@ -83,7 +86,7 @@ class TestAssistant(Assistant):
         if button_name == 'close':
             self.destroy()
 
-    def _on_page_changed(self, _assistant, page_name):
+    def _on_page_changed(self, _assistant: Assistant, page_name: str) -> None:
         if page_name == 'start':
             self.set_default_button('forward')
 
@@ -114,7 +117,8 @@ class Start(Page):
         label1.set_justify(Gtk.Justification.CENTER)
         label1.set_margin_bottom(24)
 
-        entry = Gtk.Entry(activates_default=True)
+        entry = Gtk.Entry()
+        entry.set_activates_default(True)
         entry.connect('changed', self._on_changed)
 
         self._server = Gtk.CheckButton.new_with_mnemonic('A fancy checkbox')
@@ -126,7 +130,7 @@ class Start(Page):
         self.pack_start(self._server, False, True, 0)
         self.show_all()
 
-    def _on_changed(self, entry):
+    def _on_changed(self, entry: Gtk.Entry) -> None:
         self.complete = bool(entry.get_text())
         self.update_page_complete()
 
diff --git a/test/gtk/certificate_dialog.py b/test/gtk/certificate_dialog.py
index 48faa7cd7..d18838ffc 100644
--- a/test/gtk/certificate_dialog.py
+++ b/test/gtk/certificate_dialog.py
@@ -1,16 +1,15 @@
-import gi
-gi.require_version('Gio', '2.0')
-gi.require_version('Gtk', '3.0')
 from gi.repository import Gio
 from gi.repository import Gtk
 
+from gajim.common.const import CSSPriority
+
 from gajim import gui
 gui.init('gtk')
 
-from test.gtk import util
-from gajim.common.const import CSSPriority
 from gajim.gui.certificate_dialog import CertificateDialog
 
+from . import util
+
 util.load_style('gajim.css', CSSPriority.APPLICATION)
 
 cert = '''
diff --git a/test/gtk/change_password.py b/test/gtk/change_password.py
index 2934db454..f2dc72557 100644
--- a/test/gtk/change_password.py
+++ b/test/gtk/change_password.py
@@ -2,23 +2,21 @@ from unittest.mock import MagicMock
 
 from functools import partial
 
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
-
 from nbxmpp.modules.dataforms import create_field
 from nbxmpp.modules.dataforms import SimpleDataForm
 
+from gi.repository import Gtk
+
+from gajim.common import app
 from gajim.common.const import CSSPriority
 
 from gajim import gui
 gui.init('gtk')
 
-from gajim.common import app
-
 from gajim.gui.change_password import ChangePassword
 
-from test.gtk import util
+from . import util
+
 util.load_style('gajim.css', CSSPriority.APPLICATION)
 
 app.get_client = MagicMock()
@@ -32,14 +30,16 @@ fields = [
 
 form = SimpleDataForm(type_='form', fields=fields)
 
-def _apply(self, next_stage=False):
+
+def _apply(self: ChangePassword, next_stage: bool = False) -> None:
     if next_stage:
         self.get_page('next_stage').get_submit_form()
     else:
         self.get_page('next_stage').set_form(form)
         self.show_page('next_stage', Gtk.StackTransitionType.SLIDE_LEFT)
 
-win = ChangePassword(None)
+
+win = ChangePassword('')
 win._on_apply = partial(_apply, win)
 
 win.connect('destroy', Gtk.main_quit)
diff --git a/test/gtk/dataform.py b/test/gtk/dataform.py
index 38285be7d..9a31a2699 100644
--- a/test/gtk/dataform.py
+++ b/test/gtk/dataform.py
@@ -2,21 +2,21 @@ from unittest.mock import MagicMock
 
 from base64 import b64decode
 
-import gi
-gi.require_version('Gtk', '3.0')
+from nbxmpp.modules.dataforms import extend_form
+from nbxmpp.simplexml import Node
+
 from gi.repository import Gtk
 
-import nbxmpp
-from nbxmpp.modules.dataforms import extend_form
+from gajim.common import app
+from gajim.common.const import CSSPriority
 
 from gajim import gui
 gui.init('gtk')
 
 from gajim.gui.dataform import DataFormWidget
-from gajim.common.const import CSSPriority
-from gajim.common import app
 
-from test.gtk import util
+from . import util
+
 util.load_style('gajim.css', CSSPriority.APPLICATION)
 
 image = '''iVBORw0KGgoAAAANSUhEUgAAAIwAAAA8CAAAAACRYQ2XAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAHdElNRQfiCwQXMiypK
@@ -130,10 +130,11 @@ class DataFormWindow(Gtk.Window):
             'form-width': 435,
         }
         self._widget = DataFormWidget(
-            extend_form(node=nbxmpp.Node(node=FORM)), options)
+            extend_form(node=Node(node=FORM)), options)
         self.add(self._widget)
         self.show()
 
+
 win = DataFormWindow()
 win.connect('destroy', Gtk.main_quit)
 win.show_all()
diff --git a/test/gtk/fake_dataform.py b/test/gtk/fake_dataform.py
index 30ceda1f3..f43156ca9 100644
--- a/test/gtk/fake_dataform.py
+++ b/test/gtk/fake_dataform.py
@@ -1,5 +1,3 @@
-import gi
-gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
 from gajim import gui
@@ -9,7 +7,8 @@ from gajim.common.const import CSSPriority
 
 from gajim.gui.dataform import FakeDataFormWidget
 
-from test.gtk import util
+from . import util
+
 util.load_style('gajim.css', CSSPriority.APPLICATION)
 
 
@@ -40,6 +39,7 @@ fake_form2 = {
     'redirect-url': 'https://jabber.at/account/register/'
 }
 
+
 class DataFormWindow(Gtk.Window):
     def __init__(self):
         Gtk.Window.__init__(self, title='Data Form Test')
@@ -48,6 +48,7 @@ class DataFormWindow(Gtk.Window):
         self.add(self._widget)
         self.show()
 
+
 win = DataFormWindow()
 win.connect('destroy', Gtk.main_quit)
 win.show_all()
diff --git a/test/gtk/groupchat_info.py b/test/gtk/groupchat_info.py
index da156d755..f8cd1ed00 100644
--- a/test/gtk/groupchat_info.py
+++ b/test/gtk/groupchat_info.py
@@ -1,22 +1,21 @@
 from unittest.mock import MagicMock
 
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
-
 from nbxmpp.protocol import Iq
 from nbxmpp.modules.discovery import parse_disco_info
 from nbxmpp.structs import MucSubject
 
+from gi.repository import Gtk
+
 from gajim.common import app
 from gajim.common.const import CSSPriority
 
 from gajim import gui
 gui.init('gtk')
 
-from test.gtk import util
 from gajim.gui.groupchat_info import GroupChatInfoScrolled
 
+from . import util
+
 util.load_style('gajim.css', CSSPriority.APPLICATION)
 
 stanza = Iq(node='''
@@ -97,6 +96,7 @@ disco_info = parse_disco_info(stanza)
 app.css_config = MagicMock()
 app.css_config.get_value = MagicMock(return_value='rgb(100, 100, 255)')
 
+
 class GroupchatInfo(Gtk.ApplicationWindow):
     def __init__(self):
         Gtk.ApplicationWindow.__init__(self)
diff --git a/test/gtk/ssl_error_dialog.py b/test/gtk/ssl_error_dialog.py
index 2a6a01911..0d89c7722 100644
--- a/test/gtk/ssl_error_dialog.py
+++ b/test/gtk/ssl_error_dialog.py
@@ -1,20 +1,17 @@
 from unittest.mock import MagicMock
 
-import gi
-gi.require_version('Gio', '2.0')
-gi.require_version('Gtk', '3.0')
 from gi.repository import Gio
 from gi.repository import Gtk
 
 from gajim import gui
 gui.init('gtk')
-
-from test.gtk import util
-
 from gajim.common import app
 from gajim.common.const import CSSPriority
+
 from gajim.gui.ssl_error_dialog import SSLErrorDialog
 
+from . import util
+
 util.load_style('gajim.css', CSSPriority.APPLICATION)
 
 cert = '''
diff --git a/test/no_gui/__init__.py b/test/no_gui/__init__.py
index 1a26b1822..39a978f19 100644
--- a/test/no_gui/__init__.py
+++ b/test/no_gui/__init__.py
@@ -1,5 +1,6 @@
 import gi
 
+
 def require_versions():
     gi.require_versions({'Gdk': '3.0',
                          'GLib': '2.0',
@@ -9,4 +10,5 @@ def require_versions():
                          'GObject': '2.0',
                          'Pango': '1.0'})
 
+
 require_versions()