tests: Update a11y testscolor-picker

Some things changed.

9 files changed, 51 insertions, 83 deletions

diff --git a/testsuite/a11y/assistant.txt b/testsuite/a11y/assistant.txt
index 9e049d1fe6..9d64f17f2e 100644
--- a/testsuite/a11y/assistant.txt
+++ b/testsuite/a11y/assistant.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  name: 
+  name: Page 1
   state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
@@ -12,7 +12,7 @@ window1
     "push button"
     parent: unnamed-GtkContainerAccessible-0
     index: 0
-    name: Button 1
+    name: Page 1
     state: enabled focusable sensitive showing visible
     toolkit: gtk
     <AtkComponent>
@@ -28,7 +28,7 @@ window1
     "push button"
     parent: unnamed-GtkContainerAccessible-1
     index: 0
-    name: Button 2
+    name: Page 2
     state: enabled focusable sensitive visible
     toolkit: gtk
     <AtkComponent>
diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index 6a55c0ce1c..9b1a987b1c 100644
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -768,10 +768,26 @@ window1
               <AtkComponent>
               layer: widget
               alpha: 1
+              picker_button
+                "push button"
+                parent: grid
+                index: 0
+                description: Pick a color from the screen
+                state: enabled focusable sensitive has-tooltip
+                toolkit: gtk
+                <AtkComponent>
+                layer: widget
+                alpha: 1
+                <AtkImage>
+                image size: 16 x 16
+                image description: (null)
+                <AtkAction>
+                action 0 name: click
+                action 0 description: Clicks the button
               swatch
                 "radio button"
                 parent: grid
-                index: 0
+                index: 1
                 state: enabled sensitive visible
                 toolkit: gtk
                 <AtkComponent>
@@ -787,7 +803,7 @@ window1
               entry
                 "text"
                 parent: grid
-                index: 1
+                index: 2
                 name: Color Name
                 state: editable enabled focusable sensitive single-line visible
                 toolkit: gtk
@@ -829,7 +845,7 @@ window1
               h_slider
                 "color chooser"
                 parent: grid
-                index: 2
+                index: 3
                 name: Hue
                 state: enabled focusable sensitive vertical visible
                 toolkit: gtk
@@ -843,7 +859,7 @@ window1
               a_slider
                 "color chooser"
                 parent: grid
-                index: 3
+                index: 4
                 name: Alpha
                 state: enabled focusable horizontal sensitive visible
                 toolkit: gtk
@@ -857,7 +873,7 @@ window1
               sv_plane
                 "color chooser"
                 parent: grid
-                index: 4
+                index: 5
                 name: Color Plane
                 state: enabled focusable sensitive visible
                 toolkit: gtk
diff --git a/testsuite/a11y/menu.txt b/testsuite/a11y/menu.txt
index ec3606f337..432da3b4e5 100644
--- a/testsuite/a11y/menu.txt
+++ b/testsuite/a11y/menu.txt
@@ -7,14 +7,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
   menubar1
     "menu bar"
     parent: window1
diff --git a/testsuite/a11y/menubutton.txt b/testsuite/a11y/menubutton.txt
index d9893ab868..3477c322cc 100644
--- a/testsuite/a11y/menubutton.txt
+++ b/testsuite/a11y/menubutton.txt
@@ -7,14 +7,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
   menubutton
     "toggle button"
     parent: window1
diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt
index e5d8cbb537..a660896ef8 100644
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -7,15 +7,7 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
-  unnamed-GtkPopoverAccessible-1
+  unnamed-GtkPopoverAccessible-0
     "panel"
     parent: menubutton
     popup-for: menubutton
@@ -24,53 +16,53 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    unnamed-GtkStackAccessible-2
+    unnamed-GtkStackAccessible-1
       "panel"
-      parent: unnamed-GtkWidgetAccessible-3
+      parent: unnamed-GtkWidgetAccessible-2
       state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-4
+      unnamed-GtkContainerAccessible-3
         "filler"
-        parent: unnamed-GtkStackAccessible-2
+        parent: unnamed-GtkStackAccessible-1
         index: 0
         state: enabled sensitive vertical visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-5
+        unnamed-GtkContainerAccessible-4
           "filler"
