[gtk] Update a11y tests

[Matthias Clasen <matthiasc src gnome org>]

commit afaac9844280811ce8b94b5efd0bcd20e7f60f77
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jan 23 19:27:35 2019 -0500

    Update a11y tests
    
    Working towards a passing testsuite.

 testsuite/a11y/colorchooser.txt    |  2 +-
 testsuite/a11y/entries.txt         |  3 ++-
 testsuite/a11y/menu.txt            |  8 ++++++++
 testsuite/a11y/menubutton.txt      |  8 ++++++++
 testsuite/a11y/menubutton2.txt     | 34 +++++++++++++++++++++-------------
 testsuite/a11y/menubutton3.txt     | 34 +++++++++++++++++++++-------------
 testsuite/a11y/paned.txt           |  4 ++--
 testsuite/a11y/pickers.txt         | 16 +---------------
 testsuite/a11y/scale-drawvalue.txt |  8 ++++++++
 testsuite/a11y/tooltips.txt        |  8 ++++++++
 10 files changed, 80 insertions(+), 45 deletions(-)
---
diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index 9b1a987b1c..de2dd67a29 100644
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -773,7 +773,7 @@ window1
                 parent: grid
                 index: 0
                 description: Pick a color from the screen
-                state: enabled focusable sensitive has-tooltip
+                state: enabled focusable sensitive visible has-tooltip
                 toolkit: gtk
                 <AtkComponent>
                 layer: widget
diff --git a/testsuite/a11y/entries.txt b/testsuite/a11y/entries.txt
index 75da91d9d1..efbe14e90e 100644
--- a/testsuite/a11y/entries.txt
+++ b/testsuite/a11y/entries.txt
@@ -152,7 +152,8 @@ window1
       <AtkText>
       text: text
       character count: 4
-      caret offset: 0
+      caret offset: 4
+      selection 0: (0, 4) text
       default attributes: bg-color: <omitted>
                           bg-full-height: 0
                           direction: <omitted>
diff --git a/testsuite/a11y/menu.txt b/testsuite/a11y/menu.txt
index 432da3b4e5..ec3606f337 100644
--- a/testsuite/a11y/menu.txt
+++ b/testsuite/a11y/menu.txt
@@ -7,6 +7,14 @@ 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 3477c322cc..d9893ab868 100644
--- a/testsuite/a11y/menubutton.txt
+++ b/testsuite/a11y/menubutton.txt
@@ -7,6 +7,14 @@ 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 a660896ef8..e5d8cbb537 100644
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -7,7 +7,15 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkPopoverAccessible-0
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
+  unnamed-GtkPopoverAccessible-1
     "panel"
     parent: menubutton
     popup-for: menubutton
@@ -16,53 +24,53 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    unnamed-GtkStackAccessible-1
+    unnamed-GtkStackAccessible-2
       "panel"
-      parent: unnamed-GtkWidgetAccessible-2
+      parent: unnamed-GtkWidgetAccessible-3
       state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-3
+      unnamed-GtkContainerAccessible-4
         "filler"
-        parent: unnamed-GtkStackAccessible-1
+        parent: unnamed-GtkStackAccessible-2
         index: 0
         state: enabled sensitive vertical visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-4
+        unnamed-GtkContainerAccessible-5
           "filler"
-          parent: unnamed-GtkContainerAccessible-3
+          parent: unnamed-GtkContainerAccessible-4
           index: 0
           state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkContainerAccessible-5
+          unnamed-GtkContainerAccessible-6
             "filler"
-            parent: unnamed-GtkContainerAccessible-4
+            parent: unnamed-GtkContainerAccessible-5
             index: 0
             state: enabled sensitive vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            unnamed-GtkContainerAccessible-6
+            unnamed-GtkContainerAccessible-7
               "filler"
-              parent: unnamed-GtkContainerAccessible-5
+              parent: unnamed-GtkContainerAccessible-6
               index: 0
               state: enabled sensitive vertical visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              unnamed-GtkButtonAccessible-7
+              unnamed-GtkButtonAccessible-8
                 "push button"
