added composition class test script and moved tests from subclass to parent class test script

Signed-off-by: Yingjie Wang <[email protected]>

Author: cato-o

src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp

@@ -513,6 +513,11 @@ Should be subclassed (for example by :class:`.Track` and :class:`.Stack`), not u
         .def("find_children", [](Composition* c, py::object descended_from_type, std::optional<TimeRange> const& search_range, bool shallow_search) {
                 return find_children(c, descended_from_type, search_range, shallow_search);
             }, "descended_from_type"_a = py::none(), "search_range"_a = std::nullopt, "shallow_search"_a = false)
+
+        .def("find_clips", [](Composition* c, std::optional<TimeRange> const& search_range, bool shallow_search) {
+                return find_clips(c, search_range, shallow_search);
+            }, "search_range"_a = std::nullopt, "shallow_search"_a = false);
+
         .def("handles_of_child", [](Composition* c, Composable* child) {
                 auto result = c->handles_of_child(child, ErrorStatusHandler());
                 return py::make_tuple(py::cast(result.first), py::cast(result.second));
@@ -587,9 +592,7 @@ Should be subclassed (for example by :class:`.Track` and :class:`.Stack`), not u
                 auto result =  t->neighbors_of(item, ErrorStatusHandler(), policy);
                 return py::make_tuple(py::cast(result.first.take_value()), py::cast(result.second.take_value()));
             }, "item"_a, "policy"_a = Track::NeighborGapPolicy::never)
-        .def("find_clips", [](Track* t, std::optional<TimeRange> const& search_range, bool shallow_search) {
-                return find_clips(t, search_range, shallow_search);
-            }, "search_range"_a = std::nullopt, "shallow_search"_a = false);
+
 
     py::class_<Track::Kind>(track_class, "Kind")
         .def_property_readonly_static("Audio", [](py::object /* self */) { return Track::Kind::audio; })
@@ -622,9 +625,7 @@ Should be subclassed (for example by :class:`.Track` and :class:`.Stack`), not u
              "markers"_a = py::none(),
              "effects"_a = py::none(),
              py::arg_v("metadata"_a = py::none()))
-        .def("find_clips", [](Stack* s, std::optional<TimeRange> const& search_range, bool shallow_search) {
-                return find_clips(s, search_range, shallow_search);
-            }, "search_range"_a = std::nullopt, "shallow_search"_a = false);
+
 
     py::class_<Timeline, SerializableObjectWithMetadata, managing_ptr<Timeline>>(m, "Timeline", py::dynamic_attr())
         .def(py::init([](std::string name,

tests/CMakeLists.txt

@@ -15,7 +15,7 @@ foreach(test ${tests_opentime})
            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 endforeach()
 
-list(APPEND tests_opentimelineio test_clip test_serialization test_serializableCollection test_stack_algo test_timeline test_track test_editAlgorithm)
+list(APPEND tests_opentimelineio test_clip test_serialization test_serializableCollection test_stack_algo test_timeline test_track test_editAlgorithm test_composition)
 foreach(test ${tests_opentimelineio})
     add_executable(${test} utils.h utils.cpp ${test}.cpp)
 

tests/test_composition.cpp

@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
+#include "utils.h"
+
+#include <opentimelineio/composition.h>
+#include <opentimelineio/item.h>
+#include <opentimelineio/clip.h>
+#include <opentimelineio/stack.h>
+#include <opentimelineio/track.h>
+#include <opentimelineio/transition.h>
+
+#include <iostream>
+
+namespace otime = opentime::OPENTIME_VERSION;
+namespace otio  = opentimelineio::OPENTIMELINEIO_VERSION;
+
+int
+main(int argc, char** argv)
+{
+    Tests tests;
+
+    // test a basic case of find_children
+    tests.add_test(
+        "test_find_children", [] {
+        using namespace otio;
+        SerializableObject::Retainer<Composition>  comp  = new Composition;
+        SerializableObject::Retainer<Item>  item  = new Item;
+
+        comp->append_child(item);
+        opentimelineio::v1_0::ErrorStatus err;
+        auto result = comp->find_children<>(&err);
+        assertEqual(result.size(), 1);
+        assertEqual(result[0].value, item.value);
+    });
+    
+    // test stack and track correctly calls find_clips from composition parent class
+    tests.add_test(
+        "test_find_clips", [] {
+        using namespace otio;
+        SerializableObject::Retainer<Stack> stack = new Stack();
+        SerializableObject::Retainer<Track> track = new Track;
+        SerializableObject::Retainer<Clip>  clip  = new Clip;
+        SerializableObject::Retainer<Transition> transition = new Transition;
+        
+        stack->append_child(track);
+        track->append_child(transition);
+        track->append_child(clip);
+     
+        opentimelineio::v1_0::ErrorStatus err;
+        auto items = stack->find_clips(&err);
+        assertFalse(is_error(err));
+        assertEqual(items.size(), 1);
+        assertEqual(items[0].value, clip.value);
+    });
+
+    tests.run(argc, argv);
+    return 0;
+}

tests/test_stack_algo.cpp

@@ -213,22 +213,6 @@ main(int argc, char** argv)
         assertEqual(result->duration().value(), 300);
     });
 
-    // test stack correctly calls find_clips from superclass
-    tests.add_test(
-        "test_find_clips", [] {
-        using namespace otio;
-        SerializableObject::Retainer<Stack> stack = new Stack();
-        SerializableObject::Retainer<Track> track = new Track;
-        SerializableObject::Retainer<Clip>  clip  = new Clip;
-        stack->append_child(track);
-        track->append_child(clip);
-
-        opentimelineio::v1_0::ErrorStatus err;
-        auto items = stack->find_clips(&err);
-        assertFalse(is_error(err));
-        assertEqual(items.size(), 1);
-    });
-
     tests.run(argc, argv);
     return 0;
 }

tests/test_track.cpp

@@ -51,7 +51,7 @@ main(int argc, char** argv)
         opentimelineio::v1_0::ErrorStatus err;
         auto result = tr->find_children<otio::Clip>(
             &err,
-            TimeRange(RationalTime(0.0, 24.0), RationalTime(24.0, 24.0)));       
+            TimeRange(RationalTime(0.0, 24.0), RationalTime(24.0, 24.0)));
         assertEqual(result.size(), 1);
         assertEqual(result[0].value, cl0.value);
         result = tr->find_children<otio::Clip>(
@@ -166,20 +166,6 @@ main(int argc, char** argv)
             std::find(items.begin(), items.end(), clip.value) != items.end());
     });
 
-    // test track correctly calls find_clips from superclass
-    tests.add_test(
-        "test_find_clips", [] {
-        using namespace otio;
-        SerializableObject::Retainer<Track> track = new Track;
-        SerializableObject::Retainer<Clip>  clip  = new Clip;
-        track->append_child(clip);
-
-        opentimelineio::v1_0::ErrorStatus err;
-        auto items = track->find_clips(&err);
-        assertFalse(is_error(err));
-        assertEqual(items.size(), 1);
-    });
-
     tests.run(argc, argv);
     return 0;
 }