Update output of a11y tests

These are all affected by the addition of the action_box in
GtkDialog or by the switch to popovers in GtkMenuButton.

5 files changed, 133 insertions, 23 deletions

diff --git a/testsuite/a11y/about.txt b/testsuite/a11y/about.txt
index e28ac0bea3..f6f316c5be 100644
--- a/testsuite/a11y/about.txt
+++ b/testsuite/a11y/about.txt
@@ -549,7 +549,7 @@ See the GNU General Public License, version 3 or later for details.
               minimum value: 0.000000
               maximum value: 0.000000
               current value: 0.000000
-    action_area
+    action_box
       "filler"
       parent: dialog-vbox1
       index: 1
@@ -558,3 +558,12 @@ See the GNU General Public License, version 3 or later for details.
       <AtkComponent>
       layer: widget
       alpha: 1
+      action_area
+        "filler"
+        parent: action_box
+        index: 0
+        state: enabled horizontal sensitive visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index 3a5a8c3805..c533816a9c 100644
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -1304,7 +1304,7 @@ window1
                                       weight: <omitted>
                                       wrap-mode: word
                   <AtkHypertext>
-    action_area
+    action_box
       "filler"
       parent: dialog-vbox1
       index: 1
@@ -1313,3 +1313,12 @@ window1
       <AtkComponent>
       layer: widget
       alpha: 1
+      action_area
+        "filler"
+        parent: action_box
+        index: 0
+        state: enabled horizontal sensitive visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt
index dfcf4d523b..5152943581 100644
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -22,17 +22,73 @@ window1
     <AtkAction>
     action 0 name: click
     action 0 description: Clicks the button
-    unnamed-GtkCheckMenuItemAccessible-0
-      "menu item"
-      parent: unnamed-GtkMenuAccessible-1
+  unnamed-GtkPopoverAccessible-0
+    "panel"
+    parent: menubutton
+    popup-for: menubutton
+    state: enabled modal sensitive
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
+    unnamed-GtkContainerAccessible-1
+      "panel"
+      parent: unnamed-GtkPopoverAccessible-0
       index: 0
-      name: New
-      state: enabled selectable sensitive visible
+      state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
-      layer: popup
+      layer: widget
       alpha: 1
-      <AtkAction>
-      action 0 name: click
-      action 0 description: Clicks the menuitem
-      <AtkSelection>
+      unnamed-GtkContainerAccessible-2
+        "filler"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 0
+        state: enabled sensitive vertical visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        unnamed-GtkContainerAccessible-3
+          "filler"
+          parent: unnamed-GtkContainerAccessible-2
+          index: 0
+          state: enabled sensitive vertical visible
+          toolkit: gtk
+          <AtkComponent>
+          layer: widget
+          alpha: 1
+          unnamed-GtkContainerAccessible-4
+            "filler"
+            parent: unnamed-GtkContainerAccessible-3
+            index: 0
+            state: enabled sensitive vertical visible
+            toolkit: gtk
+            <AtkComponent>
+            layer: widget
+            alpha: 1
+            unnamed-GtkContainerAccessible-5
+              "filler"
+              parent: unnamed-GtkContainerAccessible-4
+              index: 0
+              state: enabled sensitive vertical visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              unnamed-GtkButtonAccessible-6
+                "push button"
+                parent: unnamed-GtkContainerAccessible-5
+                index: 0
+                name: New
+                state: enabled focusable sensitive visible
+                toolkit: gtk
+                <AtkComponent>
+                layer: widget
+                alpha: 1
+                <AtkImage>
+                image size: -1 x -1
+                image description: (null)
+                <AtkAction>
+                action 0 name: click
+                action 0 description: Clicks the button
diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
index c6248479fa..5152943581 100644
--- a/testsuite/a11y/menubutton3.txt
+++ b/testsuite/a11y/menubutton3.txt
@@ -49,19 +49,46 @@ window1
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkButtonAccessible-3
-          "push button"
+        unnamed-GtkContainerAccessible-3
+          "filler"
           parent: unnamed-GtkContainerAccessible-2
           index: 0
-          name: New
-          state: enabled focusable sensitive visible
+          state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          <AtkImage>
-          image size: -1 x -1
-          image description: (null)
-          <AtkAction>
-          action 0 name: click
-          action 0 description: Clicks the button
+          unnamed-GtkContainerAccessible-4
+            "filler"
+            parent: unnamed-GtkContainerAccessible-3
+            index: 0
+            state: enabled sensitive vertical visible
+            toolkit: gtk
+            <AtkComponent>
+            layer: widget
+            alpha: 1
+            unnamed-GtkContainerAccessible-5
+              "filler"
+              parent: unnamed-GtkContainerAccessible-4
+              index: 0
+              state: enabled sensitive vertical visible
+              toolkit: gtk
+              <AtkComponent>
+              layer: widget
+              alpha: 1
+              unnamed-GtkButtonAccessible-6
+                "push button"
+                parent: unnamed-GtkContainerAccessible-5
+                index: 0
+                name: New
+                state: enabled focusable sensitive visible
+                toolkit: gtk
+                <AtkComponent>
+                layer: widget
+                alpha: 1
+                <AtkImage>
+                image size: -1 x -1
+                image description: (null)
+                <AtkAction>
+                action 0 name: click
+                action 0 description: Clicks the button
diff --git a/testsuite/a11y/messagedialog.txt b/testsuite/a11y/messagedialog.txt
index f075552133..350a11659c 100644
--- a/testsuite/a11y/messagedialog.txt
+++ b/testsuite/a11y/messagedialog.txt
@@ -164,7 +164,7 @@ window1
                               weight: <omitted>
                               wrap-mode: word
           <AtkHypertext>
-    ___object_7___
+    action_box
       "filler"
       parent: dialog-vbox1
       index: 1
@@ -173,3 +173,12 @@ window1
       <AtkComponent>
       layer: widget
       alpha: 1
+      action_area
+        "filler"
+        parent: action_box
+        index: 0
+        state: enabled horizontal sensitive showing visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1