X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fsubtitle_trim_test.cc;h=f0fea4765c5b5a46705ff85ac45555b16f7d72a1;hp=1174eb583e513f7d1bb8e82a5a9bf24d38107d0e;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=d7ac100c0eb1b5efdcfbec59be870fd869252840

diff --git a/test/subtitle_trim_test.cc b/test/subtitle_trim_test.cc
index 1174eb583..f0fea4765 100644
--- a/test/subtitle_trim_test.cc
+++ b/test/subtitle_trim_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,24 +18,31 @@
 
 */
 
+
 #include "lib/film.h"
-#include "lib/dcp_text_content.h"
+#include "lib/dcp_subtitle_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+
+using std::make_shared;
+using std::shared_ptr;
+
 
 /** Check for no crash when trimming DCP subtitles (#1275) */
 BOOST_AUTO_TEST_CASE (subtitle_trim_test1)
 {
-	shared_ptr<Film> film = new_test_film2 ("subtitle_trim_test1");
-	shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub5.xml"));
-	film->examine_and_add_content (content);
-	BOOST_REQUIRE (!wait_for_jobs ());
+	auto content = make_shared<DCPSubtitleContent>("test/data/dcp_sub5.xml");
+	auto film = new_test_film2 ("subtitle_trim_test1", {content});
 
-	content->set_trim_end (ContentTime::from_seconds (2));
+	content->set_trim_end (dcpomatic::ContentTime::from_seconds(2));
 	film->write_metadata ();
 
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs ());
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA
+		});
 }