track-element: Return right value when editing

We used to always return TRUE which was wrong

+ Fix testsuite and remove randomness from the tests

diff --git a/ges/ges-track-element.c b/ges/ges-track-element.c
index be2d7be..3115136 100644 (file)
--- a/ges/ges-track-element.c
+++ b/ges/ges-track-element.c
@@ -1370,19 +1370,19 @@ ges_track_element_edit (GESTrackElement * object,
 
   switch (mode) {
     case GES_EDIT_MODE_NORMAL:
-      timeline_move_object (timeline, object, layers, edge, position);
+      return timeline_move_object (timeline, object, layers, edge, position);
       break;
     case GES_EDIT_MODE_TRIM:
-      timeline_trim_object (timeline, object, layers, edge, position);
+      return timeline_trim_object (timeline, object, layers, edge, position);
       break;
     case GES_EDIT_MODE_RIPPLE:
-      timeline_ripple_object (timeline, object, layers, edge, position);
+      return timeline_ripple_object (timeline, object, layers, edge, position);
       break;
     case GES_EDIT_MODE_ROLL:
-      timeline_roll_object (timeline, object, layers, edge, position);
+      return timeline_roll_object (timeline, object, layers, edge, position);
       break;
     case GES_EDIT_MODE_SLIDE:
-      timeline_slide_object (timeline, object, layers, edge, position);
+      return timeline_slide_object (timeline, object, layers, edge, position);
       break;
     default:
       GST_ERROR ("Unkown edit mode: %d", mode);

diff --git a/tests/check/ges/timelineedition.c b/tests/check/ges/timelineedition.c
index 34e34e2..e2ff0ab 100644 (file)
--- a/tests/check/ges/timelineedition.c
+++ b/tests/check/ges/timelineedition.c
@@ -225,9 +225,7 @@ GST_START_TEST (test_basic_timeline_edition)
   CHECK_OBJECT_PROPS (trackelement2, 62, 0, 60);
 
   /* Make sure that not doing anything when not able to roll */
-  fail_unless (ges_container_edit (clip, NULL, -1, GES_EDIT_MODE_ROLL,
-          GES_EDGE_START, 65) == TRUE);
-  fail_unless (ges_container_edit (clip1, NULL, -1, GES_EDIT_MODE_ROLL,
+  fail_if (ges_container_edit (clip1, NULL, -1, GES_EDIT_MODE_ROLL,
           GES_EDGE_END, 65) == TRUE, 0);
   CHECK_OBJECT_PROPS (trackelement, 25, 0, 37);
   CHECK_OBJECT_PROPS (trackelement1, 20, 0, 5);
@@ -320,8 +318,8 @@ GST_START_TEST (test_snapping)
   CHECK_OBJECT_PROPS (trackelement2, 62, 0, 60);
 
   /* Snaping to edge, so no move */
-  fail_unless (ges_container_edit (clip1, NULL, -1, GES_EDIT_MODE_TRIM,
-          GES_EDGE_END, 27) == TRUE);
+  fail_if (ges_container_edit (clip1, NULL, -1, GES_EDIT_MODE_TRIM,
+          GES_EDGE_END, 27));
   CHECK_OBJECT_PROPS (trackelement, 25, 0, 37);
   CHECK_OBJECT_PROPS (trackelement1, 20, 0, 5);
   CHECK_OBJECT_PROPS (trackelement2, 62, 0, 60);
@@ -529,7 +527,6 @@ GST_END_TEST;
 
 GST_START_TEST (test_timeline_edition_mode)
 {
-  guint i;
   GESTrack *track;
   GESTimeline *timeline;
   GESTrackElement *trackelement, *trackelement1, *trackelement2;
@@ -735,18 +732,6 @@ GST_START_TEST (test_timeline_edition_mode)
   assert_equals_int (ges_layer_get_priority (layer), 2);
   gst_object_unref (layer);
 
-  /* Some more intensive roll testing */
-  for (i = 0; i < 20; i++) {
-    gint32 random = g_random_int_range (35, 94);
-    guint64 tck3_inpoint = random - 35;
-
-    fail_unless (ges_container_edit (clip, NULL, -1, GES_EDIT_MODE_ROLL,
-            GES_EDGE_END, random) == TRUE);
-    CHECK_OBJECT_PROPS (trackelement, 32, 5, random - 32);
-    CHECK_OBJECT_PROPS (trackelement1, 20, 0, 10);
-    CHECK_OBJECT_PROPS (trackelement2, random, tck3_inpoint, 95 - random);
-  }
-
   /* Roll end clip back to 35
    * New timeline:
    * ------------
@@ -881,25 +866,23 @@ GST_START_TEST (test_timeline_edition_mode)
   CHECK_OBJECT_PROPS (trackelement2, 62, 0, 60);
 
   /* Make sure that not doing anything when not able to roll */
-  fail_unless (ges_container_edit (clip, NULL, -1, GES_EDIT_MODE_ROLL,
-          GES_EDGE_START, 65) == TRUE);
-  fail_unless (ges_container_edit (clip1, NULL, -1, GES_EDIT_MODE_ROLL,
-          GES_EDGE_END, 65) == TRUE, 0);
+  fail_if (ges_container_edit (clip, NULL, -1, GES_EDIT_MODE_ROLL,
+          GES_EDGE_START, 65));
   CHECK_OBJECT_PROPS (trackelement, 25, 0, 37);
   CHECK_OBJECT_PROPS (trackelement1, 20, 0, 5);
   CHECK_OBJECT_PROPS (trackelement2, 62, 0, 60);
 
   /* Snaping to edge, so no move */
   g_object_set (timeline, "snapping-distance", (guint64) 3, NULL);
-  fail_unless (ges_container_edit (clip1, NULL, -1, GES_EDIT_MODE_TRIM,
-          GES_EDGE_END, 27) == TRUE);
+  fail_if (ges_container_edit (clip1, NULL, -1, GES_EDIT_MODE_TRIM,
+          GES_EDGE_END, 27));
   CHECK_OBJECT_PROPS (trackelement, 25, 0, 37);
   CHECK_OBJECT_PROPS (trackelement1, 20, 0, 5);
   CHECK_OBJECT_PROPS (trackelement2, 62, 0, 60);
 
   /* Snaping to edge, so no move */
-  fail_unless (ges_container_edit (clip1, NULL, -1, GES_EDIT_MODE_TRIM,
-          GES_EDGE_END, 27) == TRUE);
+  fail_if (ges_container_edit (clip1, NULL, -1, GES_EDIT_MODE_TRIM,
+          GES_EDGE_END, 27));
 
   CHECK_OBJECT_PROPS (trackelement, 25, 0, 37);
   CHECK_OBJECT_PROPS (trackelement1, 20, 0, 5);