[pitivi] dogtail tests: Update test_effects to match the new effects library UI

[Jean-FranÃois Fortin Tam <jfft src gnome org>]

commit 87d606314c27d1796a5bc6d1d039d75fb5b70408
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Fri Oct 19 13:50:50 2012 -0400

    dogtail tests: Update test_effects to match the new effects library UI

 data/ui/effectslibrary.ui             |   28 ++++++++++++++++++++--------
 tests/dogtail_scripts/test_effects.py |   16 +++++++---------
 2 files changed, 27 insertions(+), 17 deletions(-)
---
diff --git a/data/ui/effectslibrary.ui b/data/ui/effectslibrary.ui
index 693d0c4..3f35a44 100644
--- a/data/ui/effectslibrary.ui
+++ b/data/ui/effectslibrary.ui
@@ -8,14 +8,17 @@
     <property name="icon_size">1</property>
     <child>
       <object class="GtkToggleToolButton" id="video_togglebutton">
-        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="tooltip_text" translatable="yes">Show video effects</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="icon_name">video-x-generic</property>
         <property name="active">True</property>
+        <child internal-child="accessible">
+          <object class="AtkObject" id="video_togglebutton-atkobject">
+            <property name="AtkObject::accessible-name">effects library video togglebutton</property>
+          </object>
+        </child>
         <signal name="toggled" handler="_toggleViewTypeCb" swapped="no"/>
       </object>
       <packing>
@@ -25,13 +28,16 @@
     </child>
     <child>
       <object class="GtkToggleToolButton" id="audio_togglebutton">
-        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="tooltip_text" translatable="yes">Show audio effects</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="icon_name">audio-x-generic</property>
+        <child internal-child="accessible">
+          <object class="AtkObject" id="audio_togglebutton-atkobject">
+            <property name="AtkObject::accessible-name">effects library audio togglebutton</property>
+          </object>
+        </child>
         <signal name="toggled" handler="_toggleViewTypeCb" swapped="no"/>
       </object>
       <packing>
@@ -41,16 +47,19 @@
     </child>
     <child>
       <object class="GtkToolItem" id="toolbutton1">
-        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <child>
           <object class="GtkComboBoxText" id="categories">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="entry_text_column">0</property>
             <property name="id_column">1</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="categories-atkobject">
+                <property name="AtkObject::accessible-name">effect category combobox</property>
+              </object>
+            </child>
             <signal name="changed" handler="_categoryChangedCb" swapped="no"/>
           </object>
         </child>
@@ -62,10 +71,8 @@
     </child>
     <child>
       <object class="GtkToolItem" id="toolbutton7">
-        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <child>
           <object class="GtkEntry" id="search_entry">
             <property name="visible">True</property>
@@ -78,6 +85,11 @@
             <property name="secondary_icon_tooltip_text" translatable="yes">Clear the current search</property>
             <property name="secondary_icon_tooltip_markup" translatable="yes">Clear the current search</property>
             <property name="placeholder_text">Search...</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="search_entry-atkobject">
+                <property name="AtkObject::accessible-name">effects library search entry</property>
+              </object>
+            </child>
             <signal name="changed" handler="_searchEntryChangedCb" swapped="no"/>
             <signal name="focus-in-event" handler="_searchEntryFocusedCb" swapped="no"/>
             <signal name="focus-out-event" handler="_searchEntryDefocusedCb" swapped="no"/>
diff --git a/tests/dogtail_scripts/test_effects.py b/tests/dogtail_scripts/test_effects.py
index b684fed..e22c646 100644
--- a/tests/dogtail_scripts/test_effects.py
+++ b/tests/dogtail_scripts/test_effects.py
@@ -10,23 +10,22 @@ class EffectLibraryTest(HelpFunc):
         self.import_media()
         tab = self.effectslibrary
         tab.click()
-        search = tab.textentry("")
+        search = tab.child(name="effects library search entry")
         view = tab.child(roleName="table")
-        combotypes = tab.child(name="All effects", roleName="combo box")
+        combotypes = tab.child(name="effect category combobox", roleName="combo box")
         # Some test of video effects and search. The two column headers are
         # also children and are always present, and each row has two children:
         search.text = "Crop"
         self.assertEqual(len(view.children), 2 + 2 * 3)
         combotypes.click()
-        tab.menuItem("Colors").click()
+        combotypes.menuItem("Colors").click()
         self.assertEqual(len(view.children), 2 + 2 * 0)
         combotypes.click()
-        tab.menuItem("Geometry").click()
+        combotypes.menuItem("Geometry").click()
         self.assertEqual(len(view.children), 2 + 2 * 3)
 
-        #Audio effects
-        tab.child(name="Video effects", roleName="combo box").click()
-        tab.menuItem("Audio effects").click()
+        # Switch to audio effects view
+        tab.child(name="effects library audio togglebutton").click()
         search.text = "Equa"
         #Titles plus 3 plugins, two collumns = 8
         self.assertEqual(len(tab.child(roleName="table").children), 8)
@@ -59,8 +58,7 @@ class EffectLibraryTest(HelpFunc):
         self.assertEqual(len(table.children), 9)
 
         #Drag audio effect on the clip
-        tab.child(name="Video effects", roleName="combo box").click()
-        tab.menuItem("Audio effects").click()
+        tab.child(name="effects library audio togglebutton").click()
         effect = self.search_by_regex("^Amplifier", tab, roleName="table cell")
         self.improved_drag(center(effect), clippos)
         self.assertEqual(len(table.children), 12)