X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fssa_subtitle_test.cc;h=c7e4c39a6e038341ea4e9cd4fa85f0957b1a894e;hb=369821c41e62d4cce506cd4206f9db0d91b4f643;hp=cd22450a62d41d655500e0525bec9537e69b46a7;hpb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb;p=dcpomatic.git

diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc
index cd22450a6..c7e4c39a6 100644
--- a/test/ssa_subtitle_test.cc
+++ b/test/ssa_subtitle_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/ssa_subtitle_test.cc
  *  @brief Test use of SSA subtitle files.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "lib/film.h"
@@ -36,29 +36,32 @@
 
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Make a DCP with subs from a .ssa file */
 BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
 {
-	shared_ptr<Film> film = new_test_film ("ssa_subtitle_test1");
+	Cleanup cl;
+
+	shared_ptr<Film> film = new_test_film2 ("ssa_subtitle_test1", &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);
-	shared_ptr<StringTextFileContent> content (new StringTextFileContent (film, private_data / "DKH_UT_EN20160601def.ssa"));
+	shared_ptr<StringTextFileContent> content (new StringTextFileContent(TestPaths::private_data() / "DKH_UT_EN20160601def.ssa"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	content->only_text()->set_use (true);
 	content->only_text()->set_burn (false);
 
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Find the subtitle file and check it */
 	list<string> ignore;
 	ignore.push_back ("SubtitleID");
-	check_xml (subtitle_file(film), private_data / "DKH_UT_EN20160601def.xml", ignore);
+	check_xml (subtitle_file(film), TestPaths::private_data() / "DKH_UT_EN20160601def.xml", ignore);
+
+	cl.run ();
 }