std::shared_ptr

[dcpomatic.git] / test / content_test.cc

diff --git a/test/content_test.cc b/test/content_test.cc
index 5409ec37ddbfdbf7c766e2b9c74d35e18a4fa1f6..0815e16c2be64f18185d388cdaf38178ff6dd502 100644 (file)
--- a/test/content_test.cc
+++ b/test/content_test.cc
@@ -23,6 +23,7 @@
  *  @ingroup completedcp
  */
 
+#include "lib/audio_content.h"
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
 #include "lib/content_factory.h"
@@ -31,7 +32,7 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 /** There has been garbled audio with this piece of content */
@@ -60,7 +61,7 @@ BOOST_AUTO_TEST_CASE (content_test1)
                }
        }
 
-       check_mxf_audio_file ("test/data/content_test1.mxf", check);
+       check_mxf_audio_file (TestPaths::private_data() / "content_test1.mxf", check);
 }
 
 /** Taking some 23.976fps content and trimming 0.5s (in content time) from the start
@@ -150,3 +151,28 @@ BOOST_AUTO_TEST_CASE (content_test5)
        audio->set_trim_end (dcpomatic::ContentTime(3000));
        BOOST_CHECK (audio->length_after_trim(film) == DCPTime(957000));
 }
+
+
+/** Sync error #1833 */
+BOOST_AUTO_TEST_CASE (content_test6)
+{
+       shared_ptr<Film> film = new_test_film2 ("content_test6");
+       film->examine_and_add_content (content_factory(TestPaths::private_data() / "fha.mkv").front());
+       BOOST_REQUIRE (!wait_for_jobs());
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+       check_dcp (TestPaths::private_data() / "fha", film);
+}
+
+
+/** Reel length error when making the test for #1833 */
+BOOST_AUTO_TEST_CASE (content_test7)
+{
+       shared_ptr<Film> film = new_test_film2 ("content_test7");
+       shared_ptr<Content> content = content_factory(TestPaths::private_data() / "clapperboard.mp4").front();
+       film->examine_and_add_content (content);
+       BOOST_REQUIRE (!wait_for_jobs());
+       content->audio->set_delay (-1000);
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+}