From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 6 Feb 2020 22:12:34 +0000 (-0500)
Subject: testsuite: Clean up a11y menu tests
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~84^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=048effdc5a3beac45d07dd598d72af5fd5d19fa9;p=gtk4.git

testsuite: Clean up a11y menu tests

We don't need some of the tests anymore, since
we just have popovers now.
---

diff --git a/testsuite/a11y/menubutton.txt b/testsuite/a11y/menubutton.txt
index 59c99901ad..ec6956665b 100644
--- a/testsuite/a11y/menubutton.txt
+++ b/testsuite/a11y/menubutton.txt
@@ -25,16 +25,3 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    imagemenuitem
-      "menu item"
-      parent: menu
-      index: 0
-      state: enabled selectable sensitive visible
-      toolkit: gtk
-      <AtkComponent>
-      layer: popup
-      alpha: 1
-      <AtkAction>
-      action 0 name: click
-      action 0 description: Clicks the menuitem
-      <AtkSelection>
diff --git a/testsuite/a11y/menubutton.ui b/testsuite/a11y/menubutton.ui
index eb7d509d73..c48c253b29 100644
--- a/testsuite/a11y/menubutton.ui
+++ b/testsuite/a11y/menubutton.ui
@@ -2,11 +2,9 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkPopover" id="menu">
-    <property name="visible">True</property>
     <child>
       <object class="GtkButton" id="button">
         <property name="label" translatable="yes">_New</property>
-        <property name="visible">True</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -15,9 +13,8 @@
     <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuButton" id="menubutton">
-        <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="popup">menu</property>
+        <property name="popover">menu</property>
       </object>
     </child>
   </object>
diff --git a/testsuite/a11y/menubutton2.ui b/testsuite/a11y/menubutton2.ui
index 30f6a82737..97c31b11ae 100644
--- a/testsuite/a11y/menubutton2.ui
+++ b/testsuite/a11y/menubutton2.ui
@@ -12,7 +12,6 @@
     <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuButton" id="menubutton">
-        <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="menu-model">menu</property>
       </object>
diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
deleted file mode 100644
index ec6956665b..0000000000
--- a/testsuite/a11y/menubutton3.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-window1
-  "frame"
-  index: 0
-  state: enabled resizable sensitive showing visible
-  toolkit: gtk
-  window-type: normal
-  <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
-    index: 0
-    name: Menu
-    state: enabled focusable focused sensitive showing visible
-    toolkit: gtk
-    <AtkComponent>
-    layer: widget
-    alpha: 1
diff --git a/testsuite/a11y/menubutton3.ui b/testsuite/a11y/menubutton3.ui
deleted file mode 100644
index 30f6a82737..0000000000
--- a/testsuite/a11y/menubutton3.ui
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <menu id="menu">
-    <section>
-      <item>
-        <attribute name="label">New</attribute>
-      </item>
-    </section>
-  </menu>
-  <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuButton" id="menubutton">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="menu-model">menu</property>
-      </object>
-    </child>
-  </object>
-</interface>
diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
index 6df0b25b2f..b782f45dc0 100644
--- a/testsuite/a11y/meson.build
+++ b/testsuite/a11y/meson.build
@@ -2,43 +2,41 @@ testexecdir = join_paths(installed_test_bindir, 'a11y')
 testdatadir = join_paths(installed_test_datadir, 'a11y')
 
 a11y_state_tests = [
-  'hello-world',
-  'mnemonic',
+  'about',
   'accessible-name',
-  'notebook',
-  'range',
-  'link',
-  'text',
+  'actionbar',
+  'assistant',
   'buttons',
+  'calendar',
   'colorchooser',
-  'about',
-  'messagedialog',
+  'combos',
+  'entries',
   'expander',
-  'assistant',
-  'pickers',
+  'headerbar',
+  'hello-world',
+  'iconview',
+  'infobar',
   'label',
+  'link',
+  'listbox',
   'lockbutton',
-  'spinner',
-  'progress',
-  'infobar',
-  'calendar',
-  'statusbar',
-  'paned',
-  'iconview',
-  'entries',
-  'scale-drawvalue',
-  'placeholder-text',
-  'menu',
   'menubutton',
   'menubutton2',
-  'menubutton3',
-  'combos',
-  'listbox',
+  'messagedialog',
+  'mnemonic',
+  'notebook',
+  'paned',
+  'pickers',
+  'placeholder-text',
+  'progress',
+  'range',
+  'scale-drawvalue',
+  'spinner',
+  'statusbar',
   'stack',
-  'headerbar',
-  'tree',
-  'actionbar',
+  'text',
   'tooltips',
+  'tree',
 ]
 
 a11y_dump_bin = executable('accessibility-dump',
@@ -111,80 +109,41 @@ a11y_installed_tests = [
 ]
 
 installed_test_data = [
-  'hello-world.ui',
-  'hello-world.txt',
-  'mnemonic.ui',
-  'mnemonic.txt',
-  'accessible-name.ui',
-  'accessible-name.txt',
-  'notebook.ui',
-  'notebook.txt',
-  'range.ui',
-  'range.txt',
-  'link.ui',
-  'link.txt',
-  'text.ui',
-  'text.txt',
-  'buttons.ui',
-  'buttons.txt',
-  'colorchooser.ui',
-  'colorchooser.txt',
-  'about.ui',
-  'about.txt',
-  'messagedialog.ui',
-  'messagedialog.txt',
-  'expander.ui',
-  'expander.txt',
-  'assistant.ui',
-  'assistant.txt',
-  'pickers.ui',
-  'pickers.txt',
-  'label.ui',
-  'label.txt',
-  'lockbutton.ui',
-  'lockbutton.txt',
-  'spinner.ui',
-  'spinner.txt',
-  'progress.ui',
-  'progress.txt',
-  'infobar.ui',
-  'infobar.txt',
-  'calendar.ui',
-  'calendar.txt',
-  'statusbar.ui',
-  'statusbar.txt',
-  'paned.ui',
-  'paned.txt',
-  'iconview.ui',
-  'iconview.txt',
-  'entries.ui',
-  'entries.txt',
-  'scale-drawvalue.ui',
-  'scale-drawvalue.txt',
-  'placeholder-text.ui',
-  'placeholder-text.txt',
-  'menu.ui',
-  'menu.txt',
-  'menubutton.ui',
-  'menubutton.txt',
-  'menubutton2.ui',
-  'menubutton2.txt',
-  'menubutton3.ui',
-  'menubutton3.txt',
-  'combos.ui',
-  'combos.txt',
-  'listbox.ui',
-  'listbox.txt',
-  'stack.ui',
-  'stack.txt',
-  'headerbar.ui',
-  'headerbar.txt',
-  'tree.ui',
-  'tree.txt',
-  'actionbar.ui',
-  'actionbar.txt',
-  'tooltips.ui',
-  'tooltips.txt',
+  'about.ui',             'about.txt',
+  'accessible-name.ui',   'accessible-name.txt',
+  'actionbar.ui',         'actionbar.txt',
+  'assistant.ui',         'assistant.txt',
+  'buttons.ui',           'buttons.txt',
+  'calendar.ui',          'calendar.txt',
+  'colorchooser.ui',      'colorchooser.txt',
+  'combos.ui',            'combos.txt',
+  'entries.ui',           'entries.txt',
+  'expander.ui',          'expander.txt',
+  'headerbar.ui',         'headerbar.txt',
+  'hello-world.ui',       'hello-world.txt',
+  'iconview.ui',          'iconview.txt',
+  'infobar.ui',           'infobar.txt',
+  'label.ui',             'label.txt',
+  'link.ui',              'link.txt',
+  'listbox.ui',           'listbox.txt',
+  'lockbutton.ui',        'lockbutton.txt',
+  'menubutton.ui',        'menubutton.txt',
+  'menubutton2.ui',       'menubutton2.txt',
+  'messagedialog.ui',     'messagedialog.txt',
+  'mnemonic.ui',          'mnemonic.txt',
+  'notebook.ui',          'notebook.txt',
+  'paned.ui',             'paned.txt',
+  'pickers.ui',           'pickers.txt',
+  'placeholder-text.ui',  'placeholder-text.txt',
+  'progress.ui',          'progress.txt',
+  'range.ui',             'range.txt',
+  'scale-drawvalue.ui',   'scale-drawvalue.txt',
+  'spinner.ui',           'spinner.txt',
+  'stack.ui',             'stack.txt',
+  'statusbar.ui',         'statusbar.txt',
+  'text.ui',              'text.txt',
+  'tooltips.ui',          'tooltips.txt',
+  'tree.ui',              'tree.txt',
 ]
 
 if get_option('install-tests')