Update expected output of a11y tests

The window type attribute shows up here now.
The caret mode changes also affect some tests.

38 files changed, 41 insertions, 4 deletions

diff --git a/testsuite/a11y/about.txt b/testsuite/a11y/about.txt
index 92ff039064..9f3fb7271d 100644
--- a/testsuite/a11y/about.txt
+++ b/testsuite/a11y/about.txt
@@ -4,6 +4,7 @@ window1
   name: About FancyPants
   state: enabled sensitive showing visible
   toolkit: gtk
+  window-type: dialog
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/accessible-name.txt b/testsuite/a11y/accessible-name.txt
index 0fbd0aa3e0..1c5be98fb8 100644
--- a/testsuite/a11y/accessible-name.txt
+++ b/testsuite/a11y/accessible-name.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/actionbar.txt b/testsuite/a11y/actionbar.txt
index 7d6c2079a3..1530ae7d82 100644
--- a/testsuite/a11y/actionbar.txt
+++ b/testsuite/a11y/actionbar.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/assistant.txt b/testsuite/a11y/assistant.txt
index bf0e89946f..9b82566d29 100644
--- a/testsuite/a11y/assistant.txt
+++ b/testsuite/a11y/assistant.txt
@@ -4,6 +4,7 @@ window1
   name: Page 1
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/buttons.txt b/testsuite/a11y/buttons.txt
index 769bc1bdc6..9568e0473a 100644
--- a/testsuite/a11y/buttons.txt
+++ b/testsuite/a11y/buttons.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/calendar.txt b/testsuite/a11y/calendar.txt
index 06985b9f03..768d6c479d 100644
--- a/testsuite/a11y/calendar.txt
+++ b/testsuite/a11y/calendar.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index 60d46f44fe..3986054027 100644
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -4,6 +4,7 @@ window1
   name: Select a Color
   state: enabled sensitive showing visible
   toolkit: gtk
+  window-type: dialog
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/combos.txt b/testsuite/a11y/combos.txt
index faf79a2e0d..bae1ac17da 100644
--- a/testsuite/a11y/combos.txt
+++ b/testsuite/a11y/combos.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/entries.txt b/testsuite/a11y/entries.txt
index 244451786f..7540854ae9 100644
--- a/testsuite/a11y/entries.txt
+++ b/testsuite/a11y/entries.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/expander.txt b/testsuite/a11y/expander.txt
index 6a589b822f..1eb96f1a78 100644
--- a/testsuite/a11y/expander.txt
+++ b/testsuite/a11y/expander.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/headerbar.txt b/testsuite/a11y/headerbar.txt
index f7b6ffc9e1..1905c05131 100644
--- a/testsuite/a11y/headerbar.txt
+++ b/testsuite/a11y/headerbar.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/hello-world.txt b/testsuite/a11y/hello-world.txt
index d20b0eb045..76119e2099 100644
--- a/testsuite/a11y/hello-world.txt
+++ b/testsuite/a11y/hello-world.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/iconview.txt b/testsuite/a11y/iconview.txt
index c71c8e0e80..eebac50f42 100644
--- a/testsuite/a11y/iconview.txt
+++ b/testsuite/a11y/iconview.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/infobar.txt b/testsuite/a11y/infobar.txt
index 47dedcda66..b8d4c7e725 100644
--- a/testsuite/a11y/infobar.txt
+++ b/testsuite/a11y/infobar.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/label.txt b/testsuite/a11y/label.txt
index 972c358bf0..8beda597d2 100644
--- a/testsuite/a11y/label.txt
+++ b/testsuite/a11y/label.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/link.txt b/testsuite/a11y/link.txt
index 336f398675..dcd795b596 100644
--- a/testsuite/a11y/link.txt
+++ b/testsuite/a11y/link.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/listbox.txt b/testsuite/a11y/listbox.txt
index c028e161b3..366d3341e6 100644
--- a/testsuite/a11y/listbox.txt
+++ b/testsuite/a11y/listbox.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/lockbutton.txt b/testsuite/a11y/lockbutton.txt
index 932e922c7a..fef97f64a6 100644
--- a/testsuite/a11y/lockbutton.txt
+++ b/testsuite/a11y/lockbutton.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/menu.txt b/testsuite/a11y/menu.txt
index 315fd91bd2..3f5ba0d9d3 100644
--- a/testsuite/a11y/menu.txt
+++ b/testsuite/a11y/menu.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/menubutton.txt b/testsuite/a11y/menubutton.txt
index 27a20fdabc..9bd6f3e2cb 100644
--- a/testsuite/a11y/menubutton.txt
+++ b/testsuite/a11y/menubutton.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt
index 5152943581..e33a449731 100644
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
index 5152943581..e33a449731 100644
--- a/testsuite/a11y/menubutton3.txt
+++ b/testsuite/a11y/menubutton3.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/menus.txt b/testsuite/a11y/menus.txt
index c901c29886..f108cd0d39 100644
--- a/testsuite/a11y/menus.txt
+++ b/testsuite/a11y/menus.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/messagedialog.txt b/testsuite/a11y/messagedialog.txt
index 0c34ab0c03..af5abf792e 100644
--- a/testsuite/a11y/messagedialog.txt
+++ b/testsuite/a11y/messagedialog.txt
@@ -4,6 +4,7 @@ window1
   name: Information
   state: enabled sensitive showing visible
   toolkit: gtk
