a11y tests: Ignore "active" flag on toplevel

All the a11y tests were failing for me with a window state diff
like this:

-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible

I guess the windows in the CI always gets the focus, but not when
I run it here. Generally focus seems asynchronous and hard to rely
on so I just made the test ignore the active state on toplevels.

diff --git a/testsuite/a11y/about.txt b/testsuite/a11y/about.txt
index bc6376c11bf9a28dc5b5a19c2959203088caf38b..6fccc8c8aa3c4d258bb36fd63b9dcf23bba74dad 100644 (file)
--- a/testsuite/a11y/about.txt
+++ b/testsuite/a11y/about.txt
@@ -2,7 +2,7 @@ window1
   "dialog"
   index: 0
   name: About FancyPants
-  state: active enabled sensitive showing visible
+  state: enabled sensitive showing visible
   toolkit: gtk
   window-type: dialog
   <AtkComponent>

diff --git a/testsuite/a11y/accessibility-dump.c b/testsuite/a11y/accessibility-dump.c
index 96da1af98b3955f2c9a042f816ba6d27a7e3820d..70d31d5f0445faf47ab6f2131975f0b129f9349e 100644 (file)
--- a/testsuite/a11y/accessibility-dump.c
+++ b/testsuite/a11y/accessibility-dump.c
@@ -188,7 +188,8 @@ dump_relation_set (GString        *string,
 }
 
 static void
