GNOME.org
 

[pitivi] Fix Dogtail scripts by partially reverting commit e6e84d9

commit 9e2aea5fbc33076dea0e964c680f00cb71e506f9
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Wed Oct 17 20:11:16 2012 -0400

    Fix Dogtail scripts by partially reverting commit e6e84d9
    
    The calls to dogtail's "child" method were mangled by a conversion script.

 tests/dogtail_scripts/helper_functions.py          |   34 ++++++------
 tests/dogtail_scripts/test_base.py                 |    4 +-
 tests/dogtail_scripts/test_clipproperties.py       |   50 +++++++++---------
 .../dogtail_scripts/test_dialogs_clipmediaprops.py |   14 +++---
 tests/dogtail_scripts/test_dialogs_prefs.py        |   32 ++++++------
 .../dogtail_scripts/test_dialogs_startupwizard.py  |    8 ++--
 tests/dogtail_scripts/test_effects.py              |   20 ++++----
 tests/dogtail_scripts/test_medialibrary.py         |    2 +-
 tests/dogtail_scripts/test_project.py              |   54 ++++++++++----------
 tests/dogtail_scripts/test_timeline.py             |   20 ++++----
 10 files changed, 119 insertions(+), 119 deletions(-)
---
diff --git a/tests/dogtail_scripts/helper_functions.py b/tests/dogtail_scripts/helper_functions.py
index 4b262fb..d9687ce 100644
--- a/tests/dogtail_scripts/helper_functions.py
+++ b/tests/dogtail_scripts/helper_functions.py
@@ -19,11 +19,11 @@ class HelpFunc(BaseDogTail):
         if saveAs:
             self.assertIsNotNone(path)
             proj_menu.menuItem("Save As...").click()
-            save_dialog = self.pitivi.get_child()(name="Save As...", roleName='dialog', recursive=False)
+            save_dialog = self.pitivi.child(name="Save As...", roleName='dialog', recursive=False)
             # In GTK3's file chooser, you can enter /tmp/foo.xptv directly
             # In GTK2 however, you must do it in two steps:
             path_dir, filename = os.path.split(path)
-            text_field = save_dialog.get_child()(roleName="text")
+            text_field = save_dialog.child(roleName="text")
             text_field.text = path_dir
             dogtail.rawinput.pressKey("Enter")
             sleep(0.15)
@@ -39,15 +39,15 @@ class HelpFunc(BaseDogTail):
         proj_menu = self.menubar.menu("Project")
         proj_menu.click()
         proj_menu.menuItem("Open...").click()
-        load = self.pitivi.get_child()(roleName='dialog', recursive=False)
-        load.get_child()(name="Type a file name", roleName="toggle button").click()
-        load.get_child()(roleName='text').text = url
+        load = self.pitivi.child(roleName='dialog', recursive=False)
+        load.child(name="Type a file name", roleName="toggle button").click()
+        load.child(roleName='text').text = url
         load.button('Open').click()
         # If an unsaved changes confirmation dialog shows up, deal with it
         if expect_unsaved_changes:
             # Simply try searching for the existence of the dialog's widgets
             # If it fails, dogtail will fail with a SearchError, which is fine
