Merge branch 'topic/#535' into 'master'

Stabilize tests

See merge request eng/ide/gnatstudio!865

Author: AnthonyLeonardoGracio

share/support/ui/pygps/__init__.py

@@ -291,6 +291,7 @@ def get_gtk_buffer(ed_buf):
     def get_window_by_title(title, list=None):
         """Search the whole hierarchy given by list (see WidgetTree) the
         first window with given title.
+        Return None when there is no window with the given title.
         """
 
         result = [
@@ -301,7 +302,7 @@ def get_window_by_title(title, list=None):
         if result:
             return result[0]
         else:
-            return result
+            return None
 
     def get_window_by_prefix(prefix, list=None):
         """Search the whole hierarchy given by list (see WidgetTree) the

testsuite/tests/S603-029.lsp.called_by/test.py

@@ -3,6 +3,7 @@
     get_widget_by_name,
     dump_tree_model,
     gps_assert,
+    wait_language_server,
 )
 from gs_utils import hook
 from pygps import double_click_events
@@ -19,8 +20,8 @@ def driver():
     yield wait_idle()
 
     GPS.execute_action("Entity called by")
-    yield hook("language_server_response_processed")
-    yield timeout(500)
+    yield wait_language_server("callHierarchy/incomingCalls")
+    yield wait_idle()
 
     call_tree = get_widget_by_name("Call Graph Tree")
     selection = call_tree.get_selection()
@@ -29,8 +30,8 @@ def driver():
     selection.select_iter(model.iter_nth_child(model.get_iter_first(), 0))
 
     GPS.execute_action("calltree expand selected")
-    yield hook("language_server_response_processed")
-    yield timeout(500)
+    yield wait_language_server("callHierarchy/incomingCalls")
+    yield wait_idle()
 
     expected = [
         "Foo is called by ",

testsuite/tests/T330-041.lsp.restart/test.py

@@ -3,6 +3,7 @@
 """
 from gs_utils.internal.utils import (
     run_test_driver,
+    wait_language_server,
     wait_tasks,
     hook,
     gps_assert,
@@ -22,9 +23,7 @@ def driver():
 
     # First verify that the navigation does *not* work
     GPS.execute_action("goto declaration")
-    # At this point "language_server_response_processed" shouldn't work,
-    # timeout instead
-    yield timeout(500)
+    yield wait_language_server("textDocument/declaration")
     current_buf = GPS.EditorBuffer.get()
     gps_assert(
         current_buf.file(),
@@ -45,8 +44,8 @@ def driver():
     b.current_view().goto(b.at(4, 7))
     yield wait_idle()
     GPS.execute_action("goto declaration")
-    # using this hook to be sure that declaration is found by ALS
-    yield hook("language_server_response_processed")
+    yield wait_language_server("textDocument/declaration")
+
     gps_assert(
         GPS.EditorBuffer.get().file(),
         GPS.File("foo.ads"),
@@ -58,8 +57,8 @@ def driver():
     b.current_view().goto(b.at(6, 26))
     yield wait_tasks()
     GPS.execute_action("goto declaration")
-    yield hook("language_server_response_processed")
-    yield wait_idle()
+    yield wait_language_server("textDocument/declaration")
+
     gps_assert(
         b.current_view().cursor().line(),
         4,
@@ -72,9 +71,8 @@ def driver():
     b.current_view().goto(b.at(6, 26))
     yield wait_idle()
     GPS.execute_action("goto declaration")
-    yield hook("language_server_response_processed")
-    yield wait_idle()
-    yield timeout(300)
+    yield wait_language_server("textDocument/declaration")
+
     gps_assert(
         b.current_view().cursor().line(),
         4,

testsuite/tests/U922-018.rename.permission/test.py

@@ -26,13 +26,11 @@ def run_test():
     check = get_button_from_label("Make files writable", dialog)
     check.set_active(False)
     get_stock_button(dialog, STOCK_OK).clicked()
-    yield timeout(500)
+    ERROR_DIALOG_TITLE = "Refactoring - rename Hello to Bye raises errors"
+    yield wait_until_true(lambda: get_window_by_title(ERROR_DIALOG_TITLE) is not None)
 
     # A dialog reporting an error should be opened, reply no to it
-    error_dialog = get_window_by_title(
-        "Refactoring - rename Hello to Bye raises errors"
-    )
-    GPS.Console().write(str(error_dialog))
+    error_dialog = get_window_by_title(ERROR_DIALOG_TITLE)
     get_button_from_label("Undo", error_dialog).clicked()
     yield wait_idle()