Fix tests and some imports

3liz · Aug 8, 2022 · b70f873 · b70f873
1 parent ee77aa6
commit b70f873
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/QuickOSM/core/utilities/completer_free.py b/QuickOSM/core/utilities/completer_free.py
@@ -2,8 +2,8 @@
 
 import unicodedata
 
-from PyQt5.QtCore import QStringListModel, Qt
-from PyQt5.QtWidgets import QCompleter
+from qgis.PyQt.QtCore import QStringListModel, Qt
+from qgis.PyQt.QtWidgets import QCompleter
 
 
 def strip_accents(s: str) -> str:

diff --git a/QuickOSM/test/test_saved_query.py b/QuickOSM/test/test_saved_query.py
@@ -3,6 +3,7 @@
 import os
 
 from qgis.core import QgsCoordinateReferenceSystem, QgsRectangle
+from qgis.PyQt.QtWidgets import QDialogButtonBox
 from qgis.testing import unittest
 
 from QuickOSM.core.utilities.json_encoder import as_enum
@@ -141,7 +142,7 @@ def test_view_bookmark(self):
         self.assertEqual(nb_queries, 1)
 
         edit_dialog.preset_name.setText('Test a new name')
-        edit_dialog.button_cancel.click()
+        edit_dialog.button_box.button(QDialogButtonBox.Cancel).click()
 
         self.dialog.external_panels[Panels.MapPreset].update_personal_preset_view()
 
@@ -156,7 +157,7 @@ def test_edit_rename_bookmark(self):
 
         edit_dialog = EditPreset(self.dialog, data_preset)
         edit_dialog.preset_name.setText('Test a new name')
-        edit_dialog.button_validate.click()
+        edit_dialog.button_box.button(QDialogButtonBox.Ok).click()
 
         self.dialog.external_panels[Panels.MapPreset].update_personal_preset_view()
 
@@ -182,7 +183,7 @@ def test_edited_bookmark_file(self):
         index = edit_dialog.combo_output_format.findData(Format.Kml)
         edit_dialog.combo_output_format.setCurrentIndex(index)
 
-        edit_dialog.button_validate.click()
+        edit_dialog.button_box.button(QDialogButtonBox.Ok).click()
         self.preset = self.dialog.list_personal_preset_mp.item(0)
 
         new_data = self.set_up_preset_data_text()
@@ -239,7 +240,7 @@ def test_bookmark_several_query(self):
         edit_dialog = EditPreset(self.dialog, data_preset)
 
         self.assertEqual(edit_dialog.current_query, 0)
-        edit_dialog.button_add.click()
+        edit_dialog.add_query('Query2')
 
         nb_queries = edit_dialog.list_queries.count()
         self.assertEqual(nb_queries, 2)
@@ -258,7 +259,7 @@ def test_bookmark_several_query(self):
         index = edit_dialog.table_keys_values_eb.cellWidget(0, 2).findText('route')
         edit_dialog.table_keys_values_eb.cellWidget(0, 2).setCurrentIndex(index)
 
-        edit_dialog.button_validate.click()
+        edit_dialog.button_box.button(QDialogButtonBox.Ok).click()
         self.preset = self.dialog.list_personal_preset_mp.item(0)
 
         new_data = self.set_up_preset_data_text()
@@ -333,7 +334,7 @@ def test_bookmark_several_query(self):
         self.assertEqual(
             edit_dialog.stacked_parameters_preset.currentWidget(), edit_dialog.advanced_parameters)
 
-        edit_dialog.button_validate.click()
+        edit_dialog.button_box.button(QDialogButtonBox.Ok).click()
         self.preset = self.dialog.list_personal_preset_mp.item(0)
 
         new_data = self.set_up_preset_data_text()

diff --git a/QuickOSM/ui/edit_preset.py b/QuickOSM/ui/edit_preset.py
@@ -2,15 +2,13 @@
 import logging
 import os
 
-from PyQt5.QtCore import QUrl
-from PyQt5.QtGui import QDesktopServices
-from PyQt5.QtWidgets import QDialogButtonBox
 from qgis.core import QgsApplication, QgsCoordinateReferenceSystem
 from qgis.gui import QgsExtentWidget, QgsFileWidget
-from qgis.PyQt.QtCore import QPoint, Qt
-from qgis.PyQt.QtGui import QIcon
+from qgis.PyQt.QtCore import QPoint, Qt, QUrl
+from qgis.PyQt.QtGui import QDesktopServices, QIcon
 from qgis.PyQt.QtWidgets import (
     QDialog,
+    QDialogButtonBox,
     QInputDialog,
     QListWidgetItem,
     QMenu,
@@ -250,11 +248,15 @@ def change_query(self):
         self.current_query = self.list_queries.currentRow()
         self.data_filling_form(self.current_query)
 
-    def add_query(self):
+    def add_query(self, default_name: str = ''):
         """Add a query in the preset"""
-        text, ok = QInputDialog().getText(self, "New query", "Name of the query")
-        if not ok:
-            return
+        if not default_name:
+            text, ok = QInputDialog().getText(self, "New query", "Name of the query")
+            if not ok:
+                return
+        else:
+            # We are in tests
+            text = default_name
 
         if not text:
             text = tr('Query') + str(self.nb_queries + 1)