GNOME.org
 

[pitivi] dogtail tests: Use the quick-access variables from test_base in various tests

commit 56c91706a3de032a2f97bcc365396087676ec5cb
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Fri Oct 19 13:04:49 2012 -0400

    dogtail tests: Use the quick-access variables from test_base in various tests
    
    This simplifies the code and should speed things up.

 tests/dogtail_scripts/helper_functions.py    |   14 +---
 tests/dogtail_scripts/test_clipproperties.py |   61 ++++++++--------
 tests/dogtail_scripts/test_effects.py        |   19 +++---
 tests/dogtail_scripts/test_medialibrary.py   |    5 +-
 tests/dogtail_scripts/test_project.py        |   27 ++++----
 tests/dogtail_scripts/test_timeline.py       |  101 ++++++++++++--------------
 6 files changed, 105 insertions(+), 122 deletions(-)
---
diff --git a/tests/dogtail_scripts/helper_functions.py b/tests/dogtail_scripts/helper_functions.py
index 90bc932..4e09c6a 100644
--- a/tests/dogtail_scripts/helper_functions.py
+++ b/tests/dogtail_scripts/helper_functions.py
@@ -95,17 +95,16 @@ class HelpFunc(BaseDogTail):
         sleep(0.6)
 
         # Check if the item is now visible in the media library.
-        libtab = self.pitivi.tab("Media Library")
         for i in range(5):
             # The time it takes for the icon to appear is unpredictable,
             # therefore we try up to 5 times to look for it
-            icons = libtab.findChildren(GenericPredicate(roleName="icon"))
+            icons = self.medialibrary.findChildren(GenericPredicate(roleName="icon"))
             for icon in icons:
                 if icon.text == filename:
                     return icon
             sleep(0.5)
         # Failure to find an icon might be because it is hidden due to a search
-        current_search_text = libtab.child(roleName="text").text.lower()
+        current_search_text = self.medialibrary.child(name="media_search_entry", roleName="text").text.lower()
         self.assertNotEqual(current_search_text, "")
         self.assertNotIn(filename.lower(), current_search_text)
         return None
@@ -138,8 +137,7 @@ class HelpFunc(BaseDogTail):
         registry.generateKeyboardEvent(ctrl_code, None, KEY_RELEASE)
         import_dialog.button('Add').click()
 
