X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fmap_cli_test.cc;h=ed2a7e5ec5aad4ede1d3dba538abe39646bab74c;hb=HEAD;hp=5505a197bbd1e50aec5c312ca3493f8ef587caba;hpb=b5abb07ea62e5f4708c57b6f888101d3d3434aa8;p=dcpomatic.git

diff --git a/test/map_cli_test.cc b/test/map_cli_test.cc
index 5505a197b..ed2a7e5ec 100644
--- a/test/map_cli_test.cc
+++ b/test/map_cli_test.cc
@@ -116,6 +116,38 @@ BOOST_AUTO_TEST_CASE(map_simple_dcp_copy)
 }
 
 
+/** Map a single DCP into a new DCP, referring to the CPL by ID */
+BOOST_AUTO_TEST_CASE(map_simple_dcp_copy_by_id)
+{
+	string const name = "map_simple_dcp_copy_by_id";
+	string const out = String::compose("build/test/%1_out", name);
+
+	auto content = content_factory("test/data/flat_red.png");
+	auto film = new_test_film2(name + "_in", content);
+	make_and_verify_dcp(film);
+
+	dcp::CPL cpl(find_cpl(film->dir(film->dcp_name())));
+
+	vector<string> const args = {
+		"map_cli",
+		"-o", out,
+		"-d", film->dir(film->dcp_name()).string(),
+		cpl.id()
+	};
+
+	boost::filesystem::remove_all(out);
+
+	vector<string> output_messages;
+	auto error = run(args, output_messages);
+	BOOST_CHECK(!error);
+
+	verify_dcp(out, {});
+
+	BOOST_CHECK(boost::filesystem::is_regular_file(find_prefix(out, "j2c_")));
+	BOOST_CHECK(boost::filesystem::is_regular_file(find_prefix(out, "pcm_")));
+}
+
+
 /** Map a single DCP into a new DCP using the symlink option */
 BOOST_AUTO_TEST_CASE(map_simple_dcp_copy_with_symlinks)
 {
@@ -191,6 +223,7 @@ BOOST_AUTO_TEST_CASE(map_simple_interop_dcp_with_subs)
 	auto subs = content_factory("test/data/15s.srt").front();
 	auto film = new_test_film2(name + "_in", { picture, subs });
 	film->set_interop(true);
+	subs->only_text()->set_language(dcp::LanguageTag("de"));
 	make_and_verify_dcp(film, {dcp::VerificationNote::Code::INVALID_STANDARD});
 
 	vector<string> const args = {
@@ -222,12 +255,11 @@ test_map_ov_vf_copy(vector<string> extra_args = {})
 	make_and_verify_dcp(ov_film);
 
 	auto const ov_dir = ov_film->dir(ov_film->dcp_name());
-
 	auto vf_ov = make_shared<DCPContent>(ov_dir);
 	auto vf_sound = content_factory("test/data/sine_440.wav").front();
 	auto vf_film = new_test_film2(name + "_vf", { vf_ov, vf_sound });
 	vf_ov->set_reference_video(true);
-	make_and_verify_dcp(vf_film, {dcp::VerificationNote::Code::EXTERNAL_ASSET});
+	make_and_verify_dcp(vf_film, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false);
 
 	auto const vf_dir = vf_film->dir(vf_film->dcp_name());
 
@@ -283,7 +315,7 @@ BOOST_AUTO_TEST_CASE(map_ov_vf_copy_multiple_reference)
 	vf_ov2->set_position(vf_film, vf_ov1->end(vf_film));
 	vf_ov1->set_reference_video(true);
 	vf_ov2->set_reference_video(true);
-	make_and_verify_dcp(vf_film, {dcp::VerificationNote::Code::EXTERNAL_ASSET});
+	make_and_verify_dcp(vf_film, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false);
 
 	auto const vf_dir = vf_film->dir(vf_film->dcp_name());
 
@@ -379,6 +411,7 @@ test_two_cpls_each_with_subs(string name, bool interop)
 		auto subs = content_factory("test/data/15s.srt").front();
 		films[i] = new_test_film2(String::compose("%1_%2_in", name, i), { picture, subs });
 		films[i]->set_interop(interop);
+		subs->only_text()->set_language(dcp::LanguageTag("de"));
 		make_and_verify_dcp(films[i], acceptable_errors);
 	}
 
@@ -551,6 +584,7 @@ BOOST_AUTO_TEST_CASE(map_handles_interop_png_subs)
 	film->set_interop(true);
 	arrietty->set_trim_end(dcpomatic::ContentTime::from_seconds(110));
 	arrietty->text[0]->set_use(true);
+	arrietty->text[0]->set_language(dcp::LanguageTag("de"));
 	make_and_verify_dcp(
 		film,
 		{