Adapt tests to GNATpp replacement by GNATformat

For eng/ide/gnatstudio#465

Author: AnthonyLeonardoGracio

share/support/ui/gnatformat.py

@@ -100,7 +100,7 @@ def run_gnatformat_on_project_and_subprojects():
     </target>
 
     <target model="gnatformat" category="_Project"
-    name="Format project and subprojects">
+    name="Format current project and subprojects">
         <in-toolbar>FALSE</in-toolbar>
         <in-menu>FALSE</in-menu>
         <launch-mode>MANUALLY_WITH_DIALOG</launch-mode>

testsuite/tests/S612-031.messages.highlight_gnatpp/test.py

@@ -2,9 +2,5 @@ with "imported.gpr";
 
 project Default is
 
-   package Pretty_Printer is
-      for Default_Switches ("ada") use ("-kU", "--verbose");
-   end Pretty_Printer;
-
 end Default;
 

testsuite/tests/S612-031.messages.highlight_gnatpp/test.yaml

@@ -2,8 +2,4 @@ project Imported is
 
    for Source_Dirs use ("src");
 
-   package Pretty_Printer is
-      for Default_Switches ("ada") use ("-kU", "--verbose");
-   end Pretty_Printer;
-
 end Imported;

testsuite/tests/S612-031.messages.highlight_gnatpp/unit.adb

@@ -1,27 +1,32 @@
 """
-This test checks that gnatpp actions and project and subprojects
+This test checks that gnatformat actions on project and subprojects
 work correctly.
 """
+
 import GPS
 from workflows import run_as_workflow
 from gs_utils.internal.utils import *
 
 
 @run_as_workflow
-def run_gnatpp(unit_to_check, subprojects=False, excluded_unit=None):
-    action_name = "run gnatpp on project"
-
+def run_gnatformat(unit_to_check, subprojects=False, excluded_unit=None):
+    action_name = "run gnatformat on project"
+    dialog_name = "Format current project"
     if subprojects:
         action_name += " and subprojects"
+        dialog_name += " and subprojects"
 
     yield idle_modal_dialog(lambda: GPS.execute_action(action_name))
-    dialog = get_window_by_title("Pretty Print current project")
+    dialog = get_window_by_title(dialog_name)
     get_button_from_label("Execute", dialog).clicked()
+    buttons = get_widgets_by_type(Gtk.CheckButton, dialog)
+    verbose_button = [b for b in buttons if b.get_label() == "Verbose output"][0]
+    verbose_button.set_active(True)
     yield wait_tasks()
 
     text = GPS.Console().get_text()
     gps_assert(
-        "gnatpp" in text and unit_to_check in text,
+        "gnatformat" in text and unit_to_check in text,
         True,
         unit_to_check + " should be pretty printed",
     )
@@ -40,10 +45,10 @@ def test_driver():
     prj_view.select_by_name(column=1, value="Default")
     yield wait_idle()
 
-    # Run gnatpp on the root project only
-    yield run_gnatpp(
+    # Run gnatformat on the root project only
+    yield run_gnatformat(
         unit_to_check="unit.adb", subprojects=False, excluded_unit="main.adb"
     )
 
-    # Run gnatpp on the root project and subprojects
-    yield run_gnatpp(unit_to_check="main.adb", subprojects=True)
+    # Run gnatformat on the root project and subprojects
+    yield run_gnatformat(unit_to_check="main.adb", subprojects=True)