-        libtab = self.pitivi.tab("Media Library")
-        current_search_text = libtab.child(roleName="text").text.lower()
+        current_search_text = self.medialibrary.child(name="media_search_entry", 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.
@@ -151,7 +149,7 @@ class HelpFunc(BaseDogTail):
         for i in range(5):
             # The time it takes for icons to appear is unpredictable,
             # therefore we try up to 5 times to look for them
-            icons = libtab.findChildren(GenericPredicate(roleName="icon"))
+            icons = self.medialibrary.findChildren(GenericPredicate(roleName="icon"))
             for icon in icons:
                 for f in files:
                     if icon.text == f:
@@ -162,10 +160,6 @@ class HelpFunc(BaseDogTail):
             sleep(0.5)
         return samples
 
-    def get_timeline(self):
-        # TODO: find a better way to identify
-        return self.pitivi.children[0].children[0].children[2].children[1].children[3]
-
     def improved_drag(self, from_coords, to_coords, middle=[], absolute=True, moveAround=True):
         """
         Allow dragging from a set of coordinates to another set of coords,
diff --git a/tests/dogtail_scripts/test_clipproperties.py b/tests/dogtail_scripts/test_clipproperties.py
index 53292ec..fb37f69 100644
--- a/tests/dogtail_scripts/test_clipproperties.py
+++ b/tests/dogtail_scripts/test_clipproperties.py
@@ -11,37 +11,36 @@ class ClipTransforamtionTest(HelpFunc):
         sample = self.import_media()
         self.insert_clip(sample)
 
-        timeline = self.get_timeline()
         clippos = []
-        clippos.append((timeline.position[0] + 20, timeline.position[1] + 20))
-        clippos.append((timeline.position[0] + timeline.size[0] / 2, timeline.position[1] + 20))
+        clippos.append((self.timeline.position[0] + 20, self.timeline.position[1] + 20))
+        clippos.append((self.timeline.position[0] + self.timeline.size[0] / 2, self.timeline.position[1] + 20))
         dogtail.rawinput.click(clippos[0][0], clippos[0][1])
 
-        conftab = self.pitivi.tab("Clip configuration")
-        conftab.click()
-        conftab.child(name="Transformation", roleName="toggle button").click()
+        tab = self.clipproperties
+        tab.click()
+        tab.child(name="Transformation", roleName="toggle button").click()
         #Just try changing values
         #Test slider
-        slider = conftab.child(roleName="slider")
+        slider = tab.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.child(roleName="panel", name="Position").findChildren(GenericPredicate(roleName="spin button"))
+        spinb = tab.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.child(roleName="panel", name="Size").findChildren(GenericPredicate(roleName="spin button"))
+        spinb = tab.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.child(roleName="panel", name="Crop").findChildren(GenericPredicate(roleName="spin button"))
+        spinb = tab.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 +49,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.child(roleName="slider").value, 1.0)
+        self.assertEqual(tab.child(roleName="slider").value, 1.0)
 
         #Click back, look if settings saved
         dogtail.rawinput.click(clippos[0][0], clippos[0][1])
-        self.assertNotEqual(conftab.child(roleName="slider").value, 1.0)
+        self.assertNotEqual(tab.child(roleName="slider").value, 1.0)
 
-        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.3", tab.child(roleName="panel", name="Position")))
+        self.assertNotNone(self.search_by_text("0.2", tab.child(roleName="panel", name="Position")))
 
-        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.4", tab.child(roleName="panel", name="Size")))
+        self.assertNotNone(self.search_by_text("0.1", tab.child(roleName="panel", name="Size")))
 
-        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")))
+        self.assertNotNone(self.search_by_text("0.05", tab.child(roleName="panel", name="Crop")))
+        self.assertNotNone(self.search_by_text("0.12", tab.child(roleName="panel", name="Crop")))
+        self.assertNotNone(self.search_by_text("0.14", tab.child(roleName="panel", name="Crop")))
+        self.assertNotNone(self.search_by_text("0.07", tab.child(roleName="panel", name="Crop")))
 
         #Push clear
-        conftab.child(roleName="scroll bar").value = 140
-        conftab.button("Clear")
+        tab.child(roleName="scroll bar").value = 140
+        tab.button("Clear")
 
-        self.assertEqual(conftab.child(roleName="slider").value, 1.0)
+        self.assertEqual(tab.child(roleName="slider").value, 1.0)
 
-        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.3", tab.child(roleName="panel", name="Position")))
+        self.assertNone(self.search_by_text("0.2", tab.child(roleName="panel", name="Position")))
 
-        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.4", tab.child(roleName="panel", name="Size")))
+        self.assertNone(self.search_by_text("0.1", tab.child(roleName="panel", name="Size")))
 
-        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")))
+        self.assertNone(self.search_by_text("0.05", tab.child(roleName="panel", name="Crop")))
+        self.assertNone(self.search_by_text("0.12", tab.child(roleName="panel", name="Crop")))
+        self.assertNone(self.search_by_text("0.14", tab.child(roleName="panel", name="Crop")))
+        self.assertNone(self.search_by_text("0.07", tab.child(roleName="panel", name="Crop")))
diff --git a/tests/dogtail_scripts/test_effects.py b/tests/dogtail_scripts/test_effects.py
index 7a0adc3..b684fed 100644
--- a/tests/dogtail_scripts/test_effects.py
+++ b/tests/dogtail_scripts/test_effects.py
@@ -3,11 +3,12 @@ from helper_functions import HelpFunc
 import dogtail.rawinput
 
 
+# FIXME: cleanup the weird use of variable names for tabs here
 class EffectLibraryTest(HelpFunc):
     def test_effect_library(self):
         #Load sample
         self.import_media()
-        tab = self.pitivi.tab("Effect Library")
+        tab = self.effectslibrary
         tab.click()
         search = tab.textentry("")
         view = tab.child(roleName="table")
@@ -33,12 +34,11 @@ class EffectLibraryTest(HelpFunc):
     def help_test_effect_drag(self):
         sample = self.import_media()
         self.insert_clip(sample)
-        timeline = self.get_timeline()
-        clippos = (timeline.position[0] + 20, timeline.position[1] + 20)
+        clippos = (self.timeline.position[0] + 20, self.timeline.position[1] + 20)
 
-        tab = self.pitivi.tab("Effect Library")
+        tab = self.effectslibrary
         tab.click()
-        conftab = self.pitivi.tab("Clip configuration")
+        conftab = self.clipproperties
         conftab.click()
         table = conftab.child(roleName="table")
 
@@ -72,8 +72,7 @@ class EffectLibraryTest(HelpFunc):
 
     def test_change_effect_settings(self):
         self.help_test_effect_drag()
-        conftab = self.pitivi.tab("Clip configuration")
-        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"
+        self.clipproperties.child(roleName="table").child(name="audioamplify").click()
+        fx_expander = self.clipproperties.child(name="Effects", roleName="toggle button")
+        fx_expander.child(name="Normal clipping (default)", roleName="combo box")
+        fx_expander.child(roleName="spin button").text = "2"
diff --git a/tests/dogtail_scripts/test_medialibrary.py b/tests/dogtail_scripts/test_medialibrary.py
index e6afe4f..b546db7 100644
--- a/tests/dogtail_scripts/test_medialibrary.py
+++ b/tests/dogtail_scripts/test_medialibrary.py
@@ -20,10 +20,9 @@ class MediaLibraryTest(HelpFunc):
         self.assertTrue(samples[1].isSelected)
         self.assertFalse(samples[2].isSelected)
 
-        tab = self.pitivi.tab("Media Library")
-        iconview = tab.child(roleName="layered pane")
+        iconview = self.medialibrary.child(roleName="layered pane")
         self.assertEqual(len(iconview.children), 3)
-        search = tab.textentry("")
+        search = self.medialibrary.textentry("")
         search.click()
         search.typeText("colour2")
         self.assertEqual(len(iconview.children), 1)
diff --git a/tests/dogtail_scripts/test_project.py b/tests/dogtail_scripts/test_project.py
index 8968c8c..d96cf3f 100644
--- a/tests/dogtail_scripts/test_project.py
+++ b/tests/dogtail_scripts/test_project.py
@@ -155,11 +155,11 @@ class ProjectPropertiesTest(HelpFunc):
         self.saveProject(path)
 
         #Change somthing
-        seektime = self.search_by_text("0:00:00.000", self.pitivi, roleName="text")
+        seektime = self.viewer.child(name="timecode_entry").child(roleName="text")
         self.assertIsNotNone(seektime)
         self.insert_clip(sample)
-        self.nextb = self.pitivi.child(name="Next", roleName="push button")
-        self.nextb.click()
+        self.goToEnd_button = self.viewer.child(name="goToEnd_button")
+        self.goToEnd_button.click()
         self.assertEqual(seektime.text, "0:00:01.227")
 
         #It should save after 10 seconds if no changes made
@@ -191,7 +191,7 @@ class ProjectPropertiesTest(HelpFunc):
         welcome_dialog.child(name=filename).doubleClick()
         #Try restoring from backup
         self.pitivi.child(roleName="dialog", recursive=False).button("Restore from backup").click()
-        samples = self.pitivi.tab("Media Library").findChildren(GenericPredicate(roleName="icon"))
+        samples = self.medialibrary.findChildren(GenericPredicate(roleName="icon"))
         self.assertEqual(len(samples), 2)
         self.menubar.menu("Project").click()
         self.assertFalse(self.menubar.menu("Project").menuItem("Save").sensitive)
@@ -225,10 +225,9 @@ class ProjectPropertiesTest(HelpFunc):
         self.assertFalse(os.path.exists(backup_path))
 
     def test_load_save(self):
-        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.child(name="Add media to your project by dragging files and folders here or by using the \"Import Files...\" button.")
+        self.goToEnd_button = self.viewer.child(name="goToEnd_button")
+        seektime = self.viewer.child(name="timecode_entry").child(roleName="text")
+        infobar_media = self.medialibrary.child(name="Information", roleName="alert")
         filename1 = "/tmp/test_project-%i.xptv" % time()
         filename2 = "/tmp/test_project-%i.xptv" % time()
 
@@ -245,8 +244,8 @@ class ProjectPropertiesTest(HelpFunc):
         self.menubar.menu("Project").menuItem("New").click()
         self.pitivi.child(name="Project Settings", roleName="dialog", recursive=False).button("OK").click()
 
-        icons = tab.findChildren(GenericPredicate(roleName="icon"))
-        self.nextb.click()
+        icons = self.medialibrary.findChildren(GenericPredicate(roleName="icon"))
+        self.goToEnd_button.click()
         self.assertEqual(len(icons), 0)
         self.assertTrue(infobar_media.showing)
 
@@ -259,16 +258,16 @@ class ProjectPropertiesTest(HelpFunc):
 
         #Load first, check if populated
         self.load_project(filename1)
-        icons = tab.findChildren(GenericPredicate(roleName="icon"))
-        self.nextb.click()
+        icons = self.medialibrary.findChildren(GenericPredicate(roleName="icon"))
+        self.goToEnd_button.click()
         self.assertEqual(len(icons), 1)
         self.assertEqual(seektime.text, "0:00:01.227")
         self.assertFalse(infobar_media.showing)
 
         #Load second, check if populated
         self.load_project(filename2)
-        icons = tab.findChildren(GenericPredicate(roleName="icon"))
-        self.nextb.click()
+        icons = self.medialibrary.findChildren(GenericPredicate(roleName="icon"))
+        self.goToEnd_button.click()
         self.assertEqual(len(icons), 2)
         self.assertEqual(seektime.text, "0:00:02.455")
         self.assertFalse(infobar_media.showing)
diff --git a/tests/dogtail_scripts/test_timeline.py b/tests/dogtail_scripts/test_timeline.py
index 96151cf..f3d794e 100644
--- a/tests/dogtail_scripts/test_timeline.py
+++ b/tests/dogtail_scripts/test_timeline.py
@@ -10,20 +10,19 @@ 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.child(name="Next", roleName="push button")
+        self.goToEnd_button = self.viewer.child(name="goToEnd_button")
 
     def help_test_insertEnd(self):
+        # Test insertion with the right-click popup menu
         sample = self.import_media()
-        #Right click
-        seektime = self.search_by_text("0:00:00.000", self.pitivi, roleName="text")
-
+        seektime = self.viewer.child(name="timecode_entry").child(roleName="text")
         self.assertIsNotNone(seektime)
-
+        # TODO: remove the help_test_insertEnd* methods, the menu is deprecated
         sample.click(3)
         buttons = self.pitivi.findChildren(
             GenericPredicate(name="Insert at End of Timeline"))
         buttons[1].click()
-        self.nextb.click()
+        self.goToEnd_button.click()
         self.assertEqual(seektime.text, "0:00:01.227")
 
         #Add one more
@@ -31,31 +30,28 @@ class TimelineTest(HelpFunc):
         buttons = self.pitivi.findChildren(
             GenericPredicate(name="Insert at End of Timeline"))
         buttons[1].click()
-        self.nextb.click()
-
+        self.goToEnd_button.click()
         self.assertEqual(seektime.text, "0:00:02.455")
 
     def help_test_insertEndFast(self):
         sample = self.import_media()
         self.insert_clip(sample, 2)
-        self.nextb.click()
+        self.goToEnd_button.click()
 
     def test_drag_clip(self):
         sample = self.import_media()
-        seektime = self.search_by_text("0:00:00.000", self.pitivi, roleName="text")
+        seektime = self.viewer.child(name="timecode_entry").child(roleName="text")
         self.assertIsNotNone(seektime)
 
-        timeline = self.get_timeline()
-
         center = lambda obj: (obj.position[0] + obj.size[0] / 2, obj.position[1] + obj.size[1] / 2)
-        self.improved_drag(center(sample), center(timeline))
-        self.nextb.click()
+        self.improved_drag(center(sample), center(self.timeline))
+        self.goToEnd_button.click()
         self.assertNotEqual(seektime.text, "0:00:00.000")
 
     def test_multiple_drag(self):
         sample = self.import_media()
-        seektime = self.search_by_text("0:00:00.000", self.pitivi, roleName="text")
-        timeline = self.get_timeline()
+        seektime = self.viewer.child(name="timecode_entry").child(roleName="text")
+        timeline = self.timeline
         self.assertIsNotNone(seektime)
         oldseek = seektime.text
         center = lambda obj: (obj.position[0] + obj.size[0] / 2, obj.position[1] + obj.size[1] / 2)
@@ -72,39 +68,40 @@ class TimelineTest(HelpFunc):
                 self.improved_drag(center(sample), endpos[i % 3])
             # Give time to insert object
             sleep(0.5)
-            self.nextb.click()
+            self.goToEnd_button.click()
             self.assertNotEqual(oldseek, seektime.text)
             oldseek = seektime.text
 
     def test_split(self):
         self.help_test_insertEnd()
-        seektime = self.search_by_text("0:00:02.455", self.pitivi, roleName="text")
-        timeline = self.get_timeline()
+        seektime = self.viewer.child(name="timecode_entry").child(roleName="text")
+        self.assertEqual(seektime.text, "0:00:02.455")
+        timeline = self.timeline
         #Adjust to different screen sizes
         adj = (float)(timeline.size[0]) / 883
 
         dogtail.rawinput.click(timeline.position[0] + 500 * adj, timeline.position[1] + 50)
-        self.pitivi.child(name="Split", roleName="push button").click()
+        self.timeline_toolbar.child(name="Split", roleName="push button").click()
         dogtail.rawinput.click(timeline.position[0] + 450 * adj, timeline.position[1] + 50)
-        self.pitivi.child(name="Delete", roleName="push button").click()
+        self.timeline_toolbar.child(name="Delete", roleName="push button").click()
 
-        self.nextb.click()
+        self.goToEnd_button.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.child(name="Delete", roleName="push button").click()
+        #self.timeline_toolbar.child(name="Delete", roleName="push button").click()
 
-        self.nextb.click()
+        self.goToEnd_button.click()
         self.assertEqual(seektime.text, "0:00:01.227")
 
     def test_multiple_split(self):
         self.help_test_insertEndFast()
-        seektime = self.search_by_text("0:00:02.455", self.pitivi, roleName="text")
-        timeline = self.get_timeline()
+        seektime = self.viewer.child(name="timecode_entry").child(roleName="text")
+        self.assertEqual(seektime.text, "0:00:02.455")
         #Adjust to different screen sizes
-        adj = (float)(timeline.size[0]) / 883
-        tpos = timeline.position
+        adj = (float)(self.timeline.size[0]) / 883
+        tpos = self.timeline.position
         pos = [50, 480, 170, 240, 350, 610, 410, 510]
         #Sleeps needed for atspi
         for k in pos:
@@ -117,12 +114,12 @@ class TimelineTest(HelpFunc):
 
     def test_transition(self):
         self.help_test_insertEndFast()
-        seektime = self.search_by_text("0:00:02.455", self.pitivi, roleName="text")
-        timeline = self.get_timeline()
-        tpos = timeline.position
+        seektime = self.viewer.child(name="timecode_entry").child(roleName="text")
+        self.assertEqual(seektime.text, "0:00:02.455")
+        tpos = self.timeline.position
 
         #Adjust to different screen sizes
-        adj = (float)(timeline.size[0]) / 883
+        adj = (float)(self.timeline.size[0]) / 883
 
         dogtail.rawinput.press(tpos[0] + 500 * adj, tpos[1] + 50)
         #Drag in, drag out, drag in and release
@@ -136,12 +133,11 @@ class TimelineTest(HelpFunc):
         sleep(1)
         dogtail.rawinput.click(tpos[0] + 250 * adj, tpos[1] + 50)
         #Check if we selected transition
-        transitions = self.pitivi.child(name="Transitions", roleName="page tab")
-        iconlist = transitions.child(roleName="layered pane")
+        iconlist = self.transitions.child(roleName="layered pane")
         self.assertTrue(iconlist.sensitive)
         iconlist.children[-2].select()
-        self.assertTrue(transitions.child(roleName="slider").sensitive)
-        transitions.child(roleName="slider").value = 50
+        self.assertTrue(self.transitions.child(roleName="slider").sensitive)
+        self.transitions.child(roleName="slider").value = 50
 
     def search_clip_end(self, y, seek, timeline):
         minx = timeline.position[0] + 10.
@@ -164,10 +160,10 @@ class TimelineTest(HelpFunc):
 
     def test_riple_roll(self):
         self.help_test_insertEndFast()
-        seektime = self.search_by_text("0:00:02.455", self.pitivi, roleName="text")
-        timeline = self.get_timeline()
-        tpos = timeline.position
-        end = self.search_clip_end(30, seektime, timeline)
+        seektime = self.viewer.child(name="timecode_entry").child(roleName="text")
+        self.assertEqual(seektime.text, "0:00:02.455")
+        tpos = self.timeline.position
+        end = self.search_clip_end(30, seektime, self.timeline)
 
         dogtail.rawinput.absoluteMotion(tpos[0] + end / 2 - 2, tpos[1] + 30)
         registry.generateKeyboardEvent(dogtail.rawinput.keyNameToKeyCode("Control_L"), None, KEY_PRESS)
@@ -177,20 +173,18 @@ class TimelineTest(HelpFunc):
         sleep(0.5)
         dogtail.rawinput.release(tpos[0] + end / 2 - 100, tpos[1] + 30)
         registry.generateKeyboardEvent(dogtail.rawinput.keyNameToKeyCode("Control_L"), None, KEY_RELEASE)
-        self.nextb.click()
+        self.goToEnd_button.click()
         self.assertNotEqual(seektime.text, "0:00:02.455", "Not ripled, but trimed")
 
         #Regresion test of adding effect
         #Add effect
-        tab = self.pitivi.tab("Effect Library")
-        tab.click()
-        conftab = self.pitivi.tab("Clip configuration")
-        conftab.click()
+        self.effectslibrary.click()
+        self.clipproperties.click()
         center = lambda obj: (obj.position[0] + obj.size[0] / 2, obj.position[1] + obj.size[1] / 2)
-        table = conftab.child(roleName="table")
-        icon = self.search_by_text("Agingtv ", tab, roleName="icon")
+        table = self.clipproperties.child(roleName="table")
+        icon = self.search_by_text("Agingtv ", self.effectslibrary, roleName="icon")
         self.improved_drag(center(icon), center(table))
-        self.nextb.click()
+        self.goToEnd_button.click()
         seekbefore = seektime.text
         #Try riple and roll
         dogtail.rawinput.absoluteMotion(tpos[0] + end / 2 - 102, tpos[1] + 30)
@@ -201,7 +195,7 @@ class TimelineTest(HelpFunc):
         sleep(0.5)
         dogtail.rawinput.release(tpos[0] + end / 2 - 200, tpos[1] + 30)
         registry.generateKeyboardEvent(dogtail.rawinput.keyNameToKeyCode("Control_L"), None, KEY_RELEASE)
-        self.nextb.click()
+        self.goToEnd_button.click()
         self.assertNotEqual(seektime.text, seekbefore, "Not ripled affter adding effect")
 
     def test_image_video_mix(self):
@@ -209,16 +203,15 @@ class TimelineTest(HelpFunc):
                  "flat_colour4_1600x1200.jpg", "flat_colour1_640x480.png",
                  "flat_colour3_320x180.png", "flat_colour5_1600x1200.jpg"]
         samples = self.import_media_multiple(files)
-        seektime = self.search_by_text("0:00:00.000", self.pitivi, roleName="text")
-        timeline = self.get_timeline()
-        tpos = timeline.position
+        seektime = self.viewer.child(name="timecode_entry").child(roleName="text")
+        tpos = self.timeline.position
 
         #One video, one image
         for sample in samples[1:]:
             self.insert_clip(sample)
             self.insert_clip(samples[0])
 
-        end = self.search_clip_end(30, seektime, timeline)
+        end = self.search_clip_end(30, seektime, self.timeline)
         cend = end / 11.139
         dogtail.rawinput.absoluteMotion(tpos[0] + cend - 2, tpos[1] + 30)
         registry.generateKeyboardEvent(dogtail.rawinput.keyNameToKeyCode("Shift_L"), None, KEY_PRESS)
@@ -228,7 +221,7 @@ class TimelineTest(HelpFunc):
         sleep(0.5)
         dogtail.rawinput.release(tpos[0] + cend - 40, tpos[1] + 30)
         registry.generateKeyboardEvent(dogtail.rawinput.keyNameToKeyCode("Shift_L"), None, KEY_RELEASE)
-        self.nextb.click()
+        self.goToEnd_button.click()
         self.assertNotEqual(seektime.text, "0:00:11.139")
 
         #TODO: do something more with clips
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]