-dump_state_set (GString     *string,
+dump_state_set (AtkObject   *accessible,
+                GString     *string,
                 guint        depth,
                 AtkStateSet *set)
 {
@@ -202,6 +203,10 @@ dump_state_set (GString     *string,
       g_string_append_printf (string, "%*sstate:", depth, "");
       for (i = 0; i < ATK_STATE_LAST_DEFINED; i++)
         {
+          /* The toplevel active state depends on focus interaction with the WM, so lets ignore it */
+          if (ATK_IS_WINDOW (accessible) && i == ATK_STATE_ACTIVE)
+            continue;
+
           if (atk_state_set_contains_state (set, i))
             g_string_append_printf (string, " %s", atk_state_type_get_name (i));
         }
@@ -694,7 +699,7 @@ dump_accessible (AtkObject     *accessible,
   if (atk_object_get_description (accessible))
     g_string_append_printf (string, "%*sdescription: %s\n", depth, "", atk_object_get_description (accessible));
   dump_relation_set (string, depth, atk_object_ref_relation_set (accessible));
-  dump_state_set (string, depth, atk_object_ref_state_set (accessible));
+  dump_state_set (accessible, string, depth, atk_object_ref_state_set (accessible));
   dump_attribute_set (string, depth, atk_object_get_attributes (accessible));
 
   if (ATK_IS_COMPONENT (accessible))

diff --git a/testsuite/a11y/accessible-name.txt b/testsuite/a11y/accessible-name.txt
index f2274db1e58f6b4b1647d27cb47af11be3d885b9..fbbeabafee63e06e124791740033641e60eafa3c 100644 (file)
--- a/testsuite/a11y/accessible-name.txt
+++ b/testsuite/a11y/accessible-name.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/actionbar.txt b/testsuite/a11y/actionbar.txt
index abd273cb1c2a560e97a1f58106b3f0cc12249819..5fec7b6a2fb06fa044485e96495d32298faeef31 100644 (file)
--- a/testsuite/a11y/actionbar.txt
+++ b/testsuite/a11y/actionbar.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/buttons.txt b/testsuite/a11y/buttons.txt
index 80a1da91b4863405bf2943ed7555940a096b4f85..3f9811a23f00c47d8beceaf1e3dc50d528b384ab 100644 (file)
--- a/testsuite/a11y/buttons.txt
+++ b/testsuite/a11y/buttons.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/calendar.txt b/testsuite/a11y/calendar.txt
index f9e6a18c3b9d5f9bd4ad5fde0bfcaa98bd49406d..5f80dc7c7891f890aa3eedac33b7bfd487e8c60d 100644 (file)
--- a/testsuite/a11y/calendar.txt
+++ b/testsuite/a11y/calendar.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index e8ed90ea87fc41fd8a7ae0e007a110e8bd735fc5..e18dae502aec069dc8fe9368d615b262a86a7c9a 100644 (file)
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -2,7 +2,7 @@ window1
   "dialog"
   index: 0
   name: Select a Color
-  state: active enabled sensitive showing visible
+  state: enabled sensitive showing visible
   toolkit: gtk
   window-type: dialog
   <AtkComponent>

diff --git a/testsuite/a11y/combos.txt b/testsuite/a11y/combos.txt
index 875b4beb07bc200107b063e21cc92fe1fbd5134c..be2e8e04dd34c7e3a5de69749313cb91d216f60f 100644 (file)
--- a/testsuite/a11y/combos.txt
+++ b/testsuite/a11y/combos.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/entries.txt b/testsuite/a11y/entries.txt
index 1e332697a4062f389459ea2a89de6bcd736690ae..d94dc9a95670fc058e03fa38441053d5973e2d57 100644 (file)
--- a/testsuite/a11y/entries.txt
+++ b/testsuite/a11y/entries.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/expander.txt b/testsuite/a11y/expander.txt
index 863c4ea4f41a5a77edd5a74cfb8f9b16365fe5f1..07ca46e6fbb66aa4b9e9c323e77e8604ae6b8eac 100644 (file)
--- a/testsuite/a11y/expander.txt
+++ b/testsuite/a11y/expander.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/headerbar.txt b/testsuite/a11y/headerbar.txt
index 6a933d01100934f2ffb5fc6b15b2bf5425e14dcb..a0dffd43f1bfb7f22689433777710713179b621b 100644 (file)
--- a/testsuite/a11y/headerbar.txt
+++ b/testsuite/a11y/headerbar.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/hello-world.txt b/testsuite/a11y/hello-world.txt
index a3816eda2e24e4dfe54ad8546a6bd690f26339da..b9d478e88a3468e40f998f6f5682fa2fc27df517 100644 (file)
--- a/testsuite/a11y/hello-world.txt
+++ b/testsuite/a11y/hello-world.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/iconview.txt b/testsuite/a11y/iconview.txt
index 760937982f6a9ca48d02c8c41336bf63f521e4fb..98a6acad822cd13e6e7f1adf95bc908bb3b5bcae 100644 (file)
--- a/testsuite/a11y/iconview.txt
+++ b/testsuite/a11y/iconview.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/label-static.txt b/testsuite/a11y/label-static.txt
index 885522437c8d0f48066eab6579ab74fc66486a40..3b9eb4ba04f4d9b34d94849984cfa1b7287355eb 100644 (file)
--- a/testsuite/a11y/label-static.txt
+++ b/testsuite/a11y/label-static.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/label.txt b/testsuite/a11y/label.txt
index 8f3e2e74b5928cf729d251504070869d5c253243..a8669ada2713f214ccf6236a9aa02712a12188dd 100644 (file)
--- a/testsuite/a11y/label.txt
+++ b/testsuite/a11y/label.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/link.txt b/testsuite/a11y/link.txt
index 4d8ff1ad7eac3cc9cef7895784f5024bad644429..37ddff5a05162a4cc53d3f6f90f0e7ab14be4982 100644 (file)
--- a/testsuite/a11y/link.txt
+++ b/testsuite/a11y/link.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/listbox.txt b/testsuite/a11y/listbox.txt
index ceeff350aa4d42db2b52de8fc92b13b1868bac28..f69b812c80119fd94015417b7eda8e8f5484318c 100644 (file)
--- a/testsuite/a11y/listbox.txt
+++ b/testsuite/a11y/listbox.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/lockbutton.txt b/testsuite/a11y/lockbutton.txt
index b8968cd386608e7c70428ff0bfd724c04701f5e9..d3bc1636220fc0de8c01d5243ab73ce879ce48c0 100644 (file)
--- a/testsuite/a11y/lockbutton.txt
+++ b/testsuite/a11y/lockbutton.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/menubutton.txt b/testsuite/a11y/menubutton.txt
index 6d4cf5445d0ed460db01eca574294cadea2bf333..59c99901ad880e88104a2b5b743e2231f57f8b80 100644 (file)
--- a/testsuite/a11y/menubutton.txt
+++ b/testsuite/a11y/menubutton.txt
@@ -1,7 +1,7 @@
 window1
   "frame"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt
index e6e16e5b8c47e4a856b35b2fb73e8a74f4539407..ec6956665bd88e23c409f09a964570e5de41eed3 100644 (file)
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -1,7 +1,7 @@
 window1
   "frame"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
index e6e16e5b8c47e4a856b35b2fb73e8a74f4539407..ec6956665bd88e23c409f09a964570e5de41eed3 100644 (file)
--- a/testsuite/a11y/menubutton3.txt
+++ b/testsuite/a11y/menubutton3.txt
@@ -1,7 +1,7 @@
 window1
   "frame"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/mnemonic.txt b/testsuite/a11y/mnemonic.txt
index 45906ef0eb331e10c7a21118bc49eaab416438ee..ca96c5d50b3d46143153461f94e234a90eb27daa 100644 (file)
--- a/testsuite/a11y/mnemonic.txt
+++ b/testsuite/a11y/mnemonic.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/notebook.txt b/testsuite/a11y/notebook.txt
index d2e50bf0620c47485387d0178ad23fbc7d938109..5151cea46c9c0cc043d8ff39dbba8f7e183177bf 100644 (file)
--- a/testsuite/a11y/notebook.txt
+++ b/testsuite/a11y/notebook.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/pickers.txt b/testsuite/a11y/pickers.txt
index f6971e5bf23d6ce9bffc421e5d22394f914a3b5b..7f457e374a95131bf9ab450279ea0d0b88e6d910 100644 (file)
--- a/testsuite/a11y/pickers.txt
+++ b/testsuite/a11y/pickers.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/placeholder-text.txt b/testsuite/a11y/placeholder-text.txt
index e24f5fb8d02a284819b3048c1193851d445ae3c3..c264ae31d0bdcdf04a184ad7f310aaf424297a5f 100644 (file)
--- a/testsuite/a11y/placeholder-text.txt
+++ b/testsuite/a11y/placeholder-text.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/range.txt b/testsuite/a11y/range.txt
index e044e08dc819eacb32df93704ecfaa7d56b5df4c..68acf81aed3aca9f3010a5712f785fff73f972cb 100644 (file)
--- a/testsuite/a11y/range.txt
+++ b/testsuite/a11y/range.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/scale-drawvalue.txt b/testsuite/a11y/scale-drawvalue.txt
index c0f99154708cfdbe3d2be80b9bbbb17fbe55c71c..21877a4601daa20fc486d10617bbb0b3b366bdaf 100644 (file)
--- a/testsuite/a11y/scale-drawvalue.txt
+++ b/testsuite/a11y/scale-drawvalue.txt
@@ -1,7 +1,7 @@
 window1
   "frame"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/stack.txt b/testsuite/a11y/stack.txt
index 5d41385ccd918c2d7ffb95f3ad26f06a22074e18..dfb48d43e7a6b03bd91d864cd32d0ad6999d14b8 100644 (file)
--- a/testsuite/a11y/stack.txt
+++ b/testsuite/a11y/stack.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/text.txt b/testsuite/a11y/text.txt
index f873df4a99e729b4f00b2d5f4dcbdb2f01095460..771787e00da3e8d727cb9bffe14ed2e3e477f521 100644 (file)
--- a/testsuite/a11y/text.txt
+++ b/testsuite/a11y/text.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/tooltips.txt b/testsuite/a11y/tooltips.txt
index d351486336ae2b503978cad61492ce8fab590ff2..cee7fd7cdda59d79941c3ece4e3c7705eb958368 100644 (file)
--- a/testsuite/a11y/tooltips.txt
+++ b/testsuite/a11y/tooltips.txt
@@ -1,7 +1,7 @@
 window1
   "frame"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>

diff --git a/testsuite/a11y/tree.txt b/testsuite/a11y/tree.txt
index 99dec067c49e05c044197ddc4dbe124ea664fb20..2a02b530831ae55dfa82d574e9338c38d13fcdc6 100644 (file)
--- a/testsuite/a11y/tree.txt
+++ b/testsuite/a11y/tree.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  state: active enabled resizable sensitive showing visible
+  state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>