-            self.pitivi.get_child()(name="Close without saving", roleName="push button").click()
+            self.pitivi.child(name="Close without saving", roleName="push button").click()
 
     def search_by_text(self, text, parent, name=None, roleName=None):
         """
@@ -71,7 +71,7 @@ class HelpFunc(BaseDogTail):
     def insert_clip(self, icon, n=1):
         icon.select()
         lib = self.menubar.menu("Library")
-        insert = lib.get_child()("Insert at End of Timeline")
+        insert = lib.child("Insert at End of Timeline")
         for i in range(n):
             sleep(0.3)
             lib.click()
@@ -84,12 +84,12 @@ class HelpFunc(BaseDogTail):
         # Use the menus, as the main toolbar might be hidden
         lib_menu = self.menubar.menu("Library")
         lib_menu.click()
-        import_menu_item = lib_menu.get_child()("Import Files...")
+        import_menu_item = lib_menu.child("Import Files...")
         import_menu_item.click()
 
         # Force dogtail to look only one level deep, which is much faster
         # as it doesn't have to analyze the whole mainwindow.
-        import_dialog = self.pitivi.get_child()(name="Select One or More Files",
+        import_dialog = self.pitivi.child(name="Select One or More Files",
                                           roleName="dialog", recursive=False)
         # Instead of checking for the presence of the path text field and then
         # searching for the toggle button to enable it, use the fact that GTK's
@@ -98,7 +98,7 @@ class HelpFunc(BaseDogTail):
 
         filepath = os.path.realpath(__file__).split("dogtail_scripts/")[0]
         filepath += "samples/" + filename
-        import_dialog.get_child()(roleName='text').text = filepath
+        import_dialog.child(roleName='text').text = filepath
         dogtail.rawinput.pressKey("Enter")  # Don't search for the Add button
         sleep(0.6)
 
@@ -113,7 +113,7 @@ class HelpFunc(BaseDogTail):
                     return icon
             sleep(0.5)
         # Failure to find an icon might be because it is hidden due to a search
-        current_search_text = libtab.get_child()(roleName="text").text.lower()
+        current_search_text = libtab.child(roleName="text").text.lower()
         self.assertNotEqual(current_search_text, "")
         self.assertNotIn(filename.lower(), current_search_text)
         return None
@@ -123,15 +123,15 @@ class HelpFunc(BaseDogTail):
         # Use the menus, as the main toolbar might be hidden
         lib_menu = self.menubar.menu("Library")
         lib_menu.click()
-        import_menu_item = lib_menu.get_child()("Import Files...")
+        import_menu_item = lib_menu.child("Import Files...")
         import_menu_item.click()
 
         # Same performance hack as in the import_media method
-        import_dialog = self.pitivi.get_child()(name="Select One or More Files",
+        import_dialog = self.pitivi.child(name="Select One or More Files",
                                           roleName="dialog", recursive=False)
         dogtail.rawinput.pressKey("/")
         dir_path = os.path.realpath(__file__).split("dogtail_scripts/")[0] + "samples/"
-        import_dialog.get_child()(roleName='text').text = dir_path
+        import_dialog.child(roleName='text').text = dir_path
         dogtail.rawinput.pressKey("Enter")
 
         # We are now in the samples directory, select various items.
@@ -139,11 +139,11 @@ class HelpFunc(BaseDogTail):
         # row of the filechooser is always selected by default, we must not use
         # ctrl when selecting the first item of our list, in order to deselect.
         ctrl_code = dogtail.rawinput.keyNameToKeyCode("Control_L")
-        file_list = import_dialog.get_child()(name="Files", roleName="table")
+        file_list = import_dialog.child(name="Files", roleName="table")
         first = True
         for f in files:
             sleep(0.5)
-            file_list.get_child()(name=f).click()
+            file_list.child(name=f).click()
             if first:
                 registry.generateKeyboardEvent(ctrl_code, None, KEY_PRESS)
                 first = False
@@ -151,7 +151,7 @@ class HelpFunc(BaseDogTail):
         import_dialog.button('Add').click()
 
         libtab = self.pitivi.tab("Media Library")
-        current_search_text = libtab.get_child()(roleName="text").text.lower()
+        current_search_text = libtab.child(roleName="text").text.lower()
         if current_search_text != "":
             # Failure to find some icons might be because of search filtering.
             # The following avoids searching for files that can't be found.
diff --git a/tests/dogtail_scripts/test_base.py b/tests/dogtail_scripts/test_base.py
index bc7bd3d..305d33a 100644
--- a/tests/dogtail_scripts/test_base.py
+++ b/tests/dogtail_scripts/test_base.py
@@ -24,7 +24,7 @@ class BaseDogTail(unittest.TestCase):
         # making the tests take ages to start up.
         self.pid = run('bin/pitivi', dumb=False, appName="pitivi")
         self.pitivi = root.application('pitivi')
-        self.menubar = self.pitivi.get_child()(roleName='menu bar')
+        self.menubar = self.pitivi.child(roleName='menu bar')
         try:
             self.unlink
         except AttributeError:
@@ -36,7 +36,7 @@ class BaseDogTail(unittest.TestCase):
         else:
             proj_menu = self.menubar.menu("Project")
             proj_menu.click()
-            proj_menu.get_child()("Quit").click()
+            proj_menu.child("Quit").click()
         if clean:
             for filename in self.unlink:
                 try:
diff --git a/tests/dogtail_scripts/test_clipproperties.py b/tests/dogtail_scripts/test_clipproperties.py
index d29e2d3..53292ec 100644
--- a/tests/dogtail_scripts/test_clipproperties.py
+++ b/tests/dogtail_scripts/test_clipproperties.py
@@ -19,29 +19,29 @@ class ClipTransforamtionTest(HelpFunc):
 
         conftab = self.pitivi.tab("Clip configuration")
         conftab.click()
-        conftab.get_child()(name="Transformation", roleName="toggle button").click()
+        conftab.child(name="Transformation", roleName="toggle button").click()
         #Just try changing values
         #Test slider
-        slider = conftab.get_child()(roleName="slider")
+        slider = conftab.child(roleName="slider")
         self.assertEqual(slider.value, 1.0)
         slider.click()
         # Clicking in the middle of the slider will set it backwards to 0.9
         self.assertNotEqual(slider.value, 1.0)
 
         #Test position
-        spinb = conftab.get_child()(roleName="panel", name="Position").findChildren(GenericPredicate(roleName="spin button"))
+        spinb = conftab.child(roleName="panel", name="Position").findChildren(GenericPredicate(roleName="spin button"))
         self.assertEqual(len(spinb), 2)
         spinb[0].text = "0.3"
         spinb[1].text = "0.2"
 
         #Test size
-        spinb = conftab.get_child()(roleName="panel", name="Size").findChildren(GenericPredicate(roleName="spin button"))
+        spinb = conftab.child(roleName="panel", name="Size").findChildren(GenericPredicate(roleName="spin button"))
         self.assertEqual(len(spinb), 2)
         spinb[0].text = "0.4"
         spinb[1].text = "0.1"
 
         #Test crop
-        spinb = conftab.get_child()(roleName="panel", name="Crop").findChildren(GenericPredicate(roleName="spin button"))
+        spinb = conftab.child(roleName="panel", name="Crop").findChildren(GenericPredicate(roleName="spin button"))
         self.assertEqual(len(spinb), 4)
         spinb[0].text = "0.05"
         spinb[1].text = "0.12"
@@ -50,36 +50,36 @@ class ClipTransforamtionTest(HelpFunc):
 
         #Click second clip, look that settings not changed(not linked)
         dogtail.rawinput.click(clippos[1][0], clippos[1][1])
-        self.assertEqual(conftab.get_child()(roleName="slider").value, 1.0)
+        self.assertEqual(conftab.child(roleName="slider").value, 1.0)
 
         #Click back, look if settings saved
         dogtail.rawinput.click(clippos[0][0], clippos[0][1])
-        self.assertNotEqual(conftab.get_child()(roleName="slider").value, 1.0)
+        self.assertNotEqual(conftab.child(roleName="slider").value, 1.0)
 
-        self.assertNotNone(self.search_by_text("0.3", conftab.get_child()(roleName="panel", name="Position")))
-        self.assertNotNone(self.search_by_text("0.2", conftab.get_child()(roleName="panel", name="Position")))
+        self.assertNotNone(self.search_by_text("0.3", conftab.child(roleName="panel", name="Position")))
+        self.assertNotNone(self.search_by_text("0.2", conftab.child(roleName="panel", name="Position")))
 
-        self.assertNotNone(self.search_by_text("0.4", conftab.get_child()(roleName="panel", name="Size")))
-        self.assertNotNone(self.search_by_text("0.1", conftab.get_child()(roleName="panel", name="Size")))
+        self.assertNotNone(self.search_by_text("0.4", conftab.child(roleName="panel", name="Size")))
+        self.assertNotNone(self.search_by_text("0.1", conftab.child(roleName="panel", name="Size")))
 
-        self.assertNotNone(self.search_by_text("0.05", conftab.get_child()(roleName="panel", name="Crop")))
-        self.assertNotNone(self.search_by_text("0.12", conftab.get_child()(roleName="panel", name="Crop")))
-        self.assertNotNone(self.search_by_text("0.14", conftab.get_child()(roleName="panel", name="Crop")))
-        self.assertNotNone(self.search_by_text("0.07", conftab.get_child()(roleName="panel", name="Crop")))
+        self.assertNotNone(self.search_by_text("0.05", conftab.child(roleName="panel", name="Crop")))
+        self.assertNotNone(self.search_by_text("0.12", conftab.child(roleName="panel", name="Crop")))
+        self.assertNotNone(self.search_by_text("0.14", conftab.child(roleName="panel", name="Crop")))
+        self.assertNotNone(self.search_by_text("0.07", conftab.child(roleName="panel", name="Crop")))
 
         #Push clear
-        conftab.get_child()(roleName="scroll bar").value = 140
+        conftab.child(roleName="scroll bar").value = 140
         conftab.button("Clear")
 
-        self.assertEqual(conftab.get_child()(roleName="slider").value, 1.0)
+        self.assertEqual(conftab.child(roleName="slider").value, 1.0)
 
-        self.assertNone(self.search_by_text("0.3", conftab.get_child()(roleName="panel", name="Position")))
-        self.assertNone(self.search_by_text("0.2", conftab.get_child()(roleName="panel", name="Position")))
+        self.assertNone(self.search_by_text("0.3", conftab.child(roleName="panel", name="Position")))
+        self.assertNone(self.search_by_text("0.2", conftab.child(roleName="panel", name="Position")))
 
-        self.assertNone(self.search_by_text("0.4", conftab.get_child()(roleName="panel", name="Size")))
-        self.assertNone(self.search_by_text("0.1", conftab.get_child()(roleName="panel", name="Size")))
+        self.assertNone(self.search_by_text("0.4", conftab.child(roleName="panel", name="Size")))
+        self.assertNone(self.search_by_text("0.1", conftab.child(roleName="panel", name="Size")))
 
-        self.assertNone(self.search_by_text("0.05", conftab.get_child()(roleName="panel", name="Crop")))
-        self.assertNone(self.search_by_text("0.12", conftab.get_child()(roleName="panel", name="Crop")))
-        self.assertNone(self.search_by_text("0.14", conftab.get_child()(roleName="panel", name="Crop")))
-        self.assertNone(self.search_by_text("0.07", conftab.get_child()(roleName="panel", name="Crop")))
+        self.assertNone(self.search_by_text("0.05", conftab.child(roleName="panel", name="Crop")))
+        self.assertNone(self.search_by_text("0.12", conftab.child(roleName="panel", name="Crop")))
+        self.assertNone(self.search_by_text("0.14", conftab.child(roleName="panel", name="Crop")))
+        self.assertNone(self.search_by_text("0.07", conftab.child(roleName="panel", name="Crop")))
diff --git a/tests/dogtail_scripts/test_dialogs_clipmediaprops.py b/tests/dogtail_scripts/test_dialogs_clipmediaprops.py
index 8421623..3d2c2ef 100644
--- a/tests/dogtail_scripts/test_dialogs_clipmediaprops.py
+++ b/tests/dogtail_scripts/test_dialogs_clipmediaprops.py
@@ -12,14 +12,14 @@ class DialogsClipMediaPropsTest(HelpFunc):
         buttons[1].click()
 
         #Check if we have real info, can't check if in correct place.
-        dialog = self.pitivi.get_child()(name="Clip Properties", roleName="dialog", recursive=False)
+        dialog = self.pitivi.child(name="Clip Properties", roleName="dialog", recursive=False)
         labels = {"640", "480"}
         real_labels = set([])
         for label in dialog.findChildren(GenericPredicate(roleName="label")):
             real_labels.add(label.text)
         self.assertEqual(len(labels.difference(real_labels)), 0, "Not all info is displayed")
-        self.assertFalse(dialog.get_child()(name="Audio:", roleName="panel").showing)
-        dialog.get_child()(name="Cancel").click()
+        self.assertFalse(dialog.child(name="Audio:", roleName="panel").showing)
+        dialog.child(name="Cancel").click()
         sample.deselect()
 
         sample = self.import_media()
@@ -28,7 +28,7 @@ class DialogsClipMediaPropsTest(HelpFunc):
         self.menubar.menuItem("Clip Properties...").click()
 
         #Check if we have real info, can't check if in correct place.
-        dialog = self.pitivi.get_child()(name="Clip Properties", roleName="dialog", recursive=False)
+        dialog = self.pitivi.child(name="Clip Properties", roleName="dialog", recursive=False)
         labels = {"1280", "544", "23.976 fps", "Square", "Stereo", "48 KHz", "16 bit"}
         real_labels = set([])
         for label in dialog.findChildren(GenericPredicate(roleName="label")):
@@ -36,13 +36,13 @@ class DialogsClipMediaPropsTest(HelpFunc):
         self.assertEqual(len(labels.difference(real_labels)), 0, "Not all info is displayed")
 
         #Uncheck frame rate
-        dialog.get_child()(name="Frame rate:").click()
-        dialog.get_child()(name="Apply to project").click()
+        dialog.child(name="Frame rate:").click()
+        dialog.child(name="Apply to project").click()
 
         #Check if correctly applied
         self.menubar.menu("Edit").click()
         self.menubar.menuItem("Project Settings").click()
-        dialog = self.pitivi.get_child()(name="Project Settings", roleName="dialog", recursive=False)
+        dialog = self.pitivi.child(name="Project Settings", roleName="dialog", recursive=False)
 
         children = dialog.findChildren(IsATextEntryNamed(""))
         childtext = {}
diff --git a/tests/dogtail_scripts/test_dialogs_prefs.py b/tests/dogtail_scripts/test_dialogs_prefs.py
index 4316d46..dd1db81 100644
--- a/tests/dogtail_scripts/test_dialogs_prefs.py
+++ b/tests/dogtail_scripts/test_dialogs_prefs.py
@@ -10,17 +10,17 @@ class DialogsPreferencesTest(HelpFunc):
         dogtail.rawinput.pressKey("Esc")
         self.menubar.menu("Edit").click()
         self.menubar.menuItem("Preferences").click()
-        dialog = self.pitivi.get_child()(name="Preferences", roleName="dialog")
-        dialog.get_child()("Reset to Factory Settings", roleName="push button").click()
+        dialog = self.pitivi.child(name="Preferences", roleName="dialog")
+        dialog.child("Reset to Factory Settings", roleName="push button").click()
 
         # Set a different font
-        dialog.get_child()(name="Sans", roleName="label").click()
-        fontchooser = self.pitivi.get_child()(name="Pick a Font", roleName="fontchooser")
-        fontchooser.get_child()(name="Serif").click()
-        fontchooser.get_child()(name="OK", roleName="push button").click()
+        dialog.child(name="Sans", roleName="label").click()
+        fontchooser = self.pitivi.child(name="Pick a Font", roleName="fontchooser")
+        fontchooser.child(name="Serif").click()
+        fontchooser.child(name="OK", roleName="push button").click()
 
         # Set the thumbnail gap setting (or whatever the first spinbutton is)
-        foo = dialog.get_child()(roleName="spin button")
+        foo = dialog.child(roleName="spin button")
         # The following is quite silly. You *need* to focus the widget
         # before changing its text, otherwise GTK won't fire "changed" signals
         # when you click somewhere else (ex: the Close button) and it won't be
@@ -35,27 +35,27 @@ class DialogsPreferencesTest(HelpFunc):
         dogtail.rawinput.pressKey("Esc")
         self.menubar.menu("Edit").click()
         self.menubar.menuItem("Preferences").click()
-        dialog = self.pitivi.get_child()(name="Preferences", roleName="dialog")
+        dialog = self.pitivi.child(name="Preferences", roleName="dialog")
 
         # Check if the previous values were correctly saved
         # In the case of the font, just search if such an item exists:
         try:
-            dialog.get_child()(name="Serif", roleName="label")
+            dialog.child(name="Serif", roleName="label")
         except SearchError:
             self.fail("Font was not saved")
-        self.assertEqual(dialog.get_child()(roleName="spin button").text, "12")
+        self.assertEqual(dialog.child(roleName="spin button").text, "12")
 
         # Check the "revert to last user values" feature
-        foo = dialog.get_child()(roleName="spin button")
+        foo = dialog.child(roleName="spin button")
         foo.click()
         foo.text = ""  # Clear the text so we can type into it
         # Finish typeText with a \n so that the "changed" signals get fired
         # Otherwise the Revert button will not be made sensitive
         foo.typeText("888\n")
-        dialog.get_child()("Revert", roleName="push button").click()
-        self.assertEqual(dialog.get_child()(roleName="spin button").text, "12", "Spacing setting was not reverted")
+        dialog.child("Revert", roleName="push button").click()
+        self.assertEqual(dialog.child(roleName="spin button").text, "12", "Spacing setting was not reverted")
 
         # Check resetting to factory settings
-        dialog.get_child()("Reset to Factory Settings", roleName="push button").click()
-        dialog.get_child()(name="Sans", roleName="label")
-        self.assertEqual(dialog.get_child()(roleName="spin button").text, "5", "Resetting to factory defaults failed")
+        dialog.child("Reset to Factory Settings", roleName="push button").click()
+        dialog.child(name="Sans", roleName="label")
+        self.assertEqual(dialog.child(roleName="spin button").text, "5", "Resetting to factory defaults failed")
diff --git a/tests/dogtail_scripts/test_dialogs_startupwizard.py b/tests/dogtail_scripts/test_dialogs_startupwizard.py
index fbfdcde..d96ba12 100644
--- a/tests/dogtail_scripts/test_dialogs_startupwizard.py
+++ b/tests/dogtail_scripts/test_dialogs_startupwizard.py
@@ -7,13 +7,13 @@ class DialogsStartupWizardTest(HelpFunc):
     def test_welcome(self):
         filename = "test_project%i.xptv" % time()
         #Save project
-        self.pitivi.get_child()(name="New", roleName='push button').click()
-        self.pitivi.get_child()(name="OK", roleName="push button").click()
+        self.pitivi.child(name="New", roleName='push button').click()
+        self.pitivi.child(name="OK", roleName="push button").click()
         self.saveProject("/tmp/" + filename)
         sleep(1)
         #Hacky, but we need to open once more
         self.tearDown(clean=False)
         self.setUp()
-        welcome = self.pitivi.get_child()(name="Welcome", roleName="frame")
+        welcome = self.pitivi.child(name="Welcome", roleName="frame")
         #We expect that just saved project will be in welcome window
-        welcome.get_child()(name=filename)
+        welcome.child(name=filename)
diff --git a/tests/dogtail_scripts/test_effects.py b/tests/dogtail_scripts/test_effects.py
index 954f660..7a0adc3 100644
--- a/tests/dogtail_scripts/test_effects.py
+++ b/tests/dogtail_scripts/test_effects.py
@@ -10,8 +10,8 @@ class EffectLibraryTest(HelpFunc):
         tab = self.pitivi.tab("Effect Library")
         tab.click()
         search = tab.textentry("")
-        view = tab.get_child()(roleName="table")
-        combotypes = tab.get_child()(name="All effects", roleName="combo box")
+        view = tab.child(roleName="table")
+        combotypes = tab.child(name="All effects", 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"
@@ -24,11 +24,11 @@ class EffectLibraryTest(HelpFunc):
         self.assertEqual(len(view.children), 2 + 2 * 3)
 
         #Audio effects
-        tab.get_child()(name="Video effects", roleName="combo box").click()
+        tab.child(name="Video effects", roleName="combo box").click()
         tab.menuItem("Audio effects").click()
         search.text = "Equa"
         #Titles plus 3 plugins, two collumns = 8
-        self.assertEqual(len(tab.get_child()(roleName="table").children), 8)
+        self.assertEqual(len(tab.child(roleName="table").children), 8)
 
     def help_test_effect_drag(self):
         sample = self.import_media()
@@ -40,7 +40,7 @@ class EffectLibraryTest(HelpFunc):
         tab.click()
         conftab = self.pitivi.tab("Clip configuration")
         conftab.click()
-        table = conftab.get_child()(roleName="table")
+        table = conftab.child(roleName="table")
 
         dogtail.rawinput.click(clippos[0], clippos[1])
         self.assertTrue(table.sensitive)
@@ -59,7 +59,7 @@ class EffectLibraryTest(HelpFunc):
         self.assertEqual(len(table.children), 9)
 
         #Drag audio effect on the clip
-        tab.get_child()(name="Video effects", roleName="combo box").click()
+        tab.child(name="Video effects", roleName="combo box").click()
         tab.menuItem("Audio effects").click()
         effect = self.search_by_regex("^Amplifier", tab, roleName="table cell")
         self.improved_drag(center(effect), clippos)
@@ -73,7 +73,7 @@ class EffectLibraryTest(HelpFunc):
     def test_change_effect_settings(self):
         self.help_test_effect_drag()
         conftab = self.pitivi.tab("Clip configuration")
-        conftab.get_child()(roleName="table").get_child()(name="audioamplify").click()
-        eftab = conftab.get_child()(name="Effects", roleName="toggle button")
-        eftab.get_child()(name="Normal clipping (default)", roleName="combo box")
-        eftab.get_child()(roleName="spin button").text = "2"
+        conftab.child(roleName="table").child(name="audioamplify").click()
+        eftab = conftab.child(name="Effects", roleName="toggle button")
+        eftab.child(name="Normal clipping (default)", roleName="combo box")
+        eftab.child(roleName="spin button").text = "2"
diff --git a/tests/dogtail_scripts/test_medialibrary.py b/tests/dogtail_scripts/test_medialibrary.py
index 7266335..e6afe4f 100644
--- a/tests/dogtail_scripts/test_medialibrary.py
+++ b/tests/dogtail_scripts/test_medialibrary.py
@@ -21,7 +21,7 @@ class MediaLibraryTest(HelpFunc):
         self.assertFalse(samples[2].isSelected)
 
         tab = self.pitivi.tab("Media Library")
-        iconview = tab.get_child()(roleName="layered pane")
+        iconview = tab.child(roleName="layered pane")
         self.assertEqual(len(iconview.children), 3)
         search = tab.textentry("")
         search.click()
diff --git a/tests/dogtail_scripts/test_project.py b/tests/dogtail_scripts/test_project.py
index 2360620..8968c8c 100644
--- a/tests/dogtail_scripts/test_project.py
+++ b/tests/dogtail_scripts/test_project.py
@@ -7,15 +7,15 @@ import os
 
 class ProjectPropertiesTest(HelpFunc):
     def test_settings_video(self):
-        welcome_dialog = self.pitivi.get_child()(name="Welcome", roleName="frame", recursive=False)
+        welcome_dialog = self.pitivi.child(name="Welcome", roleName="frame", recursive=False)
         welcome_dialog.button("New").click()
 
         #Play with project settings, look if they are correctly represented
-        dialog = self.pitivi.get_child()(name="Project Settings", roleName="dialog", recursive=False)
+        dialog = self.pitivi.child(name="Project Settings", roleName="dialog", recursive=False)
         video = dialog.tab("Video")
 
         #Test presets
-        video.get_child()(name="720p24", roleName="table cell").click()
+        video.child(name="720p24", roleName="table cell").click()
         children = video.findChildren(IsATextEntryNamed(""))
         childtext = {}
         for child in children:
@@ -33,23 +33,23 @@ class ProjectPropertiesTest(HelpFunc):
         self.assertIn("720", spintext)
 
         #Test frame rate combinations, link button
-        frameCombo = video.get_child()(name="23.976 fps", roleName="combo box")
+        frameCombo = video.child(name="23.976 fps", roleName="combo box")
         frameText = childtext["24M"]
         frameCombo.click()
-        video.get_child()(name="120 fps", roleName="menu item").click()
+        video.child(name="120 fps", roleName="menu item").click()
         self.assertEqual(frameText.text, "120:1")
         frameText.click()
         frameText.typeText("0")
-        video.get_child()(name="12 fps", roleName="combo box")
+        video.child(name="12 fps", roleName="combo box")
 
         #Test pixel and display ascpect ratio
-        pixelCombo = video.get_child()(name="Square", roleName="combo box")
+        pixelCombo = video.child(name="Square", roleName="combo box")
         pixelText = childtext["1:1"]
-        displayCombo = video.get_child()(name="DV Widescreen (16:9)", roleName="combo box")
+        displayCombo = video.child(name="DV Widescreen (16:9)", roleName="combo box")
         displayText = childtext["16:9"]
 
         pixelCombo.click()
-        video.get_child()(name="576p", roleName="menu item").click()
+        video.child(name="576p", roleName="menu item").click()
         self.assertEqual(pixelCombo.combovalue, "576p")
         self.assertEqual(pixelText.text, "12:11")
         #self.assertEqual(displayCombo.combovalue, "")
@@ -63,9 +63,9 @@ class ProjectPropertiesTest(HelpFunc):
         self.assertEqual(displayCombo.combovalue, "Standard (4:3)")
         self.assertEqual(displayText.text, "4:3")
 
-        video.get_child()(name="Display aspect ratio", roleName="radio button").click()
+        video.child(name="Display aspect ratio", roleName="radio button").click()
         displayCombo.click()
-        video.get_child()(name="Cinema (1.37)", roleName="menu item").click()
+        video.child(name="Cinema (1.37)", roleName="menu item").click()
         #self.assertEqual(pixelCombo.combovalue, "")
         self.assertEqual(pixelText.text, "99:128")
         self.assertEqual(displayCombo.combovalue, "Cinema (1.37)")
@@ -87,7 +87,7 @@ class ProjectPropertiesTest(HelpFunc):
         self.assertEqual(spin[1].text, oldtext)
         spin[1].doubleClick()
         spin[1].typeText("2000")
-        video.get_child()(name="Link").click()
+        video.child(name="Link").click()
         spin[1].doubleClick()
         spin[1].typeText("1000")
         spin[0].click()
@@ -108,7 +108,7 @@ class ProjectPropertiesTest(HelpFunc):
         self.pitivi.menu("Edit").click()
         self.pitivi.menuItem("Project Settings").click()
 
-        dialog = self.pitivi.get_child()(name="Project Settings", roleName="dialog", recursive=False)
+        dialog = self.pitivi.child(name="Project Settings", roleName="dialog", recursive=False)
         video = dialog.tab("Video")
         children = video.findChildren(IsATextEntryNamed(""))
         childtext = {}
@@ -158,7 +158,7 @@ class ProjectPropertiesTest(HelpFunc):
         seektime = self.search_by_text("0:00:00.000", self.pitivi, roleName="text")
         self.assertIsNotNone(seektime)
         self.insert_clip(sample)
-        self.nextb = self.pitivi.get_child()(name="Next", roleName="push button")
+        self.nextb = self.pitivi.child(name="Next", roleName="push button")
         self.nextb.click()
         self.assertEqual(seektime.text, "0:00:01.227")
 
@@ -173,7 +173,7 @@ class ProjectPropertiesTest(HelpFunc):
         self.menubar.menu("Project").menuItem("Quit").click()
 
         #If finds button, means it warned
-        self.pitivi.get_child()(roleName="dialog", recursive=False).button("Cancel").click()
+        self.pitivi.child(roleName="dialog", recursive=False).button("Cancel").click()
         self.saveProject(saveAs=False)
         #Backup should be deleted, and no warning displayed
         self.menubar.menu("Project").click()
@@ -181,16 +181,16 @@ class ProjectPropertiesTest(HelpFunc):
         self.assertFalse(os.path.exists(backup_path))
         #Test if backup is found
         self.setUp()
-        welcome_dialog = self.pitivi.get_child()(name="Welcome", roleName="frame", recursive=False)
-        welcome_dialog.get_child()(name=filename).doubleClick()
+        welcome_dialog = self.pitivi.child(name="Welcome", roleName="frame", recursive=False)
+        welcome_dialog.child(name=filename).doubleClick()
         sample = self.import_media("flat_colour1_640x480.png")
         self.assertTrue(self.wait_for_file(backup_path, 120), "Backup not created")
         self.tearDown(clean=False, kill=True)
         self.setUp()
-        welcome_dialog = self.pitivi.get_child()(name="Welcome", roleName="frame", recursive=False)
-        welcome_dialog.get_child()(name=filename).doubleClick()
+        welcome_dialog = self.pitivi.child(name="Welcome", roleName="frame", recursive=False)
+        welcome_dialog.child(name=filename).doubleClick()
         #Try restoring from backup
-        self.pitivi.get_child()(roleName="dialog", recursive=False).button("Restore from backup").click()
+        self.pitivi.child(roleName="dialog", recursive=False).button("Restore from backup").click()
         samples = self.pitivi.tab("Media Library").findChildren(GenericPredicate(roleName="icon"))
         self.assertEqual(len(samples), 2)
         self.menubar.menu("Project").click()
@@ -201,9 +201,9 @@ class ProjectPropertiesTest(HelpFunc):
         self.tearDown(clean=False, kill=True)
         timestamp = os.path.getmtime(backup_path)
         self.setUp()
-        welcome_dialog = self.pitivi.get_child()(name="Welcome", roleName="frame", recursive=False)
-        welcome_dialog.get_child()(name=filename).doubleClick()
-        self.pitivi.get_child()(roleName="dialog", recursive=False).button("Ignore backup").click()
+        welcome_dialog = self.pitivi.child(name="Welcome", roleName="frame", recursive=False)
+        welcome_dialog.child(name=filename).doubleClick()
+        self.pitivi.child(roleName="dialog", recursive=False).button("Ignore backup").click()
         #Backup is not deleted, not changed
         self.assertEqual(timestamp, os.path.getmtime(backup_path))
 
@@ -216,7 +216,7 @@ class ProjectPropertiesTest(HelpFunc):
         self.menubar.menu("Project").menuItem("Quit").click()
 
         # Dismiss the unsaved changes warning by cancelling it:
-        self.pitivi.get_child()(roleName="dialog", recursive=False).button("Cancel").click()
+        self.pitivi.child(roleName="dialog", recursive=False).button("Cancel").click()
         self.saveProject(saveAs=False)
 
         #Backup should be deleted, and no warning displayed
@@ -225,10 +225,10 @@ class ProjectPropertiesTest(HelpFunc):
         self.assertFalse(os.path.exists(backup_path))
 
     def test_load_save(self):
-        self.nextb = self.pitivi.get_child()(name="Next", roleName="push button")
+        self.nextb = self.pitivi.child(name="Next", roleName="push button")
         tab = self.pitivi.tab("Media Library")
         seektime = self.search_by_text("0:00:00.000", self.pitivi, roleName="text")
-        infobar_media = tab.get_child()(name="Add media to your project by dragging files and folders here or by using the \"Import Files...\" button.")
+        infobar_media = tab.child(name="Add media to your project by dragging files and folders here or by using the \"Import Files...\" button.")
         filename1 = "/tmp/test_project-%i.xptv" % time()
         filename2 = "/tmp/test_project-%i.xptv" % time()
 
@@ -243,7 +243,7 @@ class ProjectPropertiesTest(HelpFunc):
         sleep(0.5)
         self.menubar.menu("Project").click()
         self.menubar.menu("Project").menuItem("New").click()
-        self.pitivi.get_child()(name="Project Settings", roleName="dialog", recursive=False).button("OK").click()
+        self.pitivi.child(name="Project Settings", roleName="dialog", recursive=False).button("OK").click()
 
         icons = tab.findChildren(GenericPredicate(roleName="icon"))
         self.nextb.click()
diff --git a/tests/dogtail_scripts/test_timeline.py b/tests/dogtail_scripts/test_timeline.py
index 52450a7..96151cf 100644
--- a/tests/dogtail_scripts/test_timeline.py
+++ b/tests/dogtail_scripts/test_timeline.py
@@ -10,7 +10,7 @@ from pyatspi import (KEY_SYM, KEY_PRESS, KEY_PRESSRELEASE, KEY_RELEASE)
 class TimelineTest(HelpFunc):
     def setUp(self):
         super(TimelineTest, self).setUp()
-        self.nextb = self.pitivi.get_child()(name="Next", roleName="push button")
+        self.nextb = self.pitivi.child(name="Next", roleName="push button")
 
     def help_test_insertEnd(self):
         sample = self.import_media()
@@ -84,16 +84,16 @@ class TimelineTest(HelpFunc):
         adj = (float)(timeline.size[0]) / 883
 
         dogtail.rawinput.click(timeline.position[0] + 500 * adj, timeline.position[1] + 50)
-        self.pitivi.get_child()(name="Split", roleName="push button").click()
+        self.pitivi.child(name="Split", roleName="push button").click()
         dogtail.rawinput.click(timeline.position[0] + 450 * adj, timeline.position[1] + 50)
-        self.pitivi.get_child()(name="Delete", roleName="push button").click()
+        self.pitivi.child(name="Delete", roleName="push button").click()
 
         self.nextb.click()
         self.assertEqual(seektime.text, "0:00:02.455")
 
         dogtail.rawinput.click(timeline.position[0] + 550 * adj, timeline.position[1] + 50)
         dogtail.rawinput.pressKey("Del")
-        #self.pitivi.get_child()(name="Delete", roleName="push button").click()
+        #self.pitivi.child(name="Delete", roleName="push button").click()
 
         self.nextb.click()
         self.assertEqual(seektime.text, "0:00:01.227")
@@ -113,7 +113,7 @@ class TimelineTest(HelpFunc):
                 sleep(0.1)
                 dogtail.rawinput.pressKey("s")
                 #Just search some object to look if it still alive
-                self.pitivi.get_child()(roleName="icon")
+                self.pitivi.child(roleName="icon")
 
     def test_transition(self):
         self.help_test_insertEndFast()
@@ -136,12 +136,12 @@ class TimelineTest(HelpFunc):
         sleep(1)
         dogtail.rawinput.click(tpos[0] + 250 * adj, tpos[1] + 50)
         #Check if we selected transition
-        transitions = self.pitivi.get_child()(name="Transitions", roleName="page tab")
-        iconlist = transitions.get_child()(roleName="layered pane")
+        transitions = self.pitivi.child(name="Transitions", roleName="page tab")
+        iconlist = transitions.child(roleName="layered pane")
         self.assertTrue(iconlist.sensitive)
         iconlist.children[-2].select()
-        self.assertTrue(transitions.get_child()(roleName="slider").sensitive)
-        transitions.get_child()(roleName="slider").value = 50
+        self.assertTrue(transitions.child(roleName="slider").sensitive)
+        transitions.child(roleName="slider").value = 50
 
     def search_clip_end(self, y, seek, timeline):
         minx = timeline.position[0] + 10.
@@ -187,7 +187,7 @@ class TimelineTest(HelpFunc):
         conftab = self.pitivi.tab("Clip configuration")
         conftab.click()
         center = lambda obj: (obj.position[0] + obj.size[0] / 2, obj.position[1] + obj.size[1] / 2)
-        table = conftab.get_child()(roleName="table")
+        table = conftab.child(roleName="table")
         icon = self.search_by_text("Agingtv ", tab, roleName="icon")
         self.improved_drag(center(icon), center(table))
         self.nextb.click()
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]