+  window-type: dialog
   <AtkComponent>
   layer: window
   alpha: 1
@@ -88,7 +89,7 @@ window1
           parent: message_area
           index: 0
           name: Information
-          state: enabled focusable multi-line sensitive showing visible
+          state: enabled multi-line sensitive showing visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
@@ -96,8 +97,7 @@ window1
           <AtkText>
           text: Information
           character count: 11
-          caret offset: 11
-          selection 0: (0, 11) Information
+          caret offset: 0
           default attributes: bg-color: <omitted>
                               bg-full-height: 0
                               direction: <omitted>
@@ -129,7 +129,7 @@ window1
           parent: message_area
           index: 1
           name: More Information
-          state: enabled focusable multi-line sensitive showing visible
+          state: enabled multi-line sensitive showing visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
diff --git a/testsuite/a11y/mnemonic.txt b/testsuite/a11y/mnemonic.txt
index 0a247c1234..445698d4a7 100644
--- a/testsuite/a11y/mnemonic.txt
+++ b/testsuite/a11y/mnemonic.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/notebook.txt b/testsuite/a11y/notebook.txt
index fd805c97c4..7cdd28ec0c 100644
--- a/testsuite/a11y/notebook.txt
+++ b/testsuite/a11y/notebook.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/paned.txt b/testsuite/a11y/paned.txt
index 9c6bff0f42..5668d0a08a 100644
--- a/testsuite/a11y/paned.txt
+++ b/testsuite/a11y/paned.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/pickers.txt b/testsuite/a11y/pickers.txt
index 6258cddfae..d04beb2020 100644
--- a/testsuite/a11y/pickers.txt
+++ b/testsuite/a11y/pickers.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/placeholder-text.txt b/testsuite/a11y/placeholder-text.txt
index 4ac8e1ed35..8079c61f03 100644
--- a/testsuite/a11y/placeholder-text.txt
+++ b/testsuite/a11y/placeholder-text.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/progress.txt b/testsuite/a11y/progress.txt
index bd87ad3d4d..fa41710701 100644
--- a/testsuite/a11y/progress.txt
+++ b/testsuite/a11y/progress.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/range.txt b/testsuite/a11y/range.txt
index 3bc37da73c..fdb5972314 100644
--- a/testsuite/a11y/range.txt
+++ b/testsuite/a11y/range.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/scale-drawvalue.txt b/testsuite/a11y/scale-drawvalue.txt
index 08666e9d3d..3467462c5e 100644
--- a/testsuite/a11y/scale-drawvalue.txt
+++ b/testsuite/a11y/scale-drawvalue.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/spinner.txt b/testsuite/a11y/spinner.txt
index a4d17851e0..31bc6cdd27 100644
--- a/testsuite/a11y/spinner.txt
+++ b/testsuite/a11y/spinner.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/stack.txt b/testsuite/a11y/stack.txt
index cb0226d4ff..89ac76ee79 100644
--- a/testsuite/a11y/stack.txt
+++ b/testsuite/a11y/stack.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/statusbar.txt b/testsuite/a11y/statusbar.txt
index f98fc9aed2..05d47db20c 100644
--- a/testsuite/a11y/statusbar.txt
+++ b/testsuite/a11y/statusbar.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/text.txt b/testsuite/a11y/text.txt
index a90741d98f..d64f85004d 100644
--- a/testsuite/a11y/text.txt
+++ b/testsuite/a11y/text.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/tooltips.txt b/testsuite/a11y/tooltips.txt
index e1bc6b8ab4..2b250e6cf7 100644
--- a/testsuite/a11y/tooltips.txt
+++ b/testsuite/a11y/tooltips.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1
diff --git a/testsuite/a11y/tree.txt b/testsuite/a11y/tree.txt
index 5633a6d0c7..4b0bb681db 100644
--- a/testsuite/a11y/tree.txt
+++ b/testsuite/a11y/tree.txt
@@ -3,6 +3,7 @@ window1
   index: 0
   state: enabled resizable sensitive showing visible
   toolkit: gtk
+  window-type: normal
   <AtkComponent>
   layer: window
   alpha: 1