X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsubtitle_language_test.cc;h=e198b78f93c9cd350cb8923dc4c8f9c8f1f8e888;hb=3d40a861b4e77f04df7196cffda5b41b9852b2c7;hp=50efb71a138391c012b4b0a5dda50bb2600ffe91;hpb=4347d97b703cfddcd322051092ccfcd5b5a6b941;p=dcpomatic.git

diff --git a/test/subtitle_language_test.cc b/test/subtitle_language_test.cc
index 50efb71a1..e198b78f9 100644
--- a/test/subtitle_language_test.cc
+++ b/test/subtitle_language_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,13 +18,16 @@
 
 */
 
+
 /** @file  test/subtitle_language_test.cc
  *  @brief Test that subtitle language information is correctly written to DCPs.
  */
 
 
+#include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/film.h"
+#include "lib/text_content.h"
 #include "test.h"
 #include <dcp/language_tag.h>
 #include <boost/test/unit_test.hpp>
@@ -33,24 +36,25 @@
 
 using std::string;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
 {
 	string const name = "subtitle_language_interop_test";
-	shared_ptr<Film> film = new_test_film2 (name);
-	film->examine_and_add_content (content_factory("test/data/frames.srt").front());
-	BOOST_REQUIRE (!wait_for_jobs());
-
-	vector<dcp::LanguageTag> langs;
-	langs.push_back(dcp::LanguageTag("fr-FR"));
-	langs.push_back(dcp::LanguageTag("de-DE"));
-	film->set_subtitle_languages(langs);
+	auto fr = content_factory("test/data/frames.srt").front();
+	auto film = new_test_film2 (name, { fr });
+
+	fr->only_text()->set_language (dcp::LanguageTag("fr-FR"));
 	film->set_interop (true);
 
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::INVALID_STANDARD,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION
+		});
 
 	check_dcp (String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()));
 }
@@ -59,18 +63,21 @@ BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
 BOOST_AUTO_TEST_CASE (subtitle_language_smpte_test)
 {
 	string const name = "subtitle_language_smpte_test";
-	shared_ptr<Film> film = new_test_film2 (name);
-	film->examine_and_add_content (content_factory("test/data/frames.srt").front());
-	BOOST_REQUIRE (!wait_for_jobs());
-
-	vector<dcp::LanguageTag> langs;
-	langs.push_back(dcp::LanguageTag("fr-FR"));
-	langs.push_back(dcp::LanguageTag("de-DE"));
-	film->set_subtitle_languages(langs);
+	auto fr = content_factory("test/data/frames.srt").front();
+	auto film = new_test_film2 (name, { fr });
+
+	fr->only_text()->set_language (dcp::LanguageTag("fr-FR"));
 	film->set_interop (false);
 
-	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::INVALID_SUBTITLE_DURATION,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA
+		});
 
 	check_dcp (String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()));
 }