Verify a whole bunch of DCPs made by unit tests.

[dcpomatic.git] / test / srt_subtitle_test.cc

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index a84c27c8233a2a9bf4f1b2392dbed604fba72ac6..1d8fb89daef13f0c40a01a86d007b99e073b9562 100644 (file)
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/srt_subtitle_test.cc
  *  @brief Test writing DCPs with subtitles from .srt.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "lib/film.h"
@@ -36,7 +36,7 @@
 
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 /** Make a very short DCP with a single subtitle from .srt with no specified fonts */
@@ -98,24 +98,23 @@ check_subtitle_file (shared_ptr<Film> film, boost::filesystem::path ref)
 /** Make another DCP with a longer .srt file */
 BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 {
-       shared_ptr<Film> film = new_test_film ("srt_subtitle_test3");
+       Cleanup cl;
+
+       shared_ptr<StringTextFileContent> content (new StringTextFileContent(TestPaths::private_data() / "Ankoemmling_short.srt"));
+       shared_ptr<Film> film = new_test_film2 ("srt_subtitle_test3", { content }, &cl);
 
-       film->set_container (Ratio::from_id ("185"));
-       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        film->set_name ("frobozz");
        film->set_interop (true);
        film->set_audio_channels (6);
-       shared_ptr<StringTextFileContent> content (new StringTextFileContent(TestPaths::private_data / "Ankoemmling_short.srt"));
-       film->examine_and_add_content (content);
-       BOOST_REQUIRE (!wait_for_jobs());
 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
 
-       film->make_dcp ();
-       BOOST_REQUIRE (!wait_for_jobs());
+       make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD});
+
+       check_subtitle_file (film, TestPaths::private_data() / "Ankoemmling_short.xml");
 
-       check_subtitle_file (film, TestPaths::private_data / "Ankoemmling_short.xml");
+       cl.run ();
 }
 
 /** Build a small DCP with no picture and a single subtitle overlaid onto it */