-          parent: unnamed-GtkContainerAccessible-4
+          parent: unnamed-GtkContainerAccessible-3
           index: 0
           state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkContainerAccessible-6
+          unnamed-GtkContainerAccessible-5
             "filler"
-            parent: unnamed-GtkContainerAccessible-5
+            parent: unnamed-GtkContainerAccessible-4
             index: 0
             state: enabled sensitive vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            unnamed-GtkContainerAccessible-7
+            unnamed-GtkContainerAccessible-6
               "filler"
-              parent: unnamed-GtkContainerAccessible-6
+              parent: unnamed-GtkContainerAccessible-5
               index: 0
               state: enabled sensitive vertical visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              unnamed-GtkButtonAccessible-8
+              unnamed-GtkButtonAccessible-7
                 "push button"
-                parent: unnamed-GtkContainerAccessible-7
+                parent: unnamed-GtkContainerAccessible-6
                 index: 0
                 name: New
                 state: enabled focusable sensitive visible
diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
index e5d8cbb537..a660896ef8 100644
--- a/testsuite/a11y/menubutton3.txt
+++ b/testsuite/a11y/menubutton3.txt
@@ -7,15 +7,7 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
-  unnamed-GtkPopoverAccessible-1
+  unnamed-GtkPopoverAccessible-0
     "panel"
     parent: menubutton
     popup-for: menubutton
@@ -24,53 +16,53 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    unnamed-GtkStackAccessible-2
+    unnamed-GtkStackAccessible-1
       "panel"
-      parent: unnamed-GtkWidgetAccessible-3
+      parent: unnamed-GtkWidgetAccessible-2
       state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-4
+      unnamed-GtkContainerAccessible-3
         "filler"
-        parent: unnamed-GtkStackAccessible-2
+        parent: unnamed-GtkStackAccessible-1
         index: 0
         state: enabled sensitive vertical visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-5
+        unnamed-GtkContainerAccessible-4
           "filler"
-          parent: unnamed-GtkContainerAccessible-4
+          parent: unnamed-GtkContainerAccessible-3
           index: 0
           state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkContainerAccessible-6
+          unnamed-GtkContainerAccessible-5
             "filler"
-            parent: unnamed-GtkContainerAccessible-5
+            parent: unnamed-GtkContainerAccessible-4
             index: 0
             state: enabled sensitive vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            unnamed-GtkContainerAccessible-7
+            unnamed-GtkContainerAccessible-6
               "filler"
-              parent: unnamed-GtkContainerAccessible-6
+              parent: unnamed-GtkContainerAccessible-5
               index: 0
               state: enabled sensitive vertical visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              unnamed-GtkButtonAccessible-8
+              unnamed-GtkButtonAccessible-7
                 "push button"
-                parent: unnamed-GtkContainerAccessible-7
+                parent: unnamed-GtkContainerAccessible-6
                 index: 0
                 name: New
                 state: enabled focusable sensitive visible
diff --git a/testsuite/a11y/paned.txt b/testsuite/a11y/paned.txt
index 3ff964d8a9..a95a5b0c52 100644
--- a/testsuite/a11y/paned.txt
+++ b/testsuite/a11y/paned.txt
@@ -18,7 +18,7 @@ window1
     alpha: 1
     <AtkValue>
     minimum value: 0.000000
-    maximum value: 58.000000
+    maximum value: 59.000000
     current value: 25.000000
     label1
       "label"
diff --git a/testsuite/a11y/scale-drawvalue.txt b/testsuite/a11y/scale-drawvalue.txt
index 327b819ffa..3467462c5e 100644
--- a/testsuite/a11y/scale-drawvalue.txt
+++ b/testsuite/a11y/scale-drawvalue.txt
@@ -7,14 +7,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
   scale1
     "slider"
     parent: window1
diff --git a/testsuite/a11y/tooltips.txt b/testsuite/a11y/tooltips.txt
index e2a0f3ed99..2b250e6cf7 100644
--- a/testsuite/a11y/tooltips.txt
+++ b/testsuite/a11y/tooltips.txt
@@ -7,14 +7,6 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
-    "panel"
-    parent: window1
-    state: enabled sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
   box1
     "filler"
     parent: window1