Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / test / vf_test.cc

diff --git a/test/vf_test.cc b/test/vf_test.cc
index 8fbb9b9d427e0ecde7013cb90bdc69c01617a522..4abd12635918c51fa24a74a6b18c5ec7150844fe 100644 (file)
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -18,6 +18,11 @@
 
 */
 
+/** @file  test/vf_Test.cc
+ *  @brief Various VF-related tests.
+ *  @ingroup specific
+ */
+
 #include "lib/film.h"
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
@@ -84,11 +89,11 @@ BOOST_AUTO_TEST_CASE (vf_test2)
        shared_ptr<Film> ov = new_test_film ("vf_test2_ov");
        ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        ov->set_name ("vf_test2_ov");
-       shared_ptr<Content> video = content_factory (ov, "test/data/flat_red.png");
+       shared_ptr<Content> video = content_factory (ov, "test/data/flat_red.png").front();
        ov->examine_and_add_content (video);
        wait_for_jobs ();
        video->video->set_length (24 * 5);
-       shared_ptr<Content> audio = content_factory (ov, "test/data/white.wav");
+       shared_ptr<Content> audio = content_factory(ov, "test/data/white.wav").front();
        ov->examine_and_add_content (audio);
        wait_for_jobs ();
        ov->make_dcp ();
@@ -99,16 +104,17 @@ BOOST_AUTO_TEST_CASE (vf_test2)
        vf->set_name ("vf_test2_vf");
        vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
-       shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (content_factory (vf, ov->dir (ov->dcp_name ())));
+       shared_ptr<DCPContent> dcp (new DCPContent (vf, ov->dir (ov->dcp_name ())));
        BOOST_REQUIRE (dcp);
        vf->examine_and_add_content (dcp);
        wait_for_jobs ();
        dcp->set_reference_video (true);
        dcp->set_reference_audio (true);
-       shared_ptr<Content> sub = content_factory (vf, "test/data/subrip4.srt");
+       shared_ptr<Content> sub = content_factory(vf, "test/data/subrip4.srt").front();
        vf->examine_and_add_content (sub);
+       DCPOMATIC_ASSERT (!wait_for_jobs ());
        vf->make_dcp ();
-       wait_for_jobs ();
+       DCPOMATIC_ASSERT (!wait_for_jobs ());
        vf->write_metadata ();
 
        dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
@@ -141,11 +147,11 @@ BOOST_AUTO_TEST_CASE (vf_test3)
        shared_ptr<Film> ov = new_test_film ("vf_test3_ov");
        ov->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        ov->set_name ("vf_test3_ov");
-       shared_ptr<Content> video = content_factory (ov, "test/data/flat_red.png");
+       shared_ptr<Content> video = content_factory(ov, "test/data/flat_red.png").front();
        ov->examine_and_add_content (video);
        wait_for_jobs ();
        video->video->set_length (24 * 5);
-       shared_ptr<Content> audio = content_factory (ov, "test/data/white.wav");
+       shared_ptr<Content> audio = content_factory(ov, "test/data/white.wav").front();
        ov->examine_and_add_content (audio);
        wait_for_jobs ();
        ov->make_dcp ();
@@ -156,7 +162,7 @@ BOOST_AUTO_TEST_CASE (vf_test3)
        vf->set_name ("vf_test3_vf");
        vf->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
-       shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (content_factory (vf, ov->dir (ov->dcp_name ())));
+       shared_ptr<DCPContent> dcp (new DCPContent (vf, ov->dir (ov->dcp_name ())));
        BOOST_REQUIRE (dcp);
        dcp->set_trim_start (ContentTime::from_seconds (1));
        dcp->set_trim_end (ContentTime::from_seconds (1));