summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorThibault Saunier <thibault.saunier@osg.samsung.com>2016-10-06 19:14:57 +0200
committerThibault Saunier <thibault.saunier@osg.samsung.com>2016-11-04 15:56:31 -0300
commite31b8627efd99a65ac0d2de277d1cea555dd08fd (patch)
tree7ae090f3acbea6cce6d6e75a334e7a0ec03a14ab /tests
parentad6aab49aedf3b381cb42af0a2ab2e70cb1a86e1 (diff)
timeline: Destroy transition if a neighbor is not being moved to a layer
And make sure that we move the transition to the right layer, not trying to figure it out. Differential Revision: https://phabricator.freedesktop.org/D1360
Diffstat (limited to 'tests')
-rw-r--r--tests/check/python/test_timeline.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/check/python/test_timeline.py b/tests/check/python/test_timeline.py
index 0c5f41e959..86e52cc184 100644
--- a/tests/check/python/test_timeline.py
+++ b/tests/check/python/test_timeline.py
@@ -73,3 +73,15 @@ class TestEditing(common.GESSimpleTimelineTest):
clip2.edit([], layer2.get_priority(), GES.EditMode.EDIT_NORMAL, GES.Edge.EDGE_NONE, clip2.props.start)
self.assertEquals(len(self.layer.get_clips()), 1)
self.assertEquals(len(layer2.get_clips()), 1)
+
+ def test_transition_moves_when_rippling_to_another_layer(self):
+ self.timeline.props.auto_transition = True
+ clip1 = self.add_clip(0, 0, 100)
+ clip2 = self.add_clip(50, 0, 100)
+ all_clips = self.layer.get_clips()
+ self.assertEquals(len(all_clips), 4)
+
+ layer2 = self.timeline.append_layer()
+ clip1.edit([], layer2.get_priority(), GES.EditMode.EDIT_RIPPLE, GES.Edge.EDGE_NONE, clip1.props.start)
+ self.assertEquals(self.layer.get_clips(), [])
+ self.assertEquals(set(layer2.get_clips()), set(all_clips))