A few test fixups.

[dcpomatic.git] / test / dcp_test.cc

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 9312a2067dd7ec115767c6f92f4c5356c0b25001..3565c1cfd1b3e718a54fb2629d4a68ab1880c9cc 100644 (file)
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -21,14 +21,22 @@ BOOST_AUTO_TEST_CASE (make_dcp_test)
 {
        shared_ptr<Film> film = new_test_film ("make_dcp_test");
        film->set_name ("test_film2");
-       film->set_content ("../../../test/test.mp4");
-       film->set_format (Format::from_nickname ("Flat"));
+       film->examine_and_add_content (shared_ptr<FFmpegContent> (new FFmpegContent (film, "test/data/test.mp4")));
+
+       /* Wait for the examine to finish */
+       while (JobManager::instance()->work_to_do ()) {
+               dcpomatic_sleep (1);
+       }
+
+       BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
+       
+       film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        film->make_dcp ();
        film->write_metadata ();
 
        while (JobManager::instance()->work_to_do ()) {
-               dvdomatic_sleep (1);
+               dcpomatic_sleep (1);
        }
        
        BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
@@ -46,22 +54,3 @@ BOOST_AUTO_TEST_CASE (have_dcp_test)
        boost::filesystem::remove (p);
        BOOST_CHECK (!f.have_dcp ());
 }
-
-BOOST_AUTO_TEST_CASE (make_dcp_with_range_test)
-{
-       shared_ptr<Film> film = new_test_film ("make_dcp_with_range_test");
-       film->set_name ("test_film3");
-       film->set_content ("../../../test/test.mp4");
-       film->examine_content ();
-       film->set_format (Format::from_nickname ("Flat"));
-       film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
-       film->set_trim_end (42);
-       film->make_dcp ();
-
-       while (JobManager::instance()->work_to_do() && !JobManager::instance()->errors()) {
-               dvdomatic_sleep (1);
-       }
-
-       BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
-}
-