X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fisdcf_name_test.cc;h=29bcff6ed26080ed9ef9d061f3e12136d346393f;hb=c9be8c4b27bc68b13706bd39a306b7238004cdd3;hp=487f80ea21e04aa85546c5c1dc23a42336387f26;hpb=15a83d720780d58f905d40f8493cdcb86596eaee;p=dcpomatic.git

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index 487f80ea2..29bcff6ed 100644
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/isdcf_name_test.cc
  *  @brief Test creation of ISDCF names.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include <boost/test/unit_test.hpp>
@@ -69,9 +69,9 @@ 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_4K);
+	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(), 1);
-	text->text.front()->set_language ("fr");
+	BOOST_REQUIRE_EQUAL (text->text.size(), 1U);
 	text->text.front()->set_burn (true);
 	film->examine_and_add_content (text);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -190,22 +190,18 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI-VI_4K_DI_20140704_PP_SMPTE_OV");
 
 	film->set_audio_channels(10);
-	mapping.set (0, dcp::LC, 1.0);
-	mapping.set (0, dcp::RC, 1.0);
 	mapping.set (0, dcp::HI, 0.0);
 	mapping.set (0, dcp::VI, 0.0);
 	sound->audio->set_mapping (mapping);
-	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71_4K_DI_20140704_PP_SMPTE_OV");
+	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51_4K_DI_20140704_PP_SMPTE_OV");
 	mapping.set (0, dcp::HI, 1.0);
 	sound->audio->set_mapping (mapping);
-	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71-HI_4K_DI_20140704_PP_SMPTE_OV");
+	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI_4K_DI_20140704_PP_SMPTE_OV");
 	mapping.set (0, dcp::VI, 1.0);
 	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");
+	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI-VI_4K_DI_20140704_PP_SMPTE_OV");
 
 	film->set_audio_channels(12);
-	mapping.set (0, dcp::LC, 0.0);
-	mapping.set (0, dcp::RC, 0.0);
 	mapping.set (0, dcp::BSL, 1.0);
 	mapping.set (0, dcp::BSR, 1.0);
 	mapping.set (0, dcp::HI, 0.0);