Put subtitle language back into content from the film (#1930).

[dcpomatic.git] / test / isdcf_name_test.cc

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index dc2263206963367ea389d163ffbc8fb5d9202912..59d8ec1b02644559bc176d55b7f11e840d8ec654 100644 (file)
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -42,7 +42,7 @@ using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (isdcf_name_test)
 {
-       shared_ptr<Film> film = new_test_film ("isdcf_name_test");
+       auto film = new_test_film ("isdcf_name_test");
 
        /* A basic test */
 
@@ -61,6 +61,11 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        film->set_interop (true);
        BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_UK-PG_MOS_2K_ST_20140704_FA_IOP_OV");
 
+       /* Check that specifying no audio language writes XX */
+       m.audio_language = "";
+       film->set_isdcf_metadata (m);
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_XX-XX_UK-PG_MOS_2K_ST_20140704_FA_IOP_OV");
+
        /* Test a long name and some different data */
 
        film->set_name ("My Nice Film With A Very Long Name");
@@ -69,10 +74,10 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        film->_isdcf_date = boost::gregorian::date (2014, boost::gregorian::Jul, 4);
        film->set_audio_channels (1);
        film->set_resolution (Resolution::FOUR_K);
-       film->set_subtitle_language (dcp::LanguageTag("fr-FR"));
        shared_ptr<Content> text = content_factory("test/data/subrip.srt").front();
        BOOST_REQUIRE_EQUAL (text->text.size(), 1U);
        text->text.front()->set_burn (true);
+       text->text.front()->set_language (dcp::LanguageTag("fr-FR"));
        film->examine_and_add_content (text);
        BOOST_REQUIRE (!wait_for_jobs());
        m.content_version = 2;
@@ -215,3 +220,4 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        sound->audio->set_mapping (mapping);
        BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71-HI-VI_4K_DI_20140704_PP_SMPTE_OV");
 }
+