-                parent: unnamed-GtkContainerAccessible-6
+                parent: unnamed-GtkContainerAccessible-7
                 index: 0
                 name: New
                 state: enabled focusable sensitive visible
diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
index a660896ef8..e5d8cbb537 100644
--- a/testsuite/a11y/menubutton3.txt
+++ b/testsuite/a11y/menubutton3.txt
@@ -7,7 +7,15 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkPopoverAccessible-0
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
+  unnamed-GtkPopoverAccessible-1
     "panel"
     parent: menubutton
     popup-for: menubutton
@@ -16,53 +24,53 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    unnamed-GtkStackAccessible-1
+    unnamed-GtkStackAccessible-2
       "panel"
-      parent: unnamed-GtkWidgetAccessible-2
+      parent: unnamed-GtkWidgetAccessible-3
       state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-3
+      unnamed-GtkContainerAccessible-4
         "filler"
-        parent: unnamed-GtkStackAccessible-1
+        parent: unnamed-GtkStackAccessible-2
         index: 0
         state: enabled sensitive vertical visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-4
+        unnamed-GtkContainerAccessible-5
           "filler"
-          parent: unnamed-GtkContainerAccessible-3
+          parent: unnamed-GtkContainerAccessible-4
           index: 0
           state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkContainerAccessible-5
+          unnamed-GtkContainerAccessible-6
             "filler"
-            parent: unnamed-GtkContainerAccessible-4
+            parent: unnamed-GtkContainerAccessible-5
             index: 0
             state: enabled sensitive vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            unnamed-GtkContainerAccessible-6
+            unnamed-GtkContainerAccessible-7
               "filler"
-              parent: unnamed-GtkContainerAccessible-5
+              parent: unnamed-GtkContainerAccessible-6
               index: 0
               state: enabled sensitive vertical visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              unnamed-GtkButtonAccessible-7
+              unnamed-GtkButtonAccessible-8
                 "push button"
-                parent: unnamed-GtkContainerAccessible-6
+                parent: unnamed-GtkContainerAccessible-7
                 index: 0
                 name: New
                 state: enabled focusable sensitive visible
diff --git a/testsuite/a11y/paned.txt b/testsuite/a11y/paned.txt
index a95a5b0c52..5a71315868 100644
--- a/testsuite/a11y/paned.txt
+++ b/testsuite/a11y/paned.txt
@@ -18,8 +18,8 @@ window1
     alpha: 1
     <AtkValue>
     minimum value: 0.000000
-    maximum value: 59.000000
-    current value: 25.000000
+    maximum value: 60.000000
+    current value: 26.000000
     label1
       "label"
       parent: paned1
diff --git a/testsuite/a11y/pickers.txt b/testsuite/a11y/pickers.txt
index 5e7dbc097c..7f457e374a 100644
--- a/testsuite/a11y/pickers.txt
+++ b/testsuite/a11y/pickers.txt
@@ -17,7 +17,7 @@ window1
     layer: widget
     alpha: 1
     button1
-      "combo box"
+      "unknown"
       parent: grid1
       index: 0
       state: enabled sensitive showing visible
@@ -25,20 +25,6 @@ window1
       <AtkComponent>
       layer: widget
       alpha: 1
-      <AtkAction>
-      action 0 name: press
-      action 0 description: Presses the combobox
-      <AtkSelection>
-      popup_widget
-        "menu"
-        parent: button1
-        index: 0
-        state: enabled sensitive visible
-        toolkit: gtk
-        <AtkComponent>
-        layer: popup
-        alpha: 1
-        <AtkSelection>
     button2
       "unknown"
       parent: grid1
diff --git a/testsuite/a11y/scale-drawvalue.txt b/testsuite/a11y/scale-drawvalue.txt
index 3467462c5e..327b819ffa 100644
--- a/testsuite/a11y/scale-drawvalue.txt
+++ b/testsuite/a11y/scale-drawvalue.txt
@@ -7,6 +7,14 @@ 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 2b250e6cf7..e2a0f3ed99 100644
--- a/testsuite/a11y/tooltips.txt
+++ b/testsuite/a11y/tooltips.txt
@@ -7,6 +7,14